From 5643db087f19eeb74465812c4abaf936247eabcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com>
Date: Fri, 22 May 2020 18:32:58 +0800
Subject: [PATCH] 1

---
 .../com/kiisoo/ic/customer/CustomerService.java   | 10 ++++++++++
 .../controller/SynchronousController.java         | 15 +++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
index 7c305fa..76a4b45 100644
--- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java
+++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
@@ -1,6 +1,7 @@
 package com.kiisoo.ic.customer;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -116,6 +117,15 @@ public class CustomerService {
     @Autowired
     private IPmnActivityInstanceConfigService pmnActivityInstanceConfigService;
 
+    @Autowired
+    private StoreEmployeeService storeEmployeeService;
+    @Autowired
+    private IPmnPromotionSrcService pmnPromotionSrcService;
+    @Autowired
+    private IPmnActivityInstanceService pmnActivityInstanceService;
+    @Autowired
+    private IPmnActivityInstanceConfigService pmnActivityInstanceConfigService;
+
     @Autowired
     private StoreEmployeeService storeEmployeeService;
     @Autowired
diff --git a/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java b/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java
index bf9c76a..ea07524 100644
--- a/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java
+++ b/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java
@@ -96,6 +96,21 @@ public class SynchronousController {
             return DataImportUtil.fail(e);
         }
     }
+    @RequestMapping(value = "/ics/activity/event/cb", method = RequestMethod.POST, consumes = "application/json")
+    @ResponseBody
+    public String activityEventCb(@RequestBody List<TurnBackDTO> turnBackDTOS) {
+        try {
+            for (TurnBackDTO turnBackDTO : turnBackDTOS) {
+                customerService.turnBack(turnBackDTO);
+            }
+            return DataImportUtil.succ(1);
+        }catch (Exception e){
+            log.error("扫码回调报错",e);
+            String str = JSON.toJSONString(turnBackDTOS);
+            System.out.println(str);
+            return DataImportUtil.fail(e);
+        }
+    }
     /**
      * 好友查询接口
      * @param friendExistReqDO 亲故对象