今正微走订单推送积分订单，scrm订单状态优化

fs-service/src/main/java/com/fs/erp/utils/WeizouApiClient.java

@@ -171,8 +171,8 @@ public class WeizouApiClient {
                 .addHeader("token", token) // 假设使用Bearer Token
                 // TODO: 根据文档添加其他必要的Headers
                 .build();
-        log.info("订单推送请求参数打印："+request);
-        log.info("订单推送请求体打印："+orderData);
+//        log.info("订单推送请求参数打印："+request);
+//        log.info("订单推送请求体打印："+orderData);
 
         try (Response response = httpClient.newCall(request).execute()) {
             if (!response.isSuccessful()) {

fs-service/src/main/java/com/fs/his/domain/FsIntegralOrderLogs.java

@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
 public class FsIntegralOrderLogs{
 
     /** $column.columnComment */
-    private String logsId;
+    private Long logsId;
 
     /** 订单id */
     @Excel(name = "订单id")

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -4720,6 +4720,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         String s = WeizouApiClient.pushOrder(param);
         log.info("微走推送结果：{}",s);
     }
+    private static final int STATUS_INTEGRAL_PAYED = 1;
     private static final int STATUS_PENDING_SHIPMENT = 2;
     private static final int STATUS_SHIPPED = 3;
     private static final int STATUS_TO_EVALUATED = 4;
@@ -4807,7 +4808,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         if (order instanceof FsStoreOrderScrm) {
             FsStoreOrderScrm o = (FsStoreOrderScrm) order;
             fsStoreOrder.setOrderId(o.getId());
-            if (o.getStatus() == STATUS_PENDING_SHIPMENT) {
+            if (o.getStatus() == STATUS_INTEGRAL_PAYED) {
                 executeShipOrderScrm(o, fsStoreOrder, opeName);
             } else {
                 updateDeliveryInfoScrm(o, fsStoreOrder, opeName);
@@ -4816,14 +4817,14 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         }else{
             FsIntegralOrder o = (FsIntegralOrder) order;
             fsStoreOrder.setOrderId(o.getOrderId());
-            if (o.getStatus() == STATUS_PENDING_SHIPMENT) {
+            if (o.getStatus() == STATUS_INTEGRAL_PAYED) {
                 executeShipOrderIntegral(o, fsStoreOrder, opeName);
             } else {
                 updateDeliveryInfoIntegral(o, fsStoreOrder, opeName);
             }
 
         }
-        log.info("微走取消发货, 订单号: {}", fsStoreOrder.getOrderId());
+        log.info("微走发货, 订单号: {}", fsStoreOrder.getOrderId());
         return 1;
     }