批量修改活码

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmClerkRelationServiceImpl.java

@@ -150,17 +150,18 @@ public class HmClerkRelationServiceImpl implements HmClerkRelationService {
     
     @Override
     public ServiceResponse<List<HmBatchModifyResultDTO>> batchModify(HmBatchModifyQDTO qdto) {
+        int maxCount = 3 ;
         List<Long> hmIdList = qdto.getHmIdList() ;
         String enterpriseId = qdto.getEnterpriseId() ;
         List<TabHaobanHmClerkRelation> list = this.tabHaobanHmClerkRelationMapper.listHmClerkByHmIdList(hmIdList) ;
-        log.info("查询活码数量={},{}",list.size(),hmIdList.size());
+        log.info("查询活码关联导购数={},活码数={}",list.size(),hmIdList.size());
         Map<Long,List<TabHaobanHmClerkRelation>> map = list.stream().collect(Collectors.groupingBy(TabHaobanHmClerkRelation::getHmId));
         Map<Long , Set<String>> modifyMap = new HashMap<>();
         List<HmBatchModifyResultDTO> errList = new ArrayList<>() ;
         for(Long hmId : hmIdList) {
             List<TabHaobanHmClerkRelation> staffRelationList =  map.get(hmId) ;
             if (CollectionUtils.isEmpty(staffRelationList)) {
-                log.info("活码不存在={}",hmId);
+                log.info("活码无关联导购={}",hmId);
                 continue;
             }
             Set<String> staffIdSet = staffRelationList.stream().map(o->o.getStaffId()).collect(Collectors.toSet()) ;
@@ -171,7 +172,7 @@ public class HmClerkRelationServiceImpl implements HmClerkRelationService {
                 // add
                 if(qdto.getOptType()==1) {
                     staffIdSetBak.addAll(modifyIdList) ;
-                    if(staffIdSetBak.size()>100) {
+                    if(staffIdSetBak.size()>maxCount) {
                         HmBatchModifyResultDTO err = new HmBatchModifyResultDTO(hmId,1,"超出多人活码成员数上限,最多支持添加100个成员") ;
                         errList.add(err) ;
                     }
@@ -189,7 +190,7 @@ public class HmClerkRelationServiceImpl implements HmClerkRelationService {
                     log.info("无人活码={}",hmId);
                     continue ;
                 }
-                if(staffIdSet.size()>100) {
+                if(staffIdSet.size()>maxCount) {
                     log.info("超人数活码={}",hmId);
                     continue ;
                 }
@@ -222,6 +223,7 @@ public class HmClerkRelationServiceImpl implements HmClerkRelationService {
         if (StringUtils.isBlank(taskId)) {
             return ServiceResponse.failure("9999", "创建任务失败") ;
         }
+        log.info("总任务数={},taskid={}",modifyMap.size(),taskId);
         List<TabHaobanPreDealLog> dealLogList = modifyMap.keySet().stream().map(hmid -> {
             TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
             dealLog.setEnterpriseId(enterpriseId);
@@ -236,7 +238,9 @@ public class HmClerkRelationServiceImpl implements HmClerkRelationService {
         }).collect(Collectors.toList());
         this.preDealService.insert(dealLogList);
         this.sendToMq(taskId, dealLogList.stream().map(o->o.getDataId()).collect(Collectors.toSet()), SyncTaskStatusEnum.modify_hm);
-        return ServiceResponse.success() ;
+        ServiceResponse resp = ServiceResponse.success() ;
+        resp.setMessage(taskId);
+        return resp ;
     }
 
     private void sendToMq(String taskId, Set<String> dealList, SyncTaskStatusEnum syncTaskStatusEnum) {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/hm/QwHmOperation.java

@@ -56,7 +56,7 @@ public class QwHmOperation implements BaseSyncOperation {
         if(resp.isSuccess()) {
             this.preDealService.updateStatusByDataId(taskId, dataPre.getDataId(), 2, null);
         }else {
-            this.preDealService.updateStatusByDataId(taskId, dataPre.getDataId(), 2, resp.getMessage());
+            this.preDealService.updateStatusByDataId(taskId, dataPre.getDataId(), 3, resp.getMessage());
         }
         this.dealSuccess(taskId, dataPre.getDataId(), enterpriseId, wxEnterpriseId);
     }

haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmQrcodeMapper.xml

@@ -313,8 +313,11 @@
 		            </foreach>
             )
         </if>
-        <if test="null != statusFlagInt">
-        	and a.status_flag = #{statusFlagInt}
+        <if test="null != statusFlagInt and statusFlagInt !=10">
+            and a.status_flag = #{statusFlagInt}
+        </if>
+        <if test="null != statusFlagInt and statusFlagInt ==10">
+            and a.status_flag in (1,3)
         </if>
         <if test="null != hmTypeInt">
         	and a.hm_type=#{hmTypeInt}  

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmQrcodeController.java

@@ -261,6 +261,8 @@ public class HmQrcodeController {
     
     @RequestMapping(value = "get-hm-for-batch", method = RequestMethod.POST)
     public RestResponse<Object> getHmFormBatch(@RequestBody HmQrcodeListQO qo) {
+        // 查询有效的
+        qo.getInFields().setStatusFlagInt(10);
         List<String> list = this.getHmCount(qo) ;
         if(list.size() > 1000) {
             return RestResponse.failure("9999", "最多支持1000条数据") ;