今正微走参数变更同步变更及优化

fs-admin/src/main/java/com/fs/third/controller/WeizouController.java

@@ -69,7 +69,7 @@ public class WeizouController extends BaseController {
         if (map.get("orderCode") == null) {
             return error("参数异常请核验参数");
         }
-        fsStoreOrder.setOrderId(Long.valueOf((String) map.get("orderCode")));
+        fsStoreOrder.setOrderCode(((String) map.get("orderCode")));
         //取消订单
         if (map.get("operation") == null)return error("参数异常请核验参数:operator不能为空");
         fsStoreOrder.setOperator((String) map.get("operation"));

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

@@ -4839,7 +4839,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
             FsStoreOrder o = (FsStoreOrder) order;
             if (o.getStatus() == STATUS_PENDING_SHIPMENT) {
                 fsStoreOrder.setOrderId(o.getOrderId());
-                updateOrderToCancelled(fsStoreOrder);
+                updateOrderToCancelled(o);
             }
             return this::saveOrderLog;
         }
@@ -4847,14 +4847,14 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
             FsStoreOrderScrm o = (FsStoreOrderScrm) order;
             if (o.getStatus() == STATUS_PENDING_SHIPMENT) {
                 fsStoreOrder.setOrderId(o.getId());
-                updateOrderToCancelledScrm(fsStoreOrder);
+                updateOrderToCancelledScrm(o);
             }
             return this::saveOrderLogScrm;
         }
         FsIntegralOrder o = (FsIntegralOrder) order;
         if (o.getStatus() == STATUS_PENDING_SHIPMENT) {
             fsStoreOrder.setOrderId(o.getOrderId());
-            updateOrderToCancelledIntegral(fsStoreOrder);
+            updateOrderToCancelledIntegral(o);
         }
         return this::saveOrderLogIntegral;
     }
@@ -4865,7 +4865,10 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
             if (o.getStatus() == STATUS_SHIPPED) {
                 fsStoreOrder.setOrderId(o.getOrderId());
                 if (fsStoreOrder.getOperator().equals(WeizouOrderExpressEnum.CANCELED.getCode())){
-                    updateOrderToEvaluated(fsStoreOrder,STATUS_TO_EVALUATED);
+                    o.setStatus(STATUS_TO_EVALUATED);
+                    o.setUpdateTime(new DateTime());
+                    o.setDeliveryTime(getCurrentDateTimeString());
+                    fsStoreOrderMapper.updateFsStoreOrder(o);
                 }
             }
             return this::saveOrderLog;
@@ -4875,7 +4878,10 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
             if (o.getStatus() == STATUS_PENDING_SHIPMENT) {
                 fsStoreOrder.setOrderId(o.getId());
                 if (fsStoreOrder.getOperator().equals(WeizouOrderExpressEnum.CANCELED.getCode())){
-                    updateOrderToEvaluated(fsStoreOrder,STATUS_SHIPPED);
+                    o.setStatus(STATUS_SHIPPED);
+                    o.setUpdateTime(new DateTime());
+                    o.setDeliveryTime(getCurrentDateTimeString());
+                    fsStoreOrderScrmMapper.updateFsStoreOrder(o);
                 }
             }
             return this::saveOrderLogScrm;
@@ -4884,7 +4890,10 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         if (o.getStatus() == STATUS_PENDING_SHIPMENT) {
             fsStoreOrder.setOrderId(o.getOrderId());
             if (fsStoreOrder.getOperator().equals(WeizouOrderExpressEnum.CANCELED.getCode())){
-                updateOrderToEvaluated(fsStoreOrder,STATUS_SHIPPED);
+                o.setStatus(STATUS_SHIPPED);
+                o.setUpdateTime(new DateTime());
+                o.setDeliveryTime(new Date());
+                fsIntegralOrderMapper.updateFsIntegralOrder(o);
             }
         }
         return this::saveOrderLogIntegral;
@@ -5014,16 +5023,16 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
 
         fsStoreOrderMapper.updateFsStoreOrder(updateOrder);
     }
-    private void updateOrderToCancelledScrm(FsStoreOrder fsStoreOrder) {
+    private void updateOrderToCancelledScrm(FsStoreOrderScrm fsStoreOrder) {
         FsStoreOrderScrm updateOrder = new FsStoreOrderScrm();
-        updateOrder.setId(fsStoreOrder.getOrderId());
+        updateOrder.setId(fsStoreOrder.getId());
         updateOrder.setStatus(STATUS_PENDING_SHIPMENT);//待发货
         updateOrder.setUpdateTime(new DateTime());
         updateOrder.setDeliveryTime(getCurrentDateTimeString());
 
         fsStoreOrderScrmMapper.updateFsStoreOrder(updateOrder);
     }
-    private void updateOrderToCancelledIntegral(FsStoreOrder fsStoreOrder) {
+    private void updateOrderToCancelledIntegral(FsIntegralOrder fsStoreOrder) {
         FsIntegralOrder updateOrder = new FsIntegralOrder();
         updateOrder.setOrderId(fsStoreOrder.getOrderId());
         updateOrder.setStatus(STATUS_PENDING_SHIPMENT);//待发货