Explorar el Código

保存订单逻辑

lijun hace 5 años
padre
commit
0c36ebb886

+ 9 - 0
src/main/java/com/caimei/entity/CmShopOrder.java

@@ -14,6 +14,7 @@ public class CmShopOrder implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private Integer shopOrderID;        // 子订单ID
+    private Integer  organizeID;     //采美组织默认为null,具体对应cm_mall_organize表ID
     private String shopOrderNo;        // 子订单编号
     private String orderNo;        // 订单编号
     private Integer orderID;        // 主订单ID
@@ -601,4 +602,12 @@ public class CmShopOrder implements Serializable {
     public void setFee(Double fee) {
         this.fee = fee;
     }
+
+    public Integer getOrganizeID() {
+        return organizeID;
+    }
+
+    public void setOrganizeID(Integer organizeID) {
+        this.organizeID = organizeID;
+    }
 }

+ 1 - 0
src/main/java/com/caimei/service/order/impl/OrderServiceImpl.java

@@ -535,6 +535,7 @@ public class OrderServiceImpl implements OrderService {
 
                 //初始化子订单信息
                 CmShopOrder cmShopOrder = new CmShopOrder();
+                cmShopOrder.setOrganizeID(organizeID);
                 cmShopOrder.setClubID(clubID);
                 cmShopOrder.setSpID(null);
                 cmShopOrder.setMainSpID(null);

+ 6 - 0
src/main/resources/mapper/CmShopOrderMapper.xml

@@ -4,6 +4,7 @@
     
 	<sql id="cmShopOrderColumns">
 		a.shopOrderID AS "shopOrderID",
+		a.organizeID AS "organizeID",
 		a.shopOrderNo AS "shopOrderNo",
 		a.orderNo AS "orderNo",
 		a.orderID AS "orderID",
@@ -127,6 +128,7 @@
 			shopOrderNo,
 			orderNo,
 			orderID,
+			organizeID,
 			userID,
 			shopID,
 			itemCount,
@@ -176,6 +178,7 @@
 			#{shopOrderNo},
 			#{orderNo},
 			#{orderID},
+			#{organizeID},
 			#{userID},
 			#{shopID},
 			#{itemCount},
@@ -229,6 +232,7 @@
 			shopOrderNo = #{shopOrderNo},
 			orderNo = #{orderNo},
 			orderID = #{orderID},
+			organizeID = #{organizeID},
 			userID = #{userID},
 			shopID = #{shopID},
 			itemCount = #{itemCount},
@@ -329,6 +333,7 @@
 		shopOrderNo,
 		orderNo,
 		orderID,
+		organizeID,
 		userID,
 		shopID,
 		itemCount,
@@ -383,6 +388,7 @@
 		#{shopOrderNo},
 		#{orderNo},
 		#{orderID},
+		#{organizeID},
 		#{userID},
 		#{shopID},
 		#{itemCount},