今正微走订单推送备注，签收订单状态变更

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

@@ -4717,6 +4717,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
             throw new CustomException("地址格式不对请正确写入详细地址！！");
         }
         param.setEntryList(orders);
+        param.setRemark("互医订单");
         String s = WeizouApiClient.pushOrder(param);
         log.info("微走推送结果：{}",s);
     }
@@ -4863,20 +4864,28 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
             FsStoreOrder o = (FsStoreOrder) order;
             if (o.getStatus() == STATUS_SHIPPED) {
                 fsStoreOrder.setOrderId(o.getOrderId());
-                updateOrderToEvaluated(fsStoreOrder);
+                if (fsStoreOrder.getOperator().equals(WeizouOrderExpressEnum.CANCELED.getCode())){
+                    updateOrderToEvaluated(fsStoreOrder,STATUS_TO_EVALUATED);
+                }
             }
             return this::saveOrderLog;
         }
         if (order instanceof FsStoreOrderScrm) {
             FsStoreOrderScrm o = (FsStoreOrderScrm) order;
-            if (o.getStatus() == STATUS_SHIPPED) {
+            if (o.getStatus() == STATUS_PENDING_SHIPMENT) {
                 fsStoreOrder.setOrderId(o.getId());
+                if (fsStoreOrder.getOperator().equals(WeizouOrderExpressEnum.CANCELED.getCode())){
+                    updateOrderToEvaluated(fsStoreOrder,STATUS_SHIPPED);
+                }
             }
             return this::saveOrderLogScrm;
         }
         FsIntegralOrder o = (FsIntegralOrder) order;
-        if (o.getStatus() == STATUS_SHIPPED) {
+        if (o.getStatus() == STATUS_PENDING_SHIPMENT) {
             fsStoreOrder.setOrderId(o.getOrderId());
+            if (fsStoreOrder.getOperator().equals(WeizouOrderExpressEnum.CANCELED.getCode())){
+                updateOrderToEvaluated(fsStoreOrder,STATUS_SHIPPED);
+            }
         }
         return this::saveOrderLogIntegral;
     }
@@ -5026,10 +5035,10 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
     /**
      * 更新订单为待评价状态
      */
-    private void updateOrderToEvaluated(FsStoreOrder fsStoreOrder) {
+    private void updateOrderToEvaluated(FsStoreOrder fsStoreOrder,Integer status) {
         FsStoreOrder updateOrder = new FsStoreOrder();
         updateOrder.setOrderId(fsStoreOrder.getOrderId());
-        updateOrder.setStatus(STATUS_TO_EVALUATED);
+        updateOrder.setStatus(status);
         updateOrder.setUpdateTime(new DateTime());
         updateOrder.setDeliveryTime(getCurrentDateTimeString());
 
@@ -5260,6 +5269,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
             throw new CustomException("地址格式不对请正确写入详细地址！！");
         }
         param.setEntryList(orders);
+        param.setRemark("积分兑换订单");
         String s ="";
         try {
             s = WeizouApiClient.pushOrder(param);
@@ -5342,6 +5352,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
             throw new CustomException("地址格式不对请正确写入详细地址！！");
         }
         param.setEntryList(orders);
+        param.setRemark("商城订单");
         String s ="";
         try {
             s = WeizouApiClient.pushOrder(param);