需求

mall-server-api/src/main/java/com/gree/mall/manager/controller/policy/MailboxController.java

@@ -126,4 +126,12 @@ public class MailboxController {
         return ResponseHelper.success();
     }
 
+
+    @ApiOperation(value = "发送邮件")
+    @PostMapping("test")
+    public ResponseHelper send(){
+        agreementLogic.sendEmailSche();
+        return ResponseHelper.success();
+    }
+
 }

mall-server-api/src/main/java/com/gree/mall/manager/controller/sync/SyncController.java

@@ -42,14 +42,6 @@ public class SyncController {
         return ResponseHelper.success();
     }
 
-    @PostMapping("/syncFo")
-    @ApiOperation("同步佛山销司")
-    public ResponseHelper syncFo(
-
-    ) throws ParseException {
-        syncOrderInfoLogic.syncFo();
-        return ResponseHelper.success();
-    }
 
 
     @PostMapping("/syncDetail")

mall-server-api/src/main/java/com/gree/mall/manager/logic/SyncOrderInfoLogic.java

@@ -195,14 +195,12 @@ public class SyncOrderInfoLogic {
 
             String accessToken = this.getAccessTokenV3();
 
-            log.info(greeUrl + Constant.gree.GET_UPDATE_ORDERS + "/" + Constant.gree.GUANGZHOUXIAOSI + "/" + time);
-
             Map<String, String> params = new HashMap<>();
 
             Map<String, String> heard = new HashMap<>();
             heard.put("authorization", "Bearer " + accessToken);
 
-            String body = HttpUtils.requestGet(greeUrl + Constant.gree.GET_UPDATE_ORDERS + "/" + Constant.gree.GUANGZHOUXIAOSI + "/" + time, params, heard);
+            String body = HttpUtils.requestGet(greeUrl + Constant.gree.GET_UPDATE_ORDERS + "/" + itfGreeSynRule.getSalesWebsitNumber() + "/" + time, params, heard);
 
             Map<String, Object> bodyMap = JSON.parseObject(body);
 
@@ -213,37 +211,48 @@ public class SyncOrderInfoLogic {
 
             JSONArray jsonArray = JSONUtil.parseArray(s);
 
+
+
+            itfGreeSynRule.setLastSynUpdTime(new Date());
+
+            itfGreeSynRule.updateById();
+
             List<ItfGreeSynDownloadRecBean> itfGreeSynDownloadRecBeans = JSONUtil.toList(jsonArray, ItfGreeSynDownloadRecBean.class);
 
             if (CollectionUtils.isEmpty(itfGreeSynDownloadRecBeans))
-                return;
+                continue;
 
             List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecs = new ArrayList<>();
 
             Date date = new Date();
-            String batch = IdWorker.getIdStr();
+
 
             for (ItfGreeSynDownloadRecBean itfGreeSynDownloadRecBean : itfGreeSynDownloadRecBeans) {
                 ItfGreeSynDownloadRec itfGreeSynDownloadRec = new ItfGreeSynDownloadRec();
                 itfGreeSynDownloadRec.setSynReqTime(date);
                 itfGreeSynDownloadRec.setGreeStatSynStatus(0);
                 itfGreeSynDownloadRec.setSalesWebsitNumber(itfGreeSynRule.getSalesWebsitNumber());
-                itfGreeSynDownloadRec.setDownloadBatchNo(batch);
+
                 itfGreeSynDownloadRec.setWorkOrderId(itfGreeSynDownloadRecBean.getWorkOrderId());
                 itfGreeSynDownloadRec.setUpdatedTimestamp(DateUtil.date(Convert.toLong(itfGreeSynDownloadRecBean.getUpdatedTimestamp())));
                 itfGreeSynDownloadRec.setOrderNode(itfGreeSynDownloadRecBean.getOrderNode());
                 itfGreeSynDownloadRec.setRegionOutletsNo(itfGreeSynDownloadRecBean.getRegionOutletsNo());
                 itfGreeSynDownloadRec.setRegionOutletsName(itfGreeSynDownloadRecBean.getRegionOutletsName());
-
-
                 itfGreeSynDownloadRecs.add(itfGreeSynDownloadRec);
             }
 
-            itfGreeSynDownloadRecService.saveBatch(itfGreeSynDownloadRecs);
-
             List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecList = itfGreeSynDownloadRecs.stream()
                     .sorted(Comparator.comparing(ItfGreeSynDownloadRec::getUpdatedTimestamp).reversed()).collect(Collectors.toList());
 
+            itfGreeSynDownloadRecService.lambdaUpdate().in(ItfGreeSynDownloadRec::getWorkOrderId,
+                    itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getWorkOrderId)
+                            .collect(Collectors.toList()))
+                    .eq(ItfGreeSynDownloadRec::getGreeStatSynStatus,0)
+                    .set(ItfGreeSynDownloadRec::getGreeStatSynStatus,9)
+                    .update();
+
+            itfGreeSynDownloadRecService.saveBatch(itfGreeSynDownloadRecs);
+
             itfGreeSynRule.setLastSynTime(itfGreeSynDownloadRecList.get(0).getUpdatedTimestamp());
             itfGreeSynRule.setLastSynUpdTime(new Date());
 
@@ -282,110 +291,21 @@ public class SyncOrderInfoLogic {
     }
 
 
-    /**
-     * 获取总部接口的请求token
-     *
-     * @return
-     */
-    public String getAccessToken() throws RemoteServiceException {
-        String redisKey = Constant.RedisPrefix.TOKEN_GREE;
-        String token = (String) redisUtil.get(redisKey);
-        if (token != null) {
-            return token;
-        }
-        MultiValueMap<String, String> forms = new LinkedMultiValueMap<String, String>();
-
-        forms.put("client_id", Collections.singletonList(clientId));
-        forms.put("client_secret", Collections.singletonList(clientSecert));
-        forms.put("grant_type", Collections.singletonList("client_credentials"));
-        String s = HttpUtils.requestXwww(tokenUrl, forms);
-        //String s = HttpUtils.requestPostForm(tokenUrl, map, null);
-        log.info("【获取总部token】response:{}", s);
-        JSONObject jsonObject = JSONObject.parseObject(s);
-        String accessToken = jsonObject.getString("access_token");
-        if (StringUtils.isNotEmpty(accessToken)) {
-            redisUtil.set(Constant.RedisPrefix.TOKEN_GREE, accessToken, 2 * 6 * 6);
-        }
-        return accessToken;
-    }
-
-    public void syncFo() {
-        ItfGreeSynRule itfGreeSynRule = itfGreeSynRuleService.lambdaQuery().eq(ItfGreeSynRule::getSalesWebsitNumber, Constant.gree.GUANGZHOUXIAOSI)
-                .one();
-
-        Long time = itfGreeSynRule.getLastSynTime().getTime() / 1;
-
-        String accessToken = this.getAccessTokenV3();
-
-        log.info(greeUrl + Constant.gree.GET_UPDATE_ORDERS + "/" + Constant.gree.GUANGZHOUXIAOSI + "/" + time);
-
-        Map<String, String> params = new HashMap<>();
-
-        Map<String, String> heard = new HashMap<>();
-        heard.put("authorization", "Bearer " + accessToken);
-
-        String body = HttpUtils.requestGet(greeUrl + Constant.gree.GET_UPDATE_ORDERS + "/" + Constant.gree.GUANGZHOUXIAOSI + "/" + time, params, heard);
-
-        Map<String, Object> bodyMap = JSON.parseObject(body);
-
-        log.info("【工单同步数据内容】:" + bodyMap.get("data").toString());
-
-        String s = bodyMap.get("data").toString();
-
-
-        JSONArray jsonArray = JSONUtil.parseArray(s);
-
-        List<ItfGreeSynDownloadRecBean> itfGreeSynDownloadRecBeans = JSONUtil.toList(jsonArray, ItfGreeSynDownloadRecBean.class);
-
-        if (CollectionUtils.isEmpty(itfGreeSynDownloadRecBeans))
-            return;
-
-        List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecs = new ArrayList<>();
-
-        Date date = new Date();
-        String batch = IdWorker.getIdStr();
-
-        for (ItfGreeSynDownloadRecBean itfGreeSynDownloadRecBean : itfGreeSynDownloadRecBeans) {
-            ItfGreeSynDownloadRec itfGreeSynDownloadRec = new ItfGreeSynDownloadRec();
-            itfGreeSynDownloadRec.setSynReqTime(date);
-            itfGreeSynDownloadRec.setGreeStatSynStatus(0);
-            itfGreeSynDownloadRec.setSalesWebsitNumber(itfGreeSynRule.getSalesWebsitNumber());
-            itfGreeSynDownloadRec.setDownloadBatchNo(batch);
-            itfGreeSynDownloadRec.setWorkOrderId(itfGreeSynDownloadRecBean.getWorkOrderId());
-            itfGreeSynDownloadRec.setUpdatedTimestamp(DateUtil.date(Convert.toLong(itfGreeSynDownloadRecBean.getUpdatedTimestamp())));
-            itfGreeSynDownloadRec.setOrderNode(itfGreeSynDownloadRecBean.getOrderNode());
-            itfGreeSynDownloadRec.setRegionOutletsNo(itfGreeSynDownloadRecBean.getRegionOutletsNo());
-            itfGreeSynDownloadRec.setRegionOutletsName(itfGreeSynDownloadRecBean.getRegionOutletsName());
-            itfGreeSynDownloadRecs.add(itfGreeSynDownloadRec);
-        }
-
-        itfGreeSynDownloadRecService.saveBatch(itfGreeSynDownloadRecs);
-    }
-
     @Transactional(rollbackFor = Exception.class)
     public void syncDetail() {
 
-        List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecsBatch = itfGreeSynDownloadRecService.lambdaQuery()
-                .eq(ItfGreeSynDownloadRec::getGreeStatSynStatus, 0)
-                .groupBy(ItfGreeSynDownloadRec::getDownloadBatchNo)
-                .last("limit 1").list();
-        if (CollectionUtils.isEmpty(itfGreeSynDownloadRecsBatch))
-            return;
-
-        ItfGreeSynDownloadRec itfGreeSynDownloadRecsBatchOne = itfGreeSynDownloadRecsBatch.get(0);
-
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.SYNC_LOCK +itfGreeSynDownloadRecsBatchOne.getDownloadBatchNo());
 
         List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecs = itfGreeSynDownloadRecService.lambdaQuery()
-                .eq(ItfGreeSynDownloadRec::getGreeStatSynStatus, 0)
-                .eq(ItfGreeSynDownloadRec::getDownloadBatchNo,itfGreeSynDownloadRecsBatchOne.getDownloadBatchNo())
+                .in(ItfGreeSynDownloadRec::getGreeStatSynStatus, 0,99)
+                .last("limit 50")
+                .orderByAsc(ItfGreeSynDownloadRec::getGreeStatSynStatus)
                 .list();
-        try {
-            if (!obtain.tryLock(5, TimeUnit.SECONDS)) {
-                throw new RemoteServiceException("系统繁忙，请稍后再试");
-            }
+        if (CollectionUtils.isEmpty(itfGreeSynDownloadRecs))
+            return;
 
 
+        try {
+
             String batch = IdWorker.getIdStr();
 
             String accessToken = this.getAccessTokenV3();
@@ -584,12 +504,10 @@ public class SyncOrderInfoLogic {
             itfGreeSynDownloadRecService.lambdaUpdate()
                     .in(ItfGreeSynDownloadRec::getSynReqId, syncIds)
                     .set(ItfGreeSynDownloadRec::getGreeStatSynErrMsg, e.getMessage())
-                    .set(ItfGreeSynDownloadRec::getGreeStatSynErrMsg, new Date())
+                    .set(ItfGreeSynDownloadRec::getGreeStatSynTime, new Date())
                     .set(ItfGreeSynDownloadRec::getGreeStatSynStatus, 99).update();
 
 
-        } finally {
-            obtain.unlock();
         }
 
     }

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/CommonLogic.java

@@ -121,7 +121,7 @@ public class CommonLogic {
             AdminUser admin = adminUserService.lambdaQuery().eq(AdminUser::getUserName, "admin").one();
             AdminUserCom adminUserCom = new AdminUserCom();
             BeanUtils.copyProperties(admin,adminUserCom);
-            AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById("1831608878894858241");
+            AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById("1");
             adminUserCom.setAdminCompanyWechat(adminCompanyWechat);
             adminUserCom.setJoinCode(adminCompanyWechat.getJoinCode());
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -433,7 +433,7 @@ public class AgreementLogic {
 
         //今天要发送的保单
         //Date startTime = DateUtil.beginOfDay(new Date());
-        Date endTime = DateUtil.parseDateTime(DateUtils.formatDate(new Date(),"yyyy-MM-dd") +" "+ mailbox.getSendTime()+":00");
+/*        Date endTime = DateUtil.parseDateTime(DateUtils.formatDate(new Date(),"yyyy-MM-dd") +" "+ mailbox.getSendTime()+":00");
         if(new Date().getTime() < endTime.getTime()){
             //还没到可发邮件的时间
             return;
@@ -441,7 +441,7 @@ public class AgreementLogic {
 
         if (mailboxSendRecordService.lambdaQuery().gt(MailboxSendRecord::getSendTime, DateUtil.beginOfDay(new Date())).count() > 0) {
             return;
-        }
+        }*/
 
 
         List<MailboxReceive> mailboxReceives = mailboxReceiveService.lambdaQuery().eq(MailboxReceive::getMailboxId, mailbox.getId()).list();

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -365,7 +365,7 @@ public class WorkerManagerLogic {
 
         //找有无可替换，有替换，无生成
         List<PolicyOrder> policyOrders = policyOrderService.lambdaQuery().eq(PolicyOrder::getWebsitId, workerManagerBean.getWebsitId())
-                .eq(PolicyOrder::getStartTime, PolicyOrderEmStutasEnum.KTH.getKey()).list();
+                .eq(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.KTH.getKey()).list();
 
         if (!CollectionUtils.isEmpty(policyOrders)) {
 

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -1532,4 +1532,6 @@
         </if>
         ${ex.orderBy}
     </select>
+
+
 </mapper>