‘linchangsheng’ 6 달 전
부모
커밋
3d885ea7a0

+ 11 - 0
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/user/WorkerController.java

@@ -70,6 +70,17 @@ public class WorkerController {
     }
 
 
+    @PostMapping("/agreementList")
+    @ApiOperation("保险协议列表")
+    public ResponseHelper<List<Agreement>> agreementList(
+            @ApiParam(value = "policyId", required = true) @RequestParam String policyId,
+            HttpServletRequest request
+    ) throws ParseException {
+        List<Agreement> agreements =  workerLogic.agreementList(policyId);
+        return ResponseHelper.success(agreements);
+    }
+
+
     @PostMapping("/agreement")
     @ApiOperation("保险协议配置详情")
     public ResponseHelper<Agreement> agreement(

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

@@ -398,4 +398,18 @@ public class WorkerLogic {
 
         return adminWebsits;
     }
+
+    public List<Agreement> agreementList(String policyId) {
+
+        List<AgreementPolicy> agreementPolicies = agreementPolicyService.lambdaQuery().eq(AgreementPolicy::getPolicyId, policyId).list();
+
+        if (!CollectionUtils.isEmpty(agreementPolicies)){
+            List<Agreement> agreements = agreementService.lambdaQuery().in(Agreement::getId,
+                    agreementPolicies.stream().map(AgreementPolicy::getAgreementId).collect(Collectors.toList())
+            ).eq(Agreement::getStatus, "ON").list();
+
+            return agreements;
+        }
+        return new ArrayList<>();
+    }
 }

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

@@ -1,6 +1,11 @@
 package com.gree.mall.manager.logic;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 import com.gree.mall.manager.constant.Constant;
 import com.gree.mall.manager.plus.entity.ItfGreeSynDownloadRec;
 import com.gree.mall.manager.plus.entity.ItfGreeSynRule;
@@ -12,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 @Service
 @Slf4j
 @RequiredArgsConstructor
@@ -30,12 +37,19 @@ public class SyncOrderInfoLogic {
         ItfGreeSynRule itfGreeSynRule = itfGreeSynRuleService.lambdaQuery().eq(ItfGreeSynRule::getSalesWebsitNumber, Constant.gree.GUANGZHOUXIAOSI)
                 .one();
 
+        Long time = itfGreeSynRule.getLastSynTime().getTime()/1000;
+
+
+        String body = HttpRequest.get(greeUrl+ Constant.gree.GET_UPDATE_ORDERS+"/"+Constant.gree.GUANGZHOUXIAOSI+"/"+time).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()));
+
 
 
-/*        String body = HttpRequest.post(greeUrl+ Constant.gree.GET_UPDATE_ORDERS+"/"+Constant.gree.GUANGZHOUXIAOSI+"/")
-                .header("key", jiaxianKey)
-                .header("sign", getSign())
-                .execute().body();*/
     }
 
     public void syncFo() {

+ 1 - 1
mall-server-api/src/main/java/com/gree/mall/manager/schedule/InsureEmailSchedule.java

@@ -15,7 +15,7 @@ import java.io.IOException;
  * 定时购买保险
  */
 @ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
-@Component
+//@Component
 public class InsureEmailSchedule {