代码优化

ruoyi-common/ruoyi-common-51weishi/src/main/java/org/dromara/common/weishi/service/WeishiService.java

@@ -12,12 +12,6 @@ import java.util.List;
  */
 public interface WeishiService {
 
-    /**
-     * 认证接口
-     *
-     * @return 数据
-     */
-    AuthResponse authorize();
 
     /**
      * 认证

ruoyi-common/ruoyi-common-51weishi/src/main/java/org/dromara/common/weishi/service/impl/WeishiServiceImpl.java

@@ -7,7 +7,6 @@ import org.dromara.common.weishi.Api;
 import org.dromara.common.weishi.base.RequestMethodEnum;
 import org.dromara.common.weishi.common.ApiHttpResponse;
 import org.dromara.common.weishi.common.Code;
-import org.dromara.common.weishi.config.UserConfig;
 import org.dromara.common.weishi.enums.DomainEnum;
 import org.dromara.common.weishi.enums.auth.AuthApiEnum;
 import org.dromara.common.weishi.enums.insure.InsureApiEnum;
@@ -29,27 +28,10 @@ import java.util.Objects;
  **/
 public class WeishiServiceImpl implements WeishiService {
 
-    @Override
-    public AuthResponse authorize() {
-        ApiHttpResponse res = Api.v1(RequestMethodEnum.POST,
-            DomainEnum.TEST.getDomain(),
-            AuthApiEnum.AUTHORIZE.getUrl(),
-            null,
-            JSON.toJSONString(
-                new AuthRequest()
-                    .setUsername(UserConfig.USERNAME)
-                    .setPassword(UserConfig.PASSWORD)
-            ));
-        if (!Objects.equals(res.getResultTp(), Code.SUCCESS.getCode())) {
-            throw new WeishiException(res.getResultMsg());
-        }
-        return JSON.parseObject(res.getData(), AuthResponse.class);
-    }
-
     @Override
     public AuthResponse authorize(AuthRequest request) {
         ApiHttpResponse res = Api.v1(RequestMethodEnum.POST,
-            DomainEnum.TEST.getDomain(),
+            DomainEnum.PROD.getDomain(),
             AuthApiEnum.AUTHORIZE.getUrl(),
             null,
             JSON.toJSONString(request));
@@ -62,7 +44,7 @@ public class WeishiServiceImpl implements WeishiService {
     @Override
     public ApplyResponse insureApply(String token, ApplyRequest request) {
         ApplyResponse res = Api.v1(RequestMethodEnum.POST,
-            DomainEnum.TEST.getDomain(),
+            DomainEnum.PROD.getDomain(),
             InsureApiEnum.APPLY.getUrl(),
             token,
             JSON.toJSONString(request),
@@ -76,7 +58,7 @@ public class WeishiServiceImpl implements WeishiService {
     @Override
     public ProposalResponse insureProposal(String token, ProposalRequest request) {
         ProposalResponse res = Api.v1(RequestMethodEnum.POST,
-            DomainEnum.TEST.getDomain(),
+            DomainEnum.PROD.getDomain(),
             InsureApiEnum.PROPOSAL.getUrl(),
             token,
             JSON.toJSONString(request),
@@ -93,7 +75,7 @@ public class WeishiServiceImpl implements WeishiService {
             .put("OrderNum", orderNum)
             .build();
         IssueResponse res = Api.v1(RequestMethodEnum.POST,
-            DomainEnum.TEST.getDomain(),
+            DomainEnum.PROD.getDomain(),
             StrUtil.format(InsureApiEnum.ISSUE.getUrl(), map),
             token,
             null,
@@ -110,7 +92,7 @@ public class WeishiServiceImpl implements WeishiService {
             .put("orderId", orderId)
             .build();
         IssueResponse res = Api.v1(RequestMethodEnum.POST,
-            DomainEnum.TEST.getDomain(),
+            DomainEnum.PROD.getDomain(),
             StrUtil.format(InsureApiEnum.ABANDON.getUrl(), map),
             token,
             null,
@@ -126,7 +108,7 @@ public class WeishiServiceImpl implements WeishiService {
             .put("orderId", orderId)
             .build();
         ApiHttpResponse res = Api.v1(RequestMethodEnum.GET,
-            DomainEnum.TEST.getDomain(),
+            DomainEnum.PROD.getDomain(),
             StrUtil.format(InsureApiEnum.DETAIL.getUrl(), map),
             token,
             null);
@@ -142,7 +124,7 @@ public class WeishiServiceImpl implements WeishiService {
             .put("orderNum", orderNum)
             .build();
         return Api.v1(RequestMethodEnum.DOWNLOAD,
-            DomainEnum.TEST.getDomain(),
+            DomainEnum.PROD.getDomain(),
             StrUtil.format(InsureApiEnum.DOWNLOAD.getUrl(), map),
             token,
             null,
@@ -156,7 +138,7 @@ public class WeishiServiceImpl implements WeishiService {
             .put("orderNum", orderNum)
             .build();
         ApiHttpResponse res = Api.v1(RequestMethodEnum.POST,
-            DomainEnum.TEST.getDomain(),
+            DomainEnum.PROD.getDomain(),
             StrUtil.format(InsureApiEnum.CANCEL.getUrl(), map),
             token,
             null);
@@ -171,7 +153,7 @@ public class WeishiServiceImpl implements WeishiService {
             .put("policyNum", policyNum)
             .build();
         ApiHttpResponse res = Api.v1(RequestMethodEnum.POST,
-            DomainEnum.TEST.getDomain(),
+            DomainEnum.PROD.getDomain(),
             StrUtil.format(InsureApiEnum.POLICY_CANCEL.getUrl(), map),
             token,
             null);
@@ -183,7 +165,7 @@ public class WeishiServiceImpl implements WeishiService {
     @Override
     public List<ProductsResponse> productList(String token) {
         ApiHttpResponse res = Api.v1(RequestMethodEnum.GET,
-            DomainEnum.TEST.getDomain(),
+            DomainEnum.PROD.getDomain(),
             ProductApiEnum.PRODUCT_LIST.getUrl(),
             token,
             null);
@@ -199,7 +181,7 @@ public class WeishiServiceImpl implements WeishiService {
             .put("productId", productId)
             .build();
         ApiHttpResponse res = Api.v1(RequestMethodEnum.GET,
-            DomainEnum.TEST.getDomain(),
+            DomainEnum.PROD.getDomain(),
             StrUtil.format(ProductApiEnum.PRODUCT_DETAIL.getUrl(), map),
             token,
             null);
@@ -216,7 +198,7 @@ public class WeishiServiceImpl implements WeishiService {
             .put("annexTp", annexTp)
             .build();
         ApiHttpResponse res = Api.v1(RequestMethodEnum.GET,
-            DomainEnum.TEST.getDomain(),
+            DomainEnum.PROD.getDomain(),
             StrUtil.format(ProductApiEnum.ANNEX.getUrl(), map),
             token,
             null);

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/weishi/impl/InsureServiceImpl.java

@@ -239,18 +239,22 @@ public class InsureServiceImpl extends AbstractBaseService<InsureVo, InsureBo, I
             //获取被保人集合
             List<InsureInsureds> insuredsList = insuredsMapper.selectList(new LambdaQueryWrapper<InsureInsureds>().in(InsureInsureds::getOrderNum, orderNumList));
             insureList.forEach(i -> {
-                DetailResponse dr = weishiService.insureDetail(thirdWeishiService.getToken(i.getCreateDept()), i.getOrderId());
-                if (!StringUtils.equals(i.getStatus(), dr.getStatus())) {
-                    i.setStatus(dr.getStatus());
-                    baseMapper.updateById(i);
-                    //跟新投保单位
-                    List<InsureUnit> iuList = StreamUtils.filter(unitList, u -> StringUtils.equals(u.getOrderNum(), i.getOrderNum()));
-                    iuList.forEach(iu -> iu.setStatus(dr.getStatus()));
-                    unitMapper.updateBatch(iuList);
-                    //跟新被保人信息
-                    List<InsureInsureds> iiList = StreamUtils.filter(insuredsList, insureds -> StringUtils.equals(insureds.getOrderNum(), i.getOrderNum()));
-                    iiList.forEach(ii -> ii.setStatus(dr.getStatus()));
-                    insuredsMapper.updateBatch(iiList);
+                try {
+                    DetailResponse dr = weishiService.insureDetail(thirdWeishiService.getToken(i.getCreateDept()), i.getOrderId());
+                    if (!StringUtils.equals(i.getStatus(), dr.getStatus())) {
+                        i.setStatus(dr.getStatus());
+                        baseMapper.updateById(i);
+                        //跟新投保单位
+                        List<InsureUnit> iuList = StreamUtils.filter(unitList, u -> StringUtils.equals(u.getOrderNum(), i.getOrderNum()));
+                        iuList.forEach(iu -> iu.setStatus(dr.getStatus()));
+                        unitMapper.updateBatch(iuList);
+                        //跟新被保人信息
+                        List<InsureInsureds> iiList = StreamUtils.filter(insuredsList, insureds -> StringUtils.equals(insureds.getOrderNum(), i.getOrderNum()));
+                        iiList.forEach(ii -> ii.setStatus(dr.getStatus()));
+                        insuredsMapper.updateBatch(iiList);
+                    }
+                } catch (Exception e) {
+                    log.info("旅游卫士订单{}更新失败", i.getOrderNum());
                 }
             });
         }