合并代码。

src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java

@@ -36,8 +36,6 @@ public class PromotionSrcVO {
 
     private PoiStore store;
 
-    private PoiStore store;
-
     private Long caseId;
 
     private Long status;

src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java

@@ -393,53 +393,4 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpl<PmnActivityInsta
             pmnActivityPromotionCaseService.update(endCase, Wrappers.<PmnActivityPromotionCase>lambdaQuery().in(PmnActivityPromotionCase::getInstanceId, endInstances).ne(PmnActivityPromotionCase::getStatus, 2));
         }
     }
-
-    @Transactional
-    @Override
-    public void scanValidAndSet() {
-        Date now = new Date();
-        List<PmnActivityInstance> starts = pmnActivityInstanceService.list(Wrappers.<PmnActivityInstance>lambdaQuery().eq(PmnActivityInstance::getStatus, 1).le(PmnActivityInstance::getBeginTime, now).ge(PmnActivityInstance::getEndTime, now).select(PmnActivityInstance::getId));
-        if(starts.size() > 0) {
-            starts.stream().forEach(item -> item.setStatus(2L));
-            Set<Long> startInstances = starts.stream().map(PmnActivityInstance::getId).collect(Collectors.toSet());
-            pmnActivityInstanceService.updateBatchById(starts);
-            PmnPromotionSrc startPromotionSrc = new PmnPromotionSrc();
-            startPromotionSrc.setStatus(1L);
-            PmnActivityInstanceConfig startConfig = new PmnActivityInstanceConfig();
-            startConfig.setStatus(1L);
-            PmnActivityStoreRelation startStoreRelation = new PmnActivityStoreRelation();
-            startStoreRelation.setStatus(1);
-            PmnActivityPromotionCase startCase = new PmnActivityPromotionCase();
-            startCase.setStatus(1L);
-            pmnPromotionSrcService.update(startPromotionSrc, Wrappers.<PmnPromotionSrc>lambdaQuery().in(PmnPromotionSrc::getInstanceId, startInstances).ne(PmnPromotionSrc::getStatus, 1));
-            pmnActivityInstanceConfigService.update(startConfig, Wrappers.<PmnActivityInstanceConfig>lambdaQuery().in(PmnActivityInstanceConfig::getInstanceId, startInstances).ne(PmnActivityInstanceConfig::getStatus, 1));
-            pmnActivityStoreRelationService.update(startStoreRelation, Wrappers.<PmnActivityStoreRelation>lambdaQuery().in(PmnActivityStoreRelation::getInstanceId, startInstances).ne(PmnActivityStoreRelation::getStatus, 1));
-            pmnActivityPromotionCaseService.update(startCase, Wrappers.<PmnActivityPromotionCase>lambdaQuery().in(PmnActivityPromotionCase::getInstanceId, startInstances).ne(PmnActivityPromotionCase::getStatus, 1));
-            log.info("starts: {}", starts);
-        }
-    }
-
-    @Transactional
-    @Override
-    public void scanInvalidAndSer() {
-        Date now = new Date();
-        List<PmnActivityInstance> ends = pmnActivityInstanceService.list(Wrappers.<PmnActivityInstance>lambdaQuery().ne(PmnActivityInstance::getStatus, 3).ne(PmnActivityInstance::getStatus, 4).le(PmnActivityInstance::getEndTime, now).select(PmnActivityInstance::getId));
-        if(ends.size() > 0) {
-            ends.stream().forEach(item -> item.setStatus(3L));
-            Set<Long> endInstances = ends.stream().map(PmnActivityInstance::getId).collect(Collectors.toSet());
-            pmnActivityInstanceService.updateBatchById(ends);
-            PmnPromotionSrc endPromotionSrc = new PmnPromotionSrc();
-            endPromotionSrc.setStatus(2L);
-            PmnActivityInstanceConfig endConfig = new PmnActivityInstanceConfig();
-            endConfig.setStatus(2L);
-            PmnActivityStoreRelation endStoreRelation = new PmnActivityStoreRelation();
-            endStoreRelation.setStatus(2);
-            PmnActivityPromotionCase endCase = new PmnActivityPromotionCase();
-            endCase.setStatus(2L);
-            pmnPromotionSrcService.update(endPromotionSrc, Wrappers.<PmnPromotionSrc>lambdaQuery().in(PmnPromotionSrc::getInstanceId, endInstances).ne(PmnPromotionSrc::getStatus, 2));
-            pmnActivityInstanceConfigService.update(endConfig, Wrappers.<PmnActivityInstanceConfig>lambdaQuery().in(PmnActivityInstanceConfig::getInstanceId, endInstances).ne(PmnActivityInstanceConfig::getStatus, 2));
-            pmnActivityStoreRelationService.update(endStoreRelation, Wrappers.<PmnActivityStoreRelation>lambdaQuery().in(PmnActivityStoreRelation::getInstanceId, endInstances).ne(PmnActivityStoreRelation::getStatus, 2));
-            pmnActivityPromotionCaseService.update(endCase, Wrappers.<PmnActivityPromotionCase>lambdaQuery().in(PmnActivityPromotionCase::getInstanceId, endInstances).ne(PmnActivityPromotionCase::getStatus, 2));
-        }
-    }
 }

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

@@ -115,9 +115,6 @@ public class CustomerService {
     @Autowired
     private IPmnActivityInstanceService pmnActivityInstanceService;
 
-    @Autowired
-    private IPmnPromotionSrcService pmnPromotionSrcService;
-
     @Autowired
     private StoreEmployeeService storeEmployeeService;
     @Autowired

src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java

@@ -1424,7 +1424,7 @@ public class StoreEmployeeService {
 
         PrivilageUserDO us = new PrivilageUserDO();
         us.setName(shop.getName());
-        us.setMobile(poiStoreStaffVO.getMobil());
+        us.setMobil(poiStoreStaffVO.getMobil());
         us.setEmail("");
         us.setAddress("");
         us.setStatus(1);

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

@@ -130,21 +130,6 @@ public class SynchronousController {
             return bsdFriendsExistResponse;
         }
     }
-    @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);
-        }
-    }
 
     /**
      * 好友添加回调通知

src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java

@@ -41,7 +41,7 @@ public class PrivilageUserDO implements Serializable {
     /**
      * 电话
      */
-    private String mobile;
+    private String mobil;
 
     /**
      * 邮箱

src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java

@@ -267,7 +267,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
         QueryWrapper<PrivilageUserDO> mobileUserQw = new QueryWrapper<>();
         mobileUserQw.eq("mobil", mobil).eq("status", "1");
         List<PrivilageUserDO> mobileUsers = privilageUserDOMapper.selectList(mobileUserQw);
-        if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobile().equals(mobil)) {
+        if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobil().equals(mobil)) {
             return AccountEnum.ACCOUNT_MODIFY_STATUS_MOBILE_EXISTS.getType();
         }
 
@@ -286,7 +286,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
         privilageUserDO.setId(modifyAccountInput.getUserId());
         privilageUserDO.setName(modifyAccountInput.getUserName());
         privilageUserDO.setUpdateTime(new Date());
-        privilageUserDO.setMobile(modifyAccountInput.getMobil());
+        privilageUserDO.setMobil(modifyAccountInput.getMobil());
         privilageUserDOMapper.updateById(privilageUserDO);
 
         //保存用户角色

src/main/java/com/kiisoo/ic/system/service/impl/PrivilageUserServiceImpl.java

@@ -61,7 +61,7 @@ public class PrivilageUserServiceImpl extends ServiceImpl<PrivilageUserDOMapper,
         privilageUserDO.setName(userName);
         privilageUserDO.setStatus(UserEnum.USER_STATUS_NORMAL.getType());
         privilageUserDO.setCreateTime(new Date());
-        privilageUserDO.setMobile(mobil);
+        privilageUserDO.setMobil(mobil);
         privilageUserDOMapper.insert(privilageUserDO);
         return privilageUserDO.getId();
     }