Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	sp-core/sp-base/src/main/java/com/pj/enummj/OrderStatus.java

sp-core/sp-base/src/main/java/com/pj/enummj/AfterSaleApplyType.java

@@ -13,7 +13,6 @@ public enum AfterSaleApplyType {
 
     //申请类型[0=退货退款,1=仅退货,2=仅退款]
     AFTER_SALE_APPLY_TYPE_ZERO(0,"退货退款"),
-
     AFTER_SALE_APPLY_TYPE_ONE(1,"仅退货"),
     AFTER_SALE_APPLY_TYPE_TWO(2,"仅退款");
 

sp-core/sp-base/src/main/java/com/pj/enummj/DeliverStatus.java

@@ -0,0 +1,24 @@
+package com.pj.enummj;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 07 31 16 02
+ **/
+@Getter
+@AllArgsConstructor
+public enum DeliverStatus {
+
+    /**
+     * 订单的发货状态,适用于任何订单
+     */
+    DELIVER_STATUS_ZERO(0,"未发货"),
+    DELIVER_STATUS_ONE(1,"已发货");
+
+    private Integer code;
+
+    private String msg;
+
+}

sp-core/sp-base/src/main/java/com/pj/enummj/GoodsStatus.java

@@ -11,7 +11,9 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum GoodsStatus {
 
-
+    /**
+     * 商品goodsTransit
+     */
     GOODS_STATUS_ON(1,"在售"),
     GOODS_STATUS_OFF(2,"下架");
 

sp-core/sp-base/src/main/java/com/pj/enummj/OrderStatus.java

@@ -4,20 +4,21 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 订单状态已完成 (0=禁用,1=启用)
- * @Author lbl
+ * @Author Mechrevo
+ * @Date 2023 07 31 15 55
  **/
 @Getter
 @AllArgsConstructor
 public enum OrderStatus {
 
-    Order_STATUS_ON(1,"启用"),
-    Order_STATUS_OFF(0,"禁用");
+    /**
+     * 订单完成状态, 适用于一级市场的订单和二级市场的订单
+     */
+    ORDER_STATUS_ZERO(0,"订单未完成"),
+    ORDER_STATUS_ONE(1,"订单已完成");
 
     private Integer code;
 
     private String msg;
 
-
-
 }

sp-core/sp-base/src/main/java/com/pj/enummj/ReleaseStatus.java

@@ -11,6 +11,9 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum ReleaseStatus {
 
+    /**
+     * goodsTransit 的发布情况
+     */
     RELEASE_STATUS_PUBLISH(1,"发布"),
     RELEASE_STATUS_WAIT(0,"待发布");
 

sp-core/sp-base/src/main/java/com/pj/enummj/ResaleStatus.java

@@ -0,0 +1,24 @@
+package com.pj.enummj;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 07 31 15 58
+ **/
+@Getter
+@AllArgsConstructor
+public enum ResaleStatus {
+
+    /**
+     * 一级市场的订单转售情况
+     */
+    RESALE_STATUS_ZERO(0,"未转售"),
+    RESALE_STATUS_ONE(1,"已转售");
+
+    private Integer code;
+
+    private String msg;
+
+}

sp-core/sp-base/src/main/java/com/pj/enummj/TradeStatus.java

@@ -0,0 +1,21 @@
+package com.pj.enummj;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 07 31 16 03
+ **/
+@Getter
+@AllArgsConstructor
+public enum TradeStatus {
+
+    TRADE_STATUS_ZERO(0,"未支付"),
+    TRADE_STATUS_ONE(1,"已支付");
+
+    private Integer code;
+
+    private String msg;
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/MethodGoodsTransitService.java

@@ -1,8 +1,7 @@
 package com.pj.tb_goods_transit;
 
 import com.pj.current.dto.APPLoginUserInfo;
-import com.pj.enummj.DeleteStatus;
-import com.pj.enummj.EnterpriseConfirm;
+import com.pj.enummj.*;
 import com.pj.rabbitmq.config.RabbitMqConfig;
 import com.pj.tb_enterprise.TbEnterprise;
 import com.pj.tb_goods.TbGoods;
@@ -116,7 +115,6 @@ public class MethodGoodsTransitService {
         tbOrder.setTotalWeight(tbGoodsTransit.getGrossWeight());
         tbOrder.setTotalPrice(tbGoodsTransit.getPrice());
 //		tbOrder.setTradeTime();  // 交易时间
-        tbOrder.setTradeStatus(0 + "");
 //		tbOrder.setPayType();  //交易类型
 //		tbOrder.setRealPrice();  // 当前结算金额
         tbOrder.setShouldPrice(tbGoodsTransit.getPrice());  //应结算金额
@@ -124,13 +122,15 @@ public class MethodGoodsTransitService {
 //		tbOrder.setReceivePhone(); // 收货人的基本信息
 //		tbOrder.setReceiveAddress();
         tbOrder.setGoodsNames(tbGoodsTransit.getGoodsName());
-        tbOrder.setConfirm(EnterpriseConfirm.ENTERPRISE_CONFIRM_ZERO.getCode());
         tbOrder.setShopId(tbGoodsTransit.getShopId());
         tbOrder.setShopName(tbGoodsTransit.getShopName());
-        tbOrder.setSend(0);
         //设置下单时的默认状态
-        tbOrder.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
-        tbOrder.setTradeStatus(0 + "");
+        tbOrder.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode()); // 删除状态默认是1,可用
+        tbOrder.setConfirm(EnterpriseConfirm.ENTERPRISE_CONFIRM_ZERO.getCode()); // 0为待商家确认
+        tbOrder.setSend(DeliverStatus.DELIVER_STATUS_ZERO.getCode());  // 0为未发货 1为已发货
+        tbOrder.setTradeStatus(TradeStatus.TRADE_STATUS_ZERO.getCode().toString()); //支付状态默认是0,未支付
+        tbOrder.setResaleStatus(ResaleStatus.RESALE_STATUS_ZERO.getCode()); // 是否转售状态,默认未转售 0
+        tbOrder.setFinishStatus(OrderStatus.ORDER_STATUS_ZERO.getCode());  // 订单完成状态,默认未完成 0
         //订单表基本字段
         tbOrder.setCreateBy(appLoginInfo.getLoginId().toString());
         tbOrder.setCreateName(appLoginInfo.getLoginName());