update

src/main/java/com/gogirl/application/order/serve/OrderManageService.java

@@ -107,12 +107,34 @@ public interface OrderManageService extends IService<OrderManage> {
      */
     List<OrderServe> addOrModifyOrderComment(CreateCommentCommand cmd);
 
+    /**
+     * 更新订单数据完整
+     *
+     * @param om
+     */
     void updateOrderDataIntegrity(OrderManage om);
 
+    /**
+     * 美甲师确认收款
+     *
+     * @param orderId
+     * @param payType
+     * @param technicianId
+     */
     void confirmOrder(Integer orderId, Integer payType, Integer technicianId);
 
+    /**
+     * 预约订单微信余额微信支付回调
+     *
+     * @param result 回调结果
+     */
     void notifyBalanceWxPayOrder(WxPayOrderNotifyResult result);
 
+    /**
+     * 预约订单微信支付回调
+     *
+     * @param result 回调结果
+     */
     void notifyWxPayOrder(WxPayOrderNotifyResult result);
 
     /**

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -844,7 +844,9 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
 
         log.info("更新订单状态");
-
+        if (!orderManage.getStatus().equals(OrderManage.STATUS_UN_PAY)) {
+            throw new RRException("订单状态异常");
+        }
         //订单状态 待评价
         orderManage.setStatus(OrderManage.STATUS_UN_COMMENT);
 
@@ -892,6 +894,9 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         log.info("设置订单折扣详情 orderManageDTO {}", orderManage);
 
         log.info("更新订单状态");
+        if (!orderManage.getStatus().equals(OrderManage.STATUS_UN_PAY)) {
+            throw new RRException("订单状态异常");
+        }
         //订单状态 待评价
         orderManage.setStatus(OrderManage.STATUS_UN_COMMENT);