需求

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

@@ -87,7 +87,7 @@ public class WorkerLogic {
             //保险购买状态，没有购买的意外险
             if (websitUser.getExamineStatus().equals(ExamineWorkerStatusEnum.WAIT_WORKER.getKey()) &&
                     workerPolicyService.lambdaQuery().eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
-                    .in(WorkerPolicy::getStatus,"ON","WAIT_ON")
+                    .in(WorkerPolicy::getStatus,"DSX","BZZ")
                     .eq(WorkerPolicy::getPolicyType,"AC")
                     .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
                     .count() < 1) {
@@ -105,7 +105,7 @@ public class WorkerLogic {
             // 购买的意外险，七天后过期 每天提醒一次
             if (  workerPolicyService.lambdaQuery()
                     .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
-                    .in(WorkerPolicy::getStatus,"ON","WAIT_ON")
+                    .in(WorkerPolicy::getStatus,"DSX","BZZ")
                     .le(WorkerPolicy::getEndTime, DateUtil.offsetDay(new Date(),7))
                     .eq(WorkerPolicy::getPolicyType,"AC")
                     .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
@@ -115,7 +115,7 @@ public class WorkerLogic {
 
                 List<WorkerPolicy> list = workerPolicyService.lambdaQuery()
                         .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
-                        .in(WorkerPolicy::getStatus, "ON", "WAIT_ON")
+                        .in(WorkerPolicy::getStatus, "DSX", "BZZ")
                         .le(WorkerPolicy::getEndTime, DateUtil.offsetDay(new Date(), 7))
                         .eq(WorkerPolicy::getPolicyType, "AC")
                         .eq(WorkerPolicy::getWebsitUserId, websitUser.getId())
@@ -134,8 +134,8 @@ public class WorkerLogic {
 
                 workerPolicyService.lambdaUpdate()
                         .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
-                        .in(WorkerPolicy::getStatus,"OFF")
-                        .notIn(WorkerPolicy::getStatus,"ON","WAIT_ON")
+                        .in(WorkerPolicy::getStatus,"YSX")
+                        .notIn(WorkerPolicy::getStatus,"DSX","BZZ")
                         .eq(WorkerPolicy::getPolicyType,"AC")
                         .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
                         .set(WorkerPolicy::getExTime,DateUtil.endOfDay(new Date())).update();
@@ -144,8 +144,8 @@ public class WorkerLogic {
             // 意外险失效，没有购买的意外险
             if (  workerPolicyService.lambdaQuery()
                     .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
-                    .in(WorkerPolicy::getStatus,"OFF")
-                    .notIn(WorkerPolicy::getStatus,"ON","WAIT_ON")
+                    .in(WorkerPolicy::getStatus,"YSX")
+                    .notIn(WorkerPolicy::getStatus,"DSX","BZZ")
                     .eq(WorkerPolicy::getPolicyType,"AC")
                     .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
                     .le(WorkerPolicy::getExTime,new Date())
@@ -153,8 +153,8 @@ public class WorkerLogic {
 
                 workerPolicyService.lambdaUpdate()
                         .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
-                        .in(WorkerPolicy::getStatus,"OFF")
-                        .notIn(WorkerPolicy::getStatus,"ON","WAIT_ON")
+                        .in(WorkerPolicy::getStatus,"YSX")
+                        .notIn(WorkerPolicy::getStatus,"DSX","BZZ")
                         .eq(WorkerPolicy::getPolicyType,"AC")
                         .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
                         .set(WorkerPolicy::getExTime,DateUtil.endOfDay(new Date())).update();

mall-server-api/src/main/java/com/gree/mall/manager/constant/Constant.java

@@ -109,6 +109,7 @@ public class Constant {
         public static final String NEW_CHANGE = "jsm:sxb:parts:change:sales:";
         public static final String PARTS_REFUND = "jsm:sxb:lock:parts:refund";
         public static final String FDD_BATCH_SIGN_NOTIFY = "jsm:sxb:fdd:batch:sign:notify:";
+        public static final String TOKEN_GREE = "SETTLE:TOKEN:GREE";
     }
     public class ChatMessage {
         public final static String MSG_TYPE_DOC = "docmsg";

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

@@ -6,29 +6,67 @@ import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.utils.StringUtils;
 import com.gree.mall.manager.bean.policy.ItfGreeSynDownloadRecBean;
 import com.gree.mall.manager.constant.Constant;
+import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.plus.entity.ItfGreeSynDownloadRec;
 import com.gree.mall.manager.plus.entity.ItfGreeSynRule;
 import com.gree.mall.manager.plus.service.ItfGreeSynDownloadRecService;
 import com.gree.mall.manager.plus.service.ItfGreeSynRuleService;
+import com.gree.mall.manager.utils.RedisUtil;
+import com.gree.mall.manager.utils.http.HttpUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 @Slf4j
 @RequiredArgsConstructor
 public class SyncOrderInfoLogic {
 
+
+    @Value("${gree.V3.gettoken}")
+    private String tokenUrl;
+    @Value("${gree.check.barcode}")
+    private String checkBarcodeUrl;
+    @Value("${gree.repair.settle.get}")
+    private String getRepairSettleUrl;
+    @Value("${gree.repair.settle.do}")
+    private String doRepairSettleUrl;
+    @Value("${gree.client.id}")
+    private String clientId;
+    @Value("${gree.V3.client.secert}")
+    private String clientSecert;
+    @Value("${gree.api.url}")
+    private String apiUrl;
+    @Value("${gree.gz.appid}")
+    private String gzAppId;
+    @Value("${gree.gz.appkey}")
+    private String gzAppKey;
+    @Value("${gree.fs.appid}")
+    private String fsAppId;
+    @Value("${gree.fs.appkey}")
+    private String fsAppKey;
+    //    @Value("${gree.cloud.api.url}")
+//    private String cloudApiUrl;
+    @Value("${gree.V3.api.url}")
+    private String v3ApiUrl;
+    @Value("${gree.V3.gettoken}")
+    private String v3TokenUrl;
+    @Value("${gree.V3.client.secert}")
+    private String v3ClientSecert;
+    @Value("${gree.url}")
+    private String apiUrlFeedBack;
+
     @Autowired
     ItfGreeSynRuleService itfGreeSynRuleService;
 
@@ -38,6 +76,9 @@ public class SyncOrderInfoLogic {
     @Value("${gree.url}")
     private  String greeUrl;
 
+    @Autowired
+    RedisUtil redisUtil;
+
     public void syncGuang() {
         ItfGreeSynRule itfGreeSynRule = itfGreeSynRuleService.lambdaQuery().eq(ItfGreeSynRule::getSalesWebsitNumber, Constant.gree.GUANGZHOUXIAOSI)
                 .one();
@@ -70,6 +111,33 @@ 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 * 60 * 60);
+        }
+        return accessToken;
+    }
+
     public void syncFo() {
     }
 }

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

@@ -218,9 +218,9 @@ public class UserLogic {
         Map<String, AdminWebsit> websitMap = list.stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, Function.identity()));
         int index = 0;
         //先删除
-        userWaitService.lambdaUpdate()
+ /*       userWaitService.lambdaUpdate()
                 .eq(UserWait::getCompanyWechatId, adminUser.getCompanyWechatId())
-                .remove();
+                .remove();*/
 
         List<UserWait> userWaits = new ArrayList<>();
         for (Object o : datas) {

mall-server-api/src/main/java/com/gree/mall/manager/utils/http/HttpUtils.java

@@ -8,6 +8,10 @@ import com.gree.mall.manager.exception.RemoteServiceException;
 import okhttp3.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
 
 import java.io.IOException;
 import java.util.Map;
@@ -240,5 +244,16 @@ public class HttpUtils {
 
     }
 
+    static public String requestXwww(String url, MultiValueMap<String, String> forms) {
+        // 设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED);
+        RestTemplate restTemplate=new RestTemplate();
+        HttpEntity<MultiValueMap<String, String>> httpEntity = new HttpEntity<MultiValueMap<String, String>>(forms, headers);
 
+        //获取返回数据
+        String body = restTemplate.postForObject(url, httpEntity, String.class);
+        return body;
+
+    }
 }

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

@@ -129,3 +129,22 @@ fadada.websit.sign.notify.url=${sys.url}/${server.servlet.context-path}/fdd/noti
 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
+
+
+#总部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.client.id=guangfoserver
+gree.V3.client.secert=3b23c33b-106d-4837-b506-7779335247d9
+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
+gree.repair.settle.do=${gree.V3.url}/api/sso/autoapp-default-server-greerepairaccounts/api/repairsettlement/gzBatchSettlement
+#总部接口地址
+gree.api.url=${gree.V3.url}/api/sso/autoapp-default-server-guangzhou/api/outapp/default/general
+gree.web.url=${gree.V3.url}/api/sso/autoapp-default-server-guangzhou
+gree.grant_type=client_credentials
+gree.gz.appid=O921980101
+gree.gz.appkey=4Bx3m3fOMatutVv1u08kUdtIYZ4FsN4x
+gree.fs.appid=O921980101
+gree.fs.appkey=4Bx3m3fOMatutVv1u08kUdtIYZ4FsN4x