diff --git a/src/main/java/com/kiisoo/ic/activity/controller/PromoterController.java b/src/main/java/com/kiisoo/ic/activity/controller/PromoterController.java index f223a86..6baedc7 100644 --- a/src/main/java/com/kiisoo/ic/activity/controller/PromoterController.java +++ b/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 { diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index a46019c..733291e 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -201,16 +201,28 @@ public class CustomerService { * @param turnBackDTOS 数据实体 * @return 是否成功 */ - public void turnBack(TurnBackDTO turnBackDTOS) throws Exception { + public Map turnBack(TurnBackDTO turnBackDTOS) throws Exception { String eaCode = turnBackDTOS.getEaCode(); - // 判断是否是活动扫码 - if (eaCode.contains(Constants.ACTIVITY_QR_CODE_PREFIX)) { - // 活动码处理 - handleActivity(turnBackDTOS, eaCode); - } else { - // 导购码处理 - handleCustomer(turnBackDTOS); + Map returnValue = new HashMap<>(); + // TODO 测试用 + Map 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)) { + // 活动码处理 + handleActivity(turnBackDTOS, eaCode); + } else { + // 导购码处理 + handleCustomer(turnBackDTOS); + } } + return returnValue; } /** @@ -228,16 +240,16 @@ public class CustomerService { PmnPromotionSrc src = pmnPromotionSrcService.getOne(Wrappers.lambdaQuery().eq(PmnPromotionSrc::getCode, code)); PmnActivityInstance instance = pmnActivityInstanceService.getById(instanceId); PoiStoreStaff storeStaff = poiStoreStaffDOMapper.selectOne(Wrappers.lambdaQuery().eq(PoiStoreStaff::getStaffCode, turnBackDTOS.getUserId())); - if(instance == null || src == null || instance.getStatus() > 2) { + if (instance == null || src == null || instance.getStatus() > 2) { //如果没有活动或者活动已经过期,返回欢迎语 -// List storeRelation = pmnActivityStoreRelationService.list(Wrappers.lambdaQuery().eq(PmnActivityStoreRelation::getStoreId, storeId).select(PmnActivityStoreRelation::getInstanceId)); -// Set instanceIds = storeRelation.stream().map(PmnActivityStoreRelation::getInstanceId).collect(Collectors.toSet()); -// List welcomes = pmnActivityInstanceService.list(Wrappers.lambdaQuery().in(PmnActivityInstance::getId, instanceIds).eq(PmnActivityInstance::getCategoryCode, "welcome").orderBy(false, false, PmnActivityInstance::getCreateTime)); -// if(welcomes == null) { -// //没有欢迎语 -// } -// PmnActivityInstance welcome = welcomes.get(0); - } + List storeRelation = pmnActivityStoreRelationService.list(Wrappers.lambdaQuery().eq(PmnActivityStoreRelation::getStoreId, storeStaff.getStoreId()).select(PmnActivityStoreRelation::getInstanceId)); + Set instanceIds = storeRelation.stream().map(PmnActivityStoreRelation::getInstanceId).collect(Collectors.toSet()); + List welcomes = pmnActivityInstanceService.list(Wrappers.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.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); } 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 c7fa10b..92074f0 100644 --- a/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java +++ b/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 turnBackDTOS, HttpServletResponse response) { try { + Map returnValue = new HashMap<>(); + returnValue.put("code", 1000); + returnValue.put("msg", "操作成功"); for (TurnBackDTO turnBackDTO : turnBackDTOS) { - customerService.turnBack(turnBackDTO); + Map 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);