Merge branch 'dev' into 'test'

mall-server-front/src/main/java/com/fzm/mall/server/front/constant/PaymentTypeConst.java

@@ -37,7 +37,7 @@ public class PaymentTypeConst {
     /**
      * 待支付
      */
-    public final static int PAY_WAIT = 0;
+    public final static int PAY_WAIT = 7;
 
     /**
      * 待收货

mall-server-front/src/main/java/com/fzm/mall/server/front/enums/OrderStateEnum.java

@@ -3,6 +3,10 @@ package com.fzm.mall.server.front.enums;
 public enum OrderStateEnum {
 
     /**
+     * 6->支付中
+     */
+    ORDER_STATE_PAYING(6),
+    /**
      * 7->待支付
      */
     ORDER_STATE_TO_PAY(7),

mall-server-front/src/main/java/com/fzm/mall/server/front/mq/consumer/orderCloseCousumer.java

@@ -37,7 +37,7 @@ public class orderCloseCousumer {
             log.error("orderPayConsumer:pid:"+message +"订单不存在");
             return;
         }
-        if(pay.getState()!=6){
+        if(pay.getState()!=3 || pay.getState()!=6){
             log.error("orderPayConsumer:pid:"+message +"订单状态不成功");
             return;
         }

mall-server-front/src/main/java/com/fzm/mall/server/front/order/service/impl/OrderServiceImpl.java

@@ -1238,12 +1238,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             return;
         }
         /**
-         * 关单前的订单状态:待支付
+         * 关单前的订单状态:待支付，支付中
          */
         order.setOrderState(2);
         UpdateWrapper<Order> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("oid", order.getOid())
-                .eq("order_state", OrderStateEnum.ORDER_STATE_TO_PAY.getState());
+                .in("order_state", Arrays.asList(OrderStateEnum.ORDER_STATE_PAYING.getState(), OrderStateEnum.ORDER_STATE_TO_PAY.getState()));
         int update = orderMapper.update(order, updateWrapper);
         if (update == 0) {
             log.error("close order fail, order:" + order.toString());
@@ -1266,17 +1266,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         }
     }
 
-    /**
-     * 关闭订单前校验订单是否为“待支付”
-     *
-     * @param order
-     */
-    private void checkOrderStateBeforeClose(Order order) {
-        if (order.getOrderState() != OrderStateEnum.ORDER_STATE_TO_PAY.getState()) {
-            throw new RuntimeException("close order fail, order:" + order.toString());
-        }
-    }
-
     @Override
     @Transactional
     public int applyReturn(String uid, String oid) {