1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -149,33 +149,25 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             //司机终止
             if("1".equals(orderInfo.getTerminator())){
                 //司机端和货主端装态改为已终止
-                orderInfo1.setOrderStatusKey(StatusEnum.DRIVER_ORDER_END.getFlag());
-                orderInfo1.setOrderStatus(StatusEnum.DRIVER_ORDER_END.getName());
-                orderInfo1.setCargoOwnerStatusKey(StatusEnum.OWNER_ORDER_END.getFlag());
-                orderInfo1.setCargoOwnerStatus(StatusEnum.OWNER_ORDER_END.getName());
                 orderInfo1.setTerminator("1");
                 this.updateById(orderInfo1);
             }
             //货主终止
             else if ("2".equals(orderInfo.getTerminator())){
                 //司机端和货主端装态改为已终止
-                orderInfo1.setOrderStatusKey(StatusEnum.DRIVER_ORDER_END.getFlag());
-                orderInfo1.setOrderStatus(StatusEnum.DRIVER_ORDER_END.getName());
-                orderInfo1.setCargoOwnerStatusKey(StatusEnum.OWNER_ORDER_END.getFlag());
-                orderInfo1.setCargoOwnerStatus(StatusEnum.OWNER_ORDER_END.getName());
                 orderInfo1.setTerminator("2");
-                this.updateById(orderInfo1);
             }
             //平台终止
             else {
                 //司机端和货主端装态改为已终止
-                orderInfo1.setOrderStatusKey(StatusEnum.DRIVER_ORDER_END.getFlag());
-                orderInfo1.setOrderStatus(StatusEnum.DRIVER_ORDER_END.getName());
-                orderInfo1.setCargoOwnerStatusKey(StatusEnum.OWNER_ORDER_END.getFlag());
-                orderInfo1.setCargoOwnerStatus(StatusEnum.OWNER_ORDER_END.getName());
                 orderInfo1.setTerminator("3");
                 this.updateById(orderInfo1);
             }
+            orderInfo1.setOrderStatusKey(StatusEnum.DRIVER_ORDER_END.getFlag());
+            orderInfo1.setOrderStatus(StatusEnum.DRIVER_ORDER_END.getName());
+            orderInfo1.setCargoOwnerStatusKey(StatusEnum.OWNER_ORDER_END.getFlag());
+            orderInfo1.setCargoOwnerStatus(StatusEnum.OWNER_ORDER_END.getName());
+            this.updateById(orderInfo1);
         }
         return "ok";
     }