diff --git a/src/main/java/com/kiisoo/ic/activity/controller/EventController.java b/src/main/java/com/kiisoo/ic/activity/controller/EventController.java deleted file mode 100644 index b6268a6..0000000 --- a/src/main/java/com/kiisoo/ic/activity/controller/EventController.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.kiisoo.ic.activity.controller; - -import com.kiisoo.ic.synchronous.entity.TurnBackDTO; -import io.swagger.annotations.Api; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Map; - -@RestController -@Api(value = "活动回调事件", tags = {"活动回调事件"}) -@RequestMapping(value = "/activity/event") -@Slf4j -public class EventController { - public Map joinCb(TurnBackDTO turnBackDTOS){ - return null; - } -} diff --git a/src/main/java/com/kiisoo/ic/activity/service/IPmnPromotionSrcService.java b/src/main/java/com/kiisoo/ic/activity/service/IPmnPromotionSrcService.java index f5848e7..70e89d8 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/IPmnPromotionSrcService.java +++ b/src/main/java/com/kiisoo/ic/activity/service/IPmnPromotionSrcService.java @@ -16,4 +16,5 @@ import java.util.List; */ public interface IPmnPromotionSrcService extends IService { List listUserCodes(Long userId) throws Exception; + String saveCodeFile(String fileUrl, String code); } diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java index afc64a1..ae3b0ac 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java @@ -130,7 +130,8 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpllambdaQuery().eq(PmnPromotionSrc::getInstanceId, instanceId).eq(PmnPromotionSrc::getType, type).eq(PmnPromotionSrc::getPromoterId, promoterId)); + if(src == null) { + PrivilageCpUserDO cpUserDO = privilageCpUserDOMapper.selectOne(Wrappers.lambdaQuery().eq(PrivilageCpUserDO::getCpUserId, turnBackDTOS.getWxData().getUserId())); + Long storeId = privilageCpUserStoreDOMapper.selectOneByCpUserId(turnBackDTOS.getWxData().getUserId()); + String state = Constants.ACTIVITY_QR_CODE_PREFIX + Constants.LINE + instanceId + Constants.LINE + type + Constants.LINE + promoterId; + ActivityInstanceVO instanceVO = pmnActivityInstanceService.getVO(instanceId); + PmnActivityInstanceConfig config = pmnActivityInstanceConfigService.getOne(Wrappers.lambdaQuery().eq(PmnActivityInstanceConfig::getInstanceId, instanceId)); + PmnPromotionSrc saveSrc = new PmnPromotionSrc(); + saveSrc.setCaseId(config.getCaseId()); + saveSrc.setCode(state); + saveSrc.setCreateTime(new Date()); + saveSrc.setExpiredTime(instanceVO.getEndTime()); + saveSrc.setInstanceId(instanceId); + saveSrc.setPromoterId(cpUserDO.getId()); + saveSrc.setIsAddition(2L); + saveSrc.setType(1L); + saveSrc.setUpdateTime(new Date()); + saveSrc.setStatus(1L); + PoiStore store = poiStoreDOMapper.selectById(storeId); + String url = storeEmployeeService.createActivityQrCode(turnBackDTOS.getWxData().getUserId(), store.getCode(), 1, instanceId, promoterId); + saveSrc.setQrCode(url); + pmnPromotionSrcService.save(saveSrc); + } + } } /** 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 bcc5727..a62ff71 100644 --- a/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java +++ b/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java @@ -90,6 +90,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 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); + } + } /** * 好友添加回调通知