活动码测试

src/main/java/com/kiisoo/ic/activity/controller/PromoterController.java

@@ -11,7 +11,7 @@ import java.util.Map;
 
 @RestController
 @Api(value = "后台-推广员管理", tags = {"后台-推广员管理"})
-@RequestMapping(value = "/fission/recruit")
+@RequestMapping(value = "/fission/promoter")
 @Slf4j
 public class PromoterController extends BaseController {
 

src/main/java/com/kiisoo/ic/customer/CustomerService.java

@@ -201,8 +201,18 @@ public class CustomerService {
      * @param turnBackDTOS 数据实体
      * @return 是否成功
      */
-    public void turnBack(TurnBackDTO turnBackDTOS) throws Exception {
+    public Map<String, Object> turnBack(TurnBackDTO turnBackDTOS) throws Exception {
         String eaCode = turnBackDTOS.getEaCode();
+        Map<String, Object> returnValue = new HashMap<>();
+        // TODO 测试用
+        Map<String, Object> mp = new HashMap<>();
+        mp.put("title", "点击进入 解锁春夏新品限时惊喜“派对价”");
+        mp.put("pic_media_id", "3FATKOzsf_ZvET8_znnVUgjfYht3VlewPs1TtDYRTmKzSxorJDjDra0fZyluqlCxh");
+        mp.put("appid", "wxdbee4d231d47d0bf");
+        mp.put("page", "pages/springPumping/login/login");
+        returnValue.put("welcome_code", "WELCOMECODE");
+        returnValue.put("miniprogram", mp);
+        if (eaCode != null) {
             // 判断是否是活动扫码
             if (eaCode.contains(Constants.ACTIVITY_QR_CODE_PREFIX)) {
                 // 活动码处理
@@ -212,6 +222,8 @@ public class CustomerService {
                 handleCustomer(turnBackDTOS);
             }
         }
+        return returnValue;
+    }
 
     /**
      * 活动码处理
@@ -228,15 +240,15 @@ public class CustomerService {
         PmnPromotionSrc src = pmnPromotionSrcService.getOne(Wrappers.<PmnPromotionSrc>lambdaQuery().eq(PmnPromotionSrc::getCode, code));
         PmnActivityInstance instance = pmnActivityInstanceService.getById(instanceId);
         PoiStoreStaff storeStaff = poiStoreStaffDOMapper.selectOne(Wrappers.<PoiStoreStaff>lambdaQuery().eq(PoiStoreStaff::getStaffCode, turnBackDTOS.getUserId()));
-        if(instance == null || src == null || instance.getStatus() > 2) {
+        if (instance == null || src == null || instance.getStatus() > 2) {
             //如果没有活动或者活动已经过期,返回欢迎语
-//            List<PmnActivityStoreRelation> storeRelation = pmnActivityStoreRelationService.list(Wrappers.<PmnActivityStoreRelation>lambdaQuery().eq(PmnActivityStoreRelation::getStoreId, storeId).select(PmnActivityStoreRelation::getInstanceId));
-//            Set<Long> instanceIds = storeRelation.stream().map(PmnActivityStoreRelation::getInstanceId).collect(Collectors.toSet());
-//            List<PmnActivityInstance> welcomes = pmnActivityInstanceService.list(Wrappers.<PmnActivityInstance>lambdaQuery().in(PmnActivityInstance::getId, instanceIds).eq(PmnActivityInstance::getCategoryCode, "welcome").orderBy(false, false, PmnActivityInstance::getCreateTime));
-//            if(welcomes == null) {
-//                //没有欢迎语
-//            }
-//            PmnActivityInstance welcome = welcomes.get(0);
+            List<PmnActivityStoreRelation> storeRelation = pmnActivityStoreRelationService.list(Wrappers.<PmnActivityStoreRelation>lambdaQuery().eq(PmnActivityStoreRelation::getStoreId, storeStaff.getStoreId()).select(PmnActivityStoreRelation::getInstanceId));
+            Set<Long> instanceIds = storeRelation.stream().map(PmnActivityStoreRelation::getInstanceId).collect(Collectors.toSet());
+            List<PmnActivityInstance> welcomes = pmnActivityInstanceService.list(Wrappers.<PmnActivityInstance>lambdaQuery().in(PmnActivityInstance::getId, instanceIds).eq(PmnActivityInstance::getCategoryCode, "welcome").orderBy(false, false, PmnActivityInstance::getCreateTime));
+            if (welcomes == null) {
+                //没有欢迎语
+            }
+            PmnActivityInstance welcome = welcomes.get(0);
         }
         //  处理逻辑
         if (src.getType() == 1) {
@@ -245,7 +257,7 @@ public class CustomerService {
             friendsSrc.setPromotionSrcId(storeStaff.getUserId());
             friendsSrc.setFriendId(turnBackDTOS.getWxData().getUserId());
             pmnPromotionFriendsSrcService.saveOrUpdate(friendsSrc, Wrappers.<PmnPromotionFriendsSrc>lambdaQuery().eq(PmnPromotionFriendsSrc::getFriendId, turnBackDTOS.getWxData().getUserId()).eq(PmnPromotionFriendsSrc::getPromotionSrcId, storeStaff.getUserId()));
-        }else if(src.getType() == 2) {
+        } else if (src.getType() == 2) {
             //扫的店铺码,导购参与活动(生成导购码)
             pmnPromotionSrcService.createCode(storeStaff, instanceId);
         }

src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java

@@ -20,7 +20,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -85,10 +87,16 @@ public class SynchronousController {
     @ResponseBody
     public String turnBack(@RequestBody List<TurnBackDTO> turnBackDTOS, HttpServletResponse response) {
         try {
+            Map<String, Object> returnValue = new HashMap<>();
+            returnValue.put("code", 1000);
+            returnValue.put("msg", "操作成功");
             for (TurnBackDTO turnBackDTO : turnBackDTOS) {
-                customerService.turnBack(turnBackDTO);
+                Map<String, Object> callback = customerService.turnBack(turnBackDTO);
+                // 目前暂时只取其中一个值
+                returnValue.putIfAbsent("callback_info", callback);
             }
-            return DataImportUtil.succ(1);
+            return JSON.toJSONString(returnValue);
+            // return DataImportUtil.succ(1);
         }catch (Exception e){
             log.error("好友回调报错",e);
             String str = JSON.toJSONString(turnBackDTOS);