需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -217,7 +217,9 @@ public class WorkerLogic {
 
         WorkerPolicy workerPolicy = workerPolicyService.getById(id);
 
-        PolicyOrderDetail policyOrderDetail = BeanUtil.toBean(workerPolicy, PolicyOrderDetail.class);
+        PolicyOrder policyOrder = policyOrderService.getById(workerPolicy.getOrderId());
+
+        PolicyOrderDetail policyOrderDetail = BeanUtil.toBean(policyOrder, PolicyOrderDetail.class);
 
         Policy policy = policyService.getById(workerPolicy.getOrderId());
 
@@ -404,9 +406,6 @@ public class WorkerLogic {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
 
 
-
-
-
         String source = StringUtil.isEmpty(commonLogic.getSource())?"B":commonLogic.getSource();
 
         String miniOpenId = commonLogic.getMiniOpenId();

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/PayLogic.java

@@ -996,7 +996,8 @@ public class PayLogic {
         workerPolicy.setType("IN");
         workerPolicy.setPolicyName(policy.getPolicyName());
         workerPolicy.setPolicyOrder(policy.getPolicyNumber());
-        workerPolicy.setOrderId(policy.getId());
+        workerPolicy.setOrderId(policyOrder.getId());
+        workerPolicy.setPolicyOrder(policy.getPolicyNumber());
         workerPolicy.setPolicyType("AC");
         workerPolicy.setStartTime(policyOrder.getStartTime());
         workerPolicy.setEndTime(policyOrder.getEndTime());

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -1284,7 +1284,8 @@ public class UserLogic {
                 userApplyBean.getWorkerPolicy().setWebsitId(websitUser.getWebsitId());
                 userApplyBean.getWorkerPolicy().setWebsitName(websitUser.getWebsitName());
                 userApplyBean.getWorkerPolicy().setWorkerName(user.getNickName());
-                userApplyBean.getWorkerPolicy().setType("AC");
+                userApplyBean.getWorkerPolicy().setType("LINE");
+                userApplyBean.getWorkerPolicy().setPolicyType("AC");
                 userApplyBean.getWorkerPolicy().setStatus("BZZ");
                 userApplyBean.getWorkerPolicy().setWorkerId(websitUser.getWorkerNumber());
             }
@@ -1322,6 +1323,7 @@ public class UserLogic {
         }
 
         if (userApplyBean.getWorkerPolicy()!= null && userApplyBean.getWorkerPolicy().getStartTime() != null) {
+
             userApplyBean.getWorkerPolicy().insert();
         }
     }

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

@@ -50,4 +50,14 @@ public class SyncController {
         syncOrderInfoLogic.syncFo();
         return ResponseHelper.success();
     }
+
+
+    @PostMapping("/syncDetail")
+    @ApiOperation("同步订单详情")
+    public ResponseHelper syncDetail(
+
+    ) throws ParseException {
+        syncOrderInfoLogic.syncDetail();
+        return ResponseHelper.success();
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.gree.mall.manager.logic;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpUtil;
@@ -7,7 +9,9 @@ import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.common.util.UuidUtils;
 import com.aliyuncs.utils.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.gree.mall.manager.bean.policy.ItfGreeSynDownloadRecBean;
@@ -65,8 +69,6 @@ public class SyncOrderInfoLogic {
     private String v3TokenUrl;
     @Value("${gree.V3.client.secert}")
     private String v3ClientSecert;
-    @Value("${gree.url}")
-    private String apiUrlFeedBack;
 
     @Autowired
     ItfGreeSynRuleService itfGreeSynRuleService;
@@ -74,7 +76,7 @@ public class SyncOrderInfoLogic {
     @Autowired
     ItfGreeSynDownloadRecService itfGreeSynDownloadRecService;
 
-    @Value("${gree.url}")
+    @Value("${gree.four.url}")
     private  String greeUrl;
 
     @Autowired
@@ -88,18 +90,24 @@ public class SyncOrderInfoLogic {
 
         String accessToken = this.getAccessTokenV3();
 
+        log.info(greeUrl+ Constant.gree.GET_UPDATE_ORDERS+"/"+Constant.gree.GUANGZHOUXIAOSI+"/"+time);
 
-        String body = HttpRequest.get(greeUrl+ Constant.gree.GET_UPDATE_ORDERS+"/"+Constant.gree.GUANGZHOUXIAOSI+"/"+time)
-                .header("authorization","Bearer " + accessToken)
-                .execute().body();
+        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());
 
-        JSONArray jsonArray = JSONUtil.parseArray(JSON.parseObject(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))
@@ -108,11 +116,27 @@ public class SyncOrderInfoLogic {
         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);
+
     }
 
 
@@ -138,12 +162,10 @@ public class SyncOrderInfoLogic {
         String s = HttpUtils.requestXwww(v3TokenUrl, 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_V3, accessToken, 2 * 60 * 60);
-        }
-        return accessToken;
+        Map<String,Object> bodyMap = JSON.parseObject(s);
+        Map<String,Object> map = JSON.parseObject(bodyMap.get("data").toString());
+
+        return (String) map.get("access_token");
     }
 
 
@@ -175,5 +197,63 @@ public class SyncOrderInfoLogic {
     }
 
     public void syncFo() {
+
+        ItfGreeSynRule itfGreeSynRule = itfGreeSynRuleService.lambdaQuery().eq(ItfGreeSynRule::getSalesWebsitNumber, Constant.gree.FOSHANXIAOSI)
+                .one();
+
+        Long time = itfGreeSynRule.getLastSynTime().getTime()/1000;
+
+        String accessToken = this.getAccessTokenV3();
+
+
+        String body = HttpRequest.get(greeUrl+ Constant.gree.GET_UPDATE_ORDERS+"/"+Constant.gree.GUANGZHOUXIAOSI+"/"+time)
+                .header("authorization","Bearer " + accessToken)
+                .execute().body();
+
+
+        Map<String,Object> bodyMap = JSON.parseObject(body);
+
+        log.info("【工单同步数据内容】:"+bodyMap.get("data").toString());
+
+        JSONArray jsonArray = JSONUtil.parseArray(JSON.parseObject(bodyMap.get("data").toString()));
+
+
+        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.setOrderNode(itfGreeSynDownloadRecBean.getOrderNode());
+            itfGreeSynDownloadRec.setRegionOutletsNo(itfGreeSynDownloadRecBean.getRegionOutletsNo());
+            itfGreeSynDownloadRec.setRegionOutletsName(itfGreeSynDownloadRecBean.getRegionOutletsName());
+
+            itfGreeSynDownloadRecs.add(itfGreeSynDownloadRec);
+        }
+
+        itfGreeSynDownloadRecService.saveBatch(itfGreeSynDownloadRecs);
+    }
+
+    public void syncDetail() {
+
+        List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecs = itfGreeSynDownloadRecService.lambdaQuery()
+                .eq(ItfGreeSynDownloadRec::getGreeStatSynStatus, 0).last("limit 10").list();
+
+
+
+
+
+
     }
 }

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

@@ -117,6 +117,7 @@ public class WorkerManagerLogic {
 
     @Transactional(rollbackFor = Exception.class)
     public void update(WorkerManagerBean workerManagerBean) {
+        workerManagerBean.setCreateTime(null);
 
         User user = userService.getById(workerManagerBean.getUserId());
 
@@ -179,6 +180,8 @@ public class WorkerManagerLogic {
 
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
+        workerManagerBean.setCreateTime(null);
+
         workerManagerBean.setExamineBy(adminUser.getNickName());
         workerManagerBean.setExamineTime(new Date());
 
@@ -250,7 +253,7 @@ public class WorkerManagerLogic {
                 throw new RemoteServiceException("请填工程师意外险");
 
 
-            if (workerPolicies.stream().filter(item -> item.getStatus().equals("BZZ")).count() > 0) {
+            if (workerPolicies.stream().filter(item -> item.getStatus().equals("BZZ")).count() < 1) {
                 throw new RemoteServiceException("意外险必须有生效的保险");
             }
 
@@ -284,7 +287,7 @@ public class WorkerManagerLogic {
                     throw new RemoteServiceException("雇主险有相同覆盖范围内的保险");
 
 
-                if (workerPoliciesEm.stream().filter(item -> item.getStatus().equals("BZZ")).count() > 0) {
+                if (workerPoliciesEm.stream().filter(item -> item.getStatus().equals("BZZ")).count() < 1) {
                     throw new RemoteServiceException("雇主险必须有生效的保险");
                 }
             }
@@ -457,7 +460,7 @@ public class WorkerManagerLogic {
         workerManagerBean.setPolicyExamineBy(adminUser.getNickName());
         workerManagerBean.setPolicyExamineTime(new Date());
 
-
+        workerManagerBean.setCreateTime(null);
         workerManagerBean.updateById();
 
 

mall-server-api/src/main/resources/bootstrap-dev.properties

@@ -128,14 +128,14 @@ fadada.websit.auth.notify.url=${sys.url}/${server.servlet.context-path}/fdd/noti
 fadada.websit.sign.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/websit/batch/sign
 fadada.websit.person.auth.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/websit/person
 
-gree.url=https://api.sms-test.gree.com/api/sso/sms-server-order-external
+gree.four.url=http://api.sms-test.gree.com/api/sso/sms-server-order-external
 
 
 #总部3.0接口地址
 gree.V3.url=https://api-sms.gree.com
-gree.V3.gettoken=https://idm-sms.gree.com/auth/realms/gree-shyun/protocol/openid-connect/token
+gree.V3.gettoken=http://api.sms-test.gree.com/api/pub/nts-foundation-flycloud-user/api/v1/openid-connect/token
 gree.client.id=guangfoserver
-gree.V3.client.secert=3b23c33b-106d-4837-b506-7779335247d9
+gree.V3.client.secert=f81f5ac8-ad24-4212-9b2d-9cc78f982562
 gree.V3.api.url=${gree.V3.url}/api/sso/autoapp-default-server-greeshmobile/api/yunpaigong/accessories
 gree.check.barcode=${gree.V3.url}/api/sso/autoapp-default-server-installaccounts/api/ext/azwgmx/checkBarcode
 gree.repair.settle.get=${gree.V3.url}/api/sso/autoapp-default-server-greerepairaccounts/api/JsBzController/xsGetJsbzByJxxmh