在不发货的地区编码中

yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/liantong/client/ZopHttpClient.java

@@ -102,7 +102,7 @@ public class ZopHttpClient implements ZopClient {
     @Override
     public <T extends ZopResponse> T execute(ZopRequest<T> request, String reqSecTag) {
         try {
-            FieldValidateUtils.validateAllField(request);
+            //FieldValidateUtils.validateAllField(request);
             StringBuilder sb = new StringBuilder(StringUtils.isEmpty(reqUrl) ? HttpConstant.DEFAULT_URL : reqUrl);
             sb.append(request.getPath());
             LOG.info("ZOP【" + request.getPathName() + "】请求地址URL=" + sb.toString());

yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/superiorapi/SuperiorApiMapper.java

@@ -30,4 +30,4 @@ public interface SuperiorApiMapper extends BaseMapperX<SuperiorApiDO> {
                 .orderByDesc(SuperiorApiDO::getId));
     }
 
-}
+}

yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java

@@ -85,23 +85,8 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
         //  并且根据上游下单结果处理ordersDO
         // 最后把 处理后的ordersDO 更新存入数据库
         ordersDO = handleOrderCreate(ordersDO);
-        ordersMapper.updateById(ordersDO);
+        this.updateOrderById(ordersDO);
 
-        // 判断是否需要发送短信
-        // 如果订单订单状态变更需要发送短信
-        if (statusOld != null && statusOld.equals(ordersDO.getStatus())) {
-            // 创建后需要发送短信
-            smsTaskService.sendSMS(
-                    ordersDO.getStatus(),
-                    ordersDO.getId(),
-                    ordersDO.getSource(),
-                    ordersDO.getOnSaleProductId(),
-                    ordersDO.getRefundStatus(),
-                    ordersDO.getCallStatus(),
-                    ordersDO.getAddressMobile(),
-                    ordersDO
-            );
-        }
         return orderId;
     }
 
@@ -248,17 +233,22 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
             }
 
         }
-
+        this.updateOrderById(updateObj);
+    }
+    
+    private void updateOrderById(OrdersDO updateObj){
+        OrdersDO oldOrderDo = ordersMapper.selectById(updateObj.getId());
+        if (oldOrderDo == null) {
+            throw exception(ORDERS_NOT_EXISTS);
+        }
         // 保证下面字段信息不会变化
         updateObj.setOnSaleProductId(oldOrderDo.getOnSaleProductId());
         updateObj.setProducerId(oldOrderDo.getProducerId());
         updateObj.setSuperiorProductConfigId(oldOrderDo.getSuperiorProductConfigId());
         updateObj.setSuperiorApiId(oldOrderDo.getSuperiorApiId());
 
-        ordersMapper.updateById(updateObj);
-
         // 状态变化：发送短信提醒
-        if (updateReqVO.getStatus() != null && updateReqVO.getStatus().equals(oldOrderDo.getStatus())) {
+        if (updateObj.getStatus() != null && updateObj.getStatus().equals(oldOrderDo.getStatus())) {
 
             smsTaskService.sendSMS(
                     updateObj.getStatus(),
@@ -271,7 +261,6 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
                     updateObj
             );
         }
-
     }
 
     @Override
@@ -288,7 +277,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
         Integer autoType = haoKaProduct.getAutoType();
         updateObj.setAutoType(autoType);
 
-        ordersMapper.updateById(updateObj);
+        this.updateOrderById(updateObj);
         Long status = updateObj.getStatus();
 //        进入审核流程
         if (status != null && status == 450L) {
@@ -305,7 +294,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
             } else {
 //                手动生产
                 updateObj.setStatus(450L);
-                ordersMapper.updateById(updateObj);
+                this.updateOrderById(updateObj);
             }
 
         }
@@ -360,7 +349,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
             ordersDO.setStatus(-460L);
             ordersDO.setUpstreamOrderStatus(-460);
         }
-        ordersMapper.updateById(ordersDO);
+        this.updateOrderById(ordersDO);
     }
 
     /**
@@ -421,7 +410,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
         }
         orderOperateLogService.createOrderOperateLog(logSaveReqVO);
         // 更新订单
-        ordersMapper.updateById(ordersDO);
+        this.updateOrderById(ordersDO);
         return ordersDO;
     }
 

yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/smstask/SmsTaskServiceImpl.java

@@ -156,6 +156,7 @@ public class SmsTaskServiceImpl implements SmsTaskService {
 
     private String getImageUrl(OrdersDO ordersDO) {
         String orderCreateResponse = ordersDO.getOrderCreateResponse();
+        // "{\"orderNo\":\"2965011263622670\",\"shortUrl\":\"https://uc.gtimg.cn/Dd0mWN07\"}"
         if (StringUtils.isEmpty(orderCreateResponse)) {
             return "";
         }

yudao-server/src/main/resources/application.yaml

@@ -305,6 +305,14 @@ yudao:
       - rep_demo_jianpiao
       - tmp_report_data_1
       - tmp_report_data_income
+#      - haoka_superior_api
+      - haoka_superior_api_dev_config
+      - haoka_superior_api_sku_config
+      - haoka_province
+      - haoka_city
+      - haoka_area
+      - haoka_street
+      - haoka_village
     ignore-caches:
       - user_role_ids
       - permission_menu_ids