订单状态枚举类

src/main/java/com/caimei365/order/components/OrderCommonService.java

@@ -1,6 +1,7 @@
 package com.caimei365.order.components;
 
 import com.caimei365.order.mapper.OrderCommonMapper;
+import com.caimei365.order.model.enums.OrderStatus;
 import com.caimei365.order.model.enums.ReceivablesType;
 import com.caimei365.order.model.vo.*;
 import com.caimei365.order.utils.ImageUtil;
@@ -33,12 +34,12 @@ public class OrderCommonService {
      */
     public void setOrderStatus(OrderVo order) {
         // 111, 待付待收待发
-        if (11 == order.getStatus() && 1 == order.getPayStatus()) {
+        if (OrderStatus.UNRECEIVED_AND_UNSHIPPED.getCode() == order.getStatus() && 1 == order.getPayStatus()) {
             order.setStatus(111);
         }
         // 判断交易全退情况下,是否发过货,77,交易全退可以查看物流
         int logisticsCount = orderCommonMapper.countLogisticsBatch(order.getOrderId());
-        if (7 == order.getStatus() && logisticsCount > 0) {
+        if (OrderStatus.FULL_RETURNED.getCode() == order.getStatus() && logisticsCount > 0) {
             order.setStatus(77);
         }
         // 判断二手订单情况下，若部分付款和已付款，排除退货/款的情况，且未确认打款供应商，10,添加确认打款供应商按钮

src/main/java/com/caimei365/order/model/enums/OrderStatus.java

@@ -0,0 +1,42 @@
+package com.caimei365.order.model.enums;
+
+/**
+ * 订单状态
+ *
+ * @author : Charles
+ * @date : 2021/8/17
+ */
+public enum OrderStatus {
+
+    UNCONFIRMED(0, "待确认"),
+    UNRECEIVED_AND_UNSHIPPED(11, "待收待发"),
+    UNRECEIVED_AND_PART_SHIPPED(12, "待收部发"),
+    UNRECEIVED_AND_FULL_SHIPPED(13, "待收全发"),
+    PART_RECEIVED_AND_UNSHIPPED(21, "部收待发"),
+    PART_RECEIVED_AND_PART_SHIPPED(22, "部收部发"),
+    PART_RECEIVED_AND_FULL_SHIPPED(23, "部收全发"),
+    RECEIVED_AND_UNSHIPPED(31, "已收待发"),
+    RECEIVED_AND_PART_SHIPPED(32, "已收部发"),
+    RECEIVED_AND_FULL_SHIPPED(33, "已收全发"),
+    TRANSACTION_COMPLETED(4, "交易完成"),
+    ORDER_COMPLETED(5, "订单完成"),
+    FULL_RETURNED(7, "交易全退"),
+    CLOSED(6, "已关闭");
+
+    private final int code;
+    private final String desc;
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    OrderStatus(int code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+}

src/main/java/com/caimei365/order/service/impl/OrderClubServiceImpl.java

@@ -9,6 +9,7 @@ import com.caimei365.order.mapper.BaseMapper;
 import com.caimei365.order.mapper.OrderClubMapper;
 import com.caimei365.order.mapper.OrderCommonMapper;
 import com.caimei365.order.model.ResponseJson;
+import com.caimei365.order.model.enums.OrderStatus;
 import com.caimei365.order.model.po.BalanceRecordPo;
 import com.caimei365.order.model.po.OrderPo;
 import com.caimei365.order.model.po.OrderProductPo;
@@ -221,7 +222,7 @@ public class OrderClubServiceImpl implements OrderClubService {
     @Override
     public ResponseJson<Void> confirmMainOrder(Integer orderId) {
         OrderPo order = orderClubMapper.getMainOrderByOrderId(orderId);
-        if (null == order || 0 != order.getStatus()) {
+        if (null == order || OrderStatus.UNCONFIRMED.getCode() != order.getStatus()) {
             // 非待确认订单
             return ResponseJson.error("订单异常！", null);
         }
@@ -281,7 +282,7 @@ public class OrderClubServiceImpl implements OrderClubService {
     @Override
     public ResponseJson<Void> cancelMainOrder(Integer orderId, String remark) {
         OrderPo order = orderClubMapper.getMainOrderByOrderId(orderId);
-        boolean cancelFlag = (null != order && (0 == order.getStatus() || 11 == order.getStatus()));
+        boolean cancelFlag = (null != order && (OrderStatus.UNCONFIRMED.getCode() == order.getStatus() || OrderStatus.UNRECEIVED_AND_UNSHIPPED.getCode() == order.getStatus()));
         if (!cancelFlag) {
             // 非待确认(或待收待发)订单
             return ResponseJson.error("订单异常！", null);
@@ -369,7 +370,7 @@ public class OrderClubServiceImpl implements OrderClubService {
     @Override
     public ResponseJson<Void> deleteMainOrder(Integer orderId) {
         OrderPo order = orderClubMapper.getMainOrderByOrderId(orderId);
-        if (null == order || 6 != order.getStatus()) {
+        if (null == order || OrderStatus.CLOSED.getCode() != order.getStatus()) {
             // 非已关闭订单
             return ResponseJson.error("订单异常！", null);
         }
@@ -412,10 +413,10 @@ public class OrderClubServiceImpl implements OrderClubService {
         if (null == order) {
             return ResponseJson.error("订单不存在！", null);
         }
-        if (33 == order.getStatus() && 3 == order.getPayStatus()) {
+        if (OrderStatus.RECEIVED_AND_FULL_SHIPPED.getCode() == order.getStatus() && 3 == order.getPayStatus()) {
             // 已付款供应商,订单完成
             order.setStatus(5);
-        } else if (33 == order.getStatus()) {
+        } else if (OrderStatus.RECEIVED_AND_FULL_SHIPPED.getCode() == order.getStatus()) {
             // 交易完成
             order.setStatus(4);
         } else {

src/main/java/com/caimei365/order/service/impl/PayOrderServiceImpl.java

@@ -13,6 +13,7 @@ import com.caimei365.order.model.bo.PayParamBo;
 import com.caimei365.order.model.dto.PayDto;
 import com.caimei365.order.model.dto.PayLinkDto;
 import com.caimei365.order.model.dto.SecondPayDto;
+import com.caimei365.order.model.enums.OrderStatus;
 import com.caimei365.order.model.po.*;
 import com.caimei365.order.model.vo.*;
 import com.caimei365.order.service.PayOrderService;
@@ -141,7 +142,7 @@ public class PayOrderServiceImpl implements PayOrderService {
         Double balancePayFee = 0d;
         if (MathUtil.compare(availableMoney, 0) > 0) {
             if (MathUtil.compare(availableMoney, order.getPendingPayments()) >= 0) {
-                if (0 != order.getStatus()) {
+                if (OrderStatus.UNCONFIRMED.getCode() != order.getStatus()) {
                     if (1 == order.getSendOutStatus()) {
                         order.setStatus(31);
                     } else if (2 == order.getSendOutStatus()) {
@@ -153,7 +154,7 @@ public class PayOrderServiceImpl implements PayOrderService {
                 order.setReceiptStatus(3);
                 balancePayFee = order.getPendingPayments();
             } else {
-                if (0 != order.getStatus()) {
+                if (OrderStatus.UNCONFIRMED.getCode() != order.getStatus()) {
                     //待确认状态,不修改订单状态
                     if (1 == order.getSendOutStatus()) {
                         order.setStatus(21);
@@ -178,7 +179,7 @@ public class PayOrderServiceImpl implements PayOrderService {
             order.setPendingPayments(MathUtil.sub(order.getPendingPayments(), balancePayFee).doubleValue());
             // 修改账户余额
             double userMoney = baseMapper.getUserMoney(order.getUserId());
-            if (0 != order.getStatus()) {
+            if (OrderStatus.UNCONFIRMED.getCode() != order.getStatus()) {
                 userMoney = MathUtil.sub(userMoney, balancePayFee).doubleValue();
                 //保存收款记录
                 productService.saveDiscernReceipt(balancePayFee, orderId, "【订单支付,余额抵扣】");
@@ -483,7 +484,12 @@ public class PayOrderServiceImpl implements PayOrderService {
         if (null == order) {
             return ResponseJson.error("订单不存在", null);
         }
-        if (0 == order.getStatus() || 33 == order.getStatus() || 4 == order.getStatus() || 5 == order.getStatus() || 6 == order.getStatus() || 7 == order.getStatus()) {
+        if (OrderStatus.UNCONFIRMED.getCode() == order.getStatus() ||
+                OrderStatus.RECEIVED_AND_FULL_SHIPPED.getCode() == order.getStatus() ||
+                OrderStatus.TRANSACTION_COMPLETED.getCode() == order.getStatus() ||
+                OrderStatus.ORDER_COMPLETED.getCode() == order.getStatus() ||
+                OrderStatus.CLOSED.getCode() == order.getStatus() ||
+                OrderStatus.FULL_RETURNED.getCode() == order.getStatus()) {
             return ResponseJson.error("订单状态错误", null);
         }
         // 支付记录
@@ -625,9 +631,9 @@ public class PayOrderServiceImpl implements PayOrderService {
              * 0待确认,11待收待发,12待收部发,13待收全发,21部收待发,22部收部发,23部收全发,
              * 31已收待发,32已收部发,33已收全发,4交易完成,5订单完成,6已关闭,7交易全退
              */
-            if (11 == order.getStatus() || 21 == order.getStatus()) {
+            if (OrderStatus.UNRECEIVED_AND_UNSHIPPED.getCode() == order.getStatus() || OrderStatus.PART_RECEIVED_AND_UNSHIPPED.getCode() == order.getStatus()) {
                 order.setStatus(31);
-            } else if (12 == order.getStatus() || 22 == order.getStatus()) {
+            } else if (OrderStatus.UNRECEIVED_AND_PART_SHIPPED.getCode() == order.getStatus() || OrderStatus.PART_RECEIVED_AND_PART_SHIPPED.getCode() == order.getStatus()) {
                 order.setStatus(32);
             } else {
                 order.setStatus(33);
@@ -639,9 +645,9 @@ public class PayOrderServiceImpl implements PayOrderService {
             log.info("【支付异步回调】>>>>>>>>>>>>>>订单(全部支付),修改订单状态：" + order.getStatus() + "，orderId：" + orderId);
         } else {
             // 部分支付
-            if (11 == order.getStatus() || 21 == order.getStatus()) {
+            if (OrderStatus.UNRECEIVED_AND_UNSHIPPED.getCode() == order.getStatus() || OrderStatus.PART_RECEIVED_AND_UNSHIPPED.getCode() == order.getStatus()) {
                 order.setStatus(21);
-            } else if (12 == order.getStatus() || 22 == order.getStatus()) {
+            } else if (OrderStatus.UNRECEIVED_AND_PART_SHIPPED.getCode() == order.getStatus() || OrderStatus.PART_RECEIVED_AND_PART_SHIPPED.getCode() == order.getStatus()) {
                 order.setStatus(22);
             } else {
                 order.setStatus(23);