下单接口完成

mall-mbg/src/main/java/com/macro/mall/model/OmsCartItem.java

@@ -111,6 +111,10 @@ public class OmsCartItem implements Serializable {
      */
     private Long productCategoryId;
 
+    private String productBrand;
+
+    private String productSn;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -257,6 +261,22 @@ public class OmsCartItem implements Serializable {
         this.productCategoryId = productCategoryId;
     }
 
+    public String getProductBrand() {
+        return productBrand;
+    }
+
+    public void setProductBrand(String productBrand) {
+        this.productBrand = productBrand;
+    }
+
+    public String getProductSn() {
+        return productSn;
+    }
+
+    public void setProductSn(String productSn) {
+        this.productSn = productSn;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -281,6 +301,8 @@ public class OmsCartItem implements Serializable {
         sb.append(", modifyDate=").append(modifyDate);
         sb.append(", deleteStatus=").append(deleteStatus);
         sb.append(", productCategoryId=").append(productCategoryId);
+        sb.append(", productBrand=").append(productBrand);
+        sb.append(", productSn=").append(productSn);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

mall-mbg/src/main/java/com/macro/mall/model/OmsCartItemExample.java

@@ -1265,6 +1265,146 @@ public class OmsCartItemExample {
             addCriterion("product_category_id not between", value1, value2, "productCategoryId");
             return (Criteria) this;
         }
+
+        public Criteria andProductBrandIsNull() {
+            addCriterion("product_brand is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBrandIsNotNull() {
+            addCriterion("product_brand is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBrandEqualTo(String value) {
+            addCriterion("product_brand =", value, "productBrand");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBrandNotEqualTo(String value) {
+            addCriterion("product_brand <>", value, "productBrand");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBrandGreaterThan(String value) {
+            addCriterion("product_brand >", value, "productBrand");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBrandGreaterThanOrEqualTo(String value) {
+            addCriterion("product_brand >=", value, "productBrand");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBrandLessThan(String value) {
+            addCriterion("product_brand <", value, "productBrand");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBrandLessThanOrEqualTo(String value) {
+            addCriterion("product_brand <=", value, "productBrand");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBrandLike(String value) {
+            addCriterion("product_brand like", value, "productBrand");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBrandNotLike(String value) {
+            addCriterion("product_brand not like", value, "productBrand");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBrandIn(List<String> values) {
+            addCriterion("product_brand in", values, "productBrand");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBrandNotIn(List<String> values) {
+            addCriterion("product_brand not in", values, "productBrand");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBrandBetween(String value1, String value2) {
+            addCriterion("product_brand between", value1, value2, "productBrand");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBrandNotBetween(String value1, String value2) {
+            addCriterion("product_brand not between", value1, value2, "productBrand");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnIsNull() {
+            addCriterion("product_sn is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnIsNotNull() {
+            addCriterion("product_sn is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnEqualTo(String value) {
+            addCriterion("product_sn =", value, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnNotEqualTo(String value) {
+            addCriterion("product_sn <>", value, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnGreaterThan(String value) {
+            addCriterion("product_sn >", value, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnGreaterThanOrEqualTo(String value) {
+            addCriterion("product_sn >=", value, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnLessThan(String value) {
+            addCriterion("product_sn <", value, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnLessThanOrEqualTo(String value) {
+            addCriterion("product_sn <=", value, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnLike(String value) {
+            addCriterion("product_sn like", value, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnNotLike(String value) {
+            addCriterion("product_sn not like", value, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnIn(List<String> values) {
+            addCriterion("product_sn in", values, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnNotIn(List<String> values) {
+            addCriterion("product_sn not in", values, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnBetween(String value1, String value2) {
+            addCriterion("product_sn between", value1, value2, "productSn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSnNotBetween(String value1, String value2) {
+            addCriterion("product_sn not between", value1, value2, "productSn");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mall-mbg/src/main/java/com/macro/mall/model/OmsOrderItem.java

@@ -22,7 +22,7 @@ public class OmsOrderItem implements Serializable {
 
     private Long productId;
 
-    private String proudctPic;
+    private String productPic;
 
     private String productName;
 
@@ -30,21 +30,40 @@ public class OmsOrderItem implements Serializable {
 
     private String productSn;
 
-    private BigDecimal productAmount;
+    /**
+     * 销售价格
+     *
+     * @mbggenerated
+     */
+    private BigDecimal productPrice;
 
     /**
      * 购买数量
      *
      * @mbggenerated
      */
-    private Integer productCount;
+    private Integer productQuantity;
 
     /**
-     * 该商品经过优惠后的分解金额
+     * 商品sku编号
      *
      * @mbggenerated
      */
-    private BigDecimal productRealAmount;
+    private Long productSkuId;
+
+    /**
+     * 商品sku条码
+     *
+     * @mbggenerated
+     */
+    private String productSkuCode;
+
+    /**
+     * 商品分类id
+     *
+     * @mbggenerated
+     */
+    private Long productCategoryId;
 
     /**
      * 商品的销售属性
@@ -57,6 +76,45 @@ public class OmsOrderItem implements Serializable {
 
     private String sp3;
 
+    /**
+     * 商品促销名称
+     *
+     * @mbggenerated
+     */
+    private String promotionName;
+
+    /**
+     * 商品促销分解金额
+     *
+     * @mbggenerated
+     */
+    private BigDecimal promotionAmount;
+
+    /**
+     * 优惠券优惠分解金额
+     *
+     * @mbggenerated
+     */
+    private BigDecimal couponAmount;
+
+    /**
+     * 积分优惠分解金额
+     *
+     * @mbggenerated
+     */
+    private BigDecimal integrationAmount;
+
+    /**
+     * 该商品经过优惠后的分解金额
+     *
+     * @mbggenerated
+     */
+    private BigDecimal realAmount;
+
+    private Integer giftIntegration;
+
+    private Integer giftGrowth;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -91,12 +149,12 @@ public class OmsOrderItem implements Serializable {
         this.productId = productId;
     }
 
-    public String getProudctPic() {
-        return proudctPic;
+    public String getProductPic() {
+        return productPic;
     }
 
-    public void setProudctPic(String proudctPic) {
-        this.proudctPic = proudctPic;
+    public void setProductPic(String productPic) {
+        this.productPic = productPic;
     }
 
     public String getProductName() {
@@ -123,28 +181,44 @@ public class OmsOrderItem implements Serializable {
         this.productSn = productSn;
     }
 
-    public BigDecimal getProductAmount() {
-        return productAmount;
+    public BigDecimal getProductPrice() {
+        return productPrice;
     }
 
-    public void setProductAmount(BigDecimal productAmount) {
-        this.productAmount = productAmount;
+    public void setProductPrice(BigDecimal productPrice) {
+        this.productPrice = productPrice;
     }
 
-    public Integer getProductCount() {
-        return productCount;
+    public Integer getProductQuantity() {
+        return productQuantity;
     }
 
-    public void setProductCount(Integer productCount) {
-        this.productCount = productCount;
+    public void setProductQuantity(Integer productQuantity) {
+        this.productQuantity = productQuantity;
     }
 
-    public BigDecimal getProductRealAmount() {
-        return productRealAmount;
+    public Long getProductSkuId() {
+        return productSkuId;
     }
 
-    public void setProductRealAmount(BigDecimal productRealAmount) {
-        this.productRealAmount = productRealAmount;
+    public void setProductSkuId(Long productSkuId) {
+        this.productSkuId = productSkuId;
+    }
+
+    public String getProductSkuCode() {
+        return productSkuCode;
+    }
+
+    public void setProductSkuCode(String productSkuCode) {
+        this.productSkuCode = productSkuCode;
+    }
+
+    public Long getProductCategoryId() {
+        return productCategoryId;
+    }
+
+    public void setProductCategoryId(Long productCategoryId) {
+        this.productCategoryId = productCategoryId;
     }
 
     public String getSp1() {
@@ -171,6 +245,62 @@ public class OmsOrderItem implements Serializable {
         this.sp3 = sp3;
     }
 
+    public String getPromotionName() {
+        return promotionName;
+    }
+
+    public void setPromotionName(String promotionName) {
+        this.promotionName = promotionName;
+    }
+
+    public BigDecimal getPromotionAmount() {
+        return promotionAmount;
+    }
+
+    public void setPromotionAmount(BigDecimal promotionAmount) {
+        this.promotionAmount = promotionAmount;
+    }
+
+    public BigDecimal getCouponAmount() {
+        return couponAmount;
+    }
+
+    public void setCouponAmount(BigDecimal couponAmount) {
+        this.couponAmount = couponAmount;
+    }
+
+    public BigDecimal getIntegrationAmount() {
+        return integrationAmount;
+    }
+
+    public void setIntegrationAmount(BigDecimal integrationAmount) {
+        this.integrationAmount = integrationAmount;
+    }
+
+    public BigDecimal getRealAmount() {
+        return realAmount;
+    }
+
+    public void setRealAmount(BigDecimal realAmount) {
+        this.realAmount = realAmount;
+    }
+
+    public Integer getGiftIntegration() {
+        return giftIntegration;
+    }
+
+    public void setGiftIntegration(Integer giftIntegration) {
+        this.giftIntegration = giftIntegration;
+    }
+
+    public Integer getGiftGrowth() {
+        return giftGrowth;
+    }
+
+    public void setGiftGrowth(Integer giftGrowth) {
+        this.giftGrowth = giftGrowth;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -181,16 +311,25 @@ public class OmsOrderItem implements Serializable {
         sb.append(", orderId=").append(orderId);
         sb.append(", orderSn=").append(orderSn);
         sb.append(", productId=").append(productId);
-        sb.append(", proudctPic=").append(proudctPic);
+        sb.append(", productPic=").append(productPic);
         sb.append(", productName=").append(productName);
         sb.append(", productBrand=").append(productBrand);
         sb.append(", productSn=").append(productSn);
-        sb.append(", productAmount=").append(productAmount);
-        sb.append(", productCount=").append(productCount);
-        sb.append(", productRealAmount=").append(productRealAmount);
+        sb.append(", productPrice=").append(productPrice);
+        sb.append(", productQuantity=").append(productQuantity);
+        sb.append(", productSkuId=").append(productSkuId);
+        sb.append(", productSkuCode=").append(productSkuCode);
+        sb.append(", productCategoryId=").append(productCategoryId);
         sb.append(", sp1=").append(sp1);
         sb.append(", sp2=").append(sp2);
         sb.append(", sp3=").append(sp3);
+        sb.append(", promotionName=").append(promotionName);
+        sb.append(", promotionAmount=").append(promotionAmount);
+        sb.append(", couponAmount=").append(couponAmount);
+        sb.append(", integrationAmount=").append(integrationAmount);
+        sb.append(", realAmount=").append(realAmount);
+        sb.append(", giftIntegration=").append(giftIntegration);
+        sb.append(", giftGrowth=").append(giftGrowth);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

mall-mbg/src/main/java/com/macro/mall/model/OmsOrderItemExample.java

@@ -355,73 +355,73 @@ public class OmsOrderItemExample {
             return (Criteria) this;
         }
 
-        public Criteria andProudctPicIsNull() {
-            addCriterion("proudct_pic is null");
+        public Criteria andProductPicIsNull() {
+            addCriterion("product_pic is null");
             return (Criteria) this;
         }
 
-        public Criteria andProudctPicIsNotNull() {
-            addCriterion("proudct_pic is not null");
+        public Criteria andProductPicIsNotNull() {
+            addCriterion("product_pic is not null");
             return (Criteria) this;
         }
 
-        public Criteria andProudctPicEqualTo(String value) {
-            addCriterion("proudct_pic =", value, "proudctPic");
+        public Criteria andProductPicEqualTo(String value) {
+            addCriterion("product_pic =", value, "productPic");
             return (Criteria) this;
         }
 
-        public Criteria andProudctPicNotEqualTo(String value) {
-            addCriterion("proudct_pic <>", value, "proudctPic");
+        public Criteria andProductPicNotEqualTo(String value) {
+            addCriterion("product_pic <>", value, "productPic");
             return (Criteria) this;
         }
 
-        public Criteria andProudctPicGreaterThan(String value) {
-            addCriterion("proudct_pic >", value, "proudctPic");
+        public Criteria andProductPicGreaterThan(String value) {
+            addCriterion("product_pic >", value, "productPic");
             return (Criteria) this;
         }
 
-        public Criteria andProudctPicGreaterThanOrEqualTo(String value) {
-            addCriterion("proudct_pic >=", value, "proudctPic");
+        public Criteria andProductPicGreaterThanOrEqualTo(String value) {
+            addCriterion("product_pic >=", value, "productPic");
             return (Criteria) this;
         }
 
-        public Criteria andProudctPicLessThan(String value) {
-            addCriterion("proudct_pic <", value, "proudctPic");
+        public Criteria andProductPicLessThan(String value) {
+            addCriterion("product_pic <", value, "productPic");
             return (Criteria) this;
         }
 
-        public Criteria andProudctPicLessThanOrEqualTo(String value) {
-            addCriterion("proudct_pic <=", value, "proudctPic");
+        public Criteria andProductPicLessThanOrEqualTo(String value) {
+            addCriterion("product_pic <=", value, "productPic");
             return (Criteria) this;
         }
 
-        public Criteria andProudctPicLike(String value) {
-            addCriterion("proudct_pic like", value, "proudctPic");
+        public Criteria andProductPicLike(String value) {
+            addCriterion("product_pic like", value, "productPic");
             return (Criteria) this;
         }
 
-        public Criteria andProudctPicNotLike(String value) {
-            addCriterion("proudct_pic not like", value, "proudctPic");
+        public Criteria andProductPicNotLike(String value) {
+            addCriterion("product_pic not like", value, "productPic");
             return (Criteria) this;
         }
 
-        public Criteria andProudctPicIn(List<String> values) {
-            addCriterion("proudct_pic in", values, "proudctPic");
+        public Criteria andProductPicIn(List<String> values) {
+            addCriterion("product_pic in", values, "productPic");
             return (Criteria) this;
         }
 
-        public Criteria andProudctPicNotIn(List<String> values) {
-            addCriterion("proudct_pic not in", values, "proudctPic");
+        public Criteria andProductPicNotIn(List<String> values) {
+            addCriterion("product_pic not in", values, "productPic");
             return (Criteria) this;
         }
 
-        public Criteria andProudctPicBetween(String value1, String value2) {
-            addCriterion("proudct_pic between", value1, value2, "proudctPic");
+        public Criteria andProductPicBetween(String value1, String value2) {
+            addCriterion("product_pic between", value1, value2, "productPic");
             return (Criteria) this;
         }
 
-        public Criteria andProudctPicNotBetween(String value1, String value2) {
-            addCriterion("proudct_pic not between", value1, value2, "proudctPic");
+        public Criteria andProductPicNotBetween(String value1, String value2) {
+            addCriterion("product_pic not between", value1, value2, "productPic");
             return (Criteria) this;
         }
 
@@ -635,183 +635,313 @@ public class OmsOrderItemExample {
             return (Criteria) this;
         }
 
-        public Criteria andProductAmountIsNull() {
-            addCriterion("product_amount is null");
+        public Criteria andProductPriceIsNull() {
+            addCriterion("product_price is null");
             return (Criteria) this;
         }
 
-        public Criteria andProductAmountIsNotNull() {
-            addCriterion("product_amount is not null");
+        public Criteria andProductPriceIsNotNull() {
+            addCriterion("product_price is not null");
             return (Criteria) this;
         }
 
-        public Criteria andProductAmountEqualTo(BigDecimal value) {
-            addCriterion("product_amount =", value, "productAmount");
+        public Criteria andProductPriceEqualTo(BigDecimal value) {
+            addCriterion("product_price =", value, "productPrice");
             return (Criteria) this;
         }
 
-        public Criteria andProductAmountNotEqualTo(BigDecimal value) {
-            addCriterion("product_amount <>", value, "productAmount");
+        public Criteria andProductPriceNotEqualTo(BigDecimal value) {
+            addCriterion("product_price <>", value, "productPrice");
             return (Criteria) this;
         }
 
-        public Criteria andProductAmountGreaterThan(BigDecimal value) {
-            addCriterion("product_amount >", value, "productAmount");
+        public Criteria andProductPriceGreaterThan(BigDecimal value) {
+            addCriterion("product_price >", value, "productPrice");
             return (Criteria) this;
         }
 
-        public Criteria andProductAmountGreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("product_amount >=", value, "productAmount");
+        public Criteria andProductPriceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("product_price >=", value, "productPrice");
             return (Criteria) this;
         }
 
-        public Criteria andProductAmountLessThan(BigDecimal value) {
-            addCriterion("product_amount <", value, "productAmount");
+        public Criteria andProductPriceLessThan(BigDecimal value) {
+            addCriterion("product_price <", value, "productPrice");
             return (Criteria) this;
         }
 
-        public Criteria andProductAmountLessThanOrEqualTo(BigDecimal value) {
-            addCriterion("product_amount <=", value, "productAmount");
+        public Criteria andProductPriceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("product_price <=", value, "productPrice");
             return (Criteria) this;
         }
 
-        public Criteria andProductAmountIn(List<BigDecimal> values) {
-            addCriterion("product_amount in", values, "productAmount");
+        public Criteria andProductPriceIn(List<BigDecimal> values) {
+            addCriterion("product_price in", values, "productPrice");
             return (Criteria) this;
         }
 
-        public Criteria andProductAmountNotIn(List<BigDecimal> values) {
-            addCriterion("product_amount not in", values, "productAmount");
+        public Criteria andProductPriceNotIn(List<BigDecimal> values) {
+            addCriterion("product_price not in", values, "productPrice");
             return (Criteria) this;
         }
 
-        public Criteria andProductAmountBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("product_amount between", value1, value2, "productAmount");
+        public Criteria andProductPriceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("product_price between", value1, value2, "productPrice");
             return (Criteria) this;
         }
 
-        public Criteria andProductAmountNotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("product_amount not between", value1, value2, "productAmount");
+        public Criteria andProductPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("product_price not between", value1, value2, "productPrice");
             return (Criteria) this;
         }
 
-        public Criteria andProductCountIsNull() {
-            addCriterion("product_count is null");
+        public Criteria andProductQuantityIsNull() {
+            addCriterion("product_quantity is null");
             return (Criteria) this;
         }
 
-        public Criteria andProductCountIsNotNull() {
-            addCriterion("product_count is not null");
+        public Criteria andProductQuantityIsNotNull() {
+            addCriterion("product_quantity is not null");
             return (Criteria) this;
         }
 
-        public Criteria andProductCountEqualTo(Integer value) {
-            addCriterion("product_count =", value, "productCount");
+        public Criteria andProductQuantityEqualTo(Integer value) {
+            addCriterion("product_quantity =", value, "productQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andProductCountNotEqualTo(Integer value) {
-            addCriterion("product_count <>", value, "productCount");
+        public Criteria andProductQuantityNotEqualTo(Integer value) {
+            addCriterion("product_quantity <>", value, "productQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andProductCountGreaterThan(Integer value) {
-            addCriterion("product_count >", value, "productCount");
+        public Criteria andProductQuantityGreaterThan(Integer value) {
+            addCriterion("product_quantity >", value, "productQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andProductCountGreaterThanOrEqualTo(Integer value) {
-            addCriterion("product_count >=", value, "productCount");
+        public Criteria andProductQuantityGreaterThanOrEqualTo(Integer value) {
+            addCriterion("product_quantity >=", value, "productQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andProductCountLessThan(Integer value) {
-            addCriterion("product_count <", value, "productCount");
+        public Criteria andProductQuantityLessThan(Integer value) {
+            addCriterion("product_quantity <", value, "productQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andProductCountLessThanOrEqualTo(Integer value) {
-            addCriterion("product_count <=", value, "productCount");
+        public Criteria andProductQuantityLessThanOrEqualTo(Integer value) {
+            addCriterion("product_quantity <=", value, "productQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andProductCountIn(List<Integer> values) {
-            addCriterion("product_count in", values, "productCount");
+        public Criteria andProductQuantityIn(List<Integer> values) {
+            addCriterion("product_quantity in", values, "productQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andProductCountNotIn(List<Integer> values) {
-            addCriterion("product_count not in", values, "productCount");
+        public Criteria andProductQuantityNotIn(List<Integer> values) {
+            addCriterion("product_quantity not in", values, "productQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andProductCountBetween(Integer value1, Integer value2) {
-            addCriterion("product_count between", value1, value2, "productCount");
+        public Criteria andProductQuantityBetween(Integer value1, Integer value2) {
+            addCriterion("product_quantity between", value1, value2, "productQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andProductCountNotBetween(Integer value1, Integer value2) {
-            addCriterion("product_count not between", value1, value2, "productCount");
+        public Criteria andProductQuantityNotBetween(Integer value1, Integer value2) {
+            addCriterion("product_quantity not between", value1, value2, "productQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andProductRealAmountIsNull() {
-            addCriterion("product_real_amount is null");
+        public Criteria andProductSkuIdIsNull() {
+            addCriterion("product_sku_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andProductRealAmountIsNotNull() {
-            addCriterion("product_real_amount is not null");
+        public Criteria andProductSkuIdIsNotNull() {
+            addCriterion("product_sku_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andProductRealAmountEqualTo(BigDecimal value) {
-            addCriterion("product_real_amount =", value, "productRealAmount");
+        public Criteria andProductSkuIdEqualTo(Long value) {
+            addCriterion("product_sku_id =", value, "productSkuId");
             return (Criteria) this;
         }
 
-        public Criteria andProductRealAmountNotEqualTo(BigDecimal value) {
-            addCriterion("product_real_amount <>", value, "productRealAmount");
+        public Criteria andProductSkuIdNotEqualTo(Long value) {
+            addCriterion("product_sku_id <>", value, "productSkuId");
             return (Criteria) this;
         }
 
-        public Criteria andProductRealAmountGreaterThan(BigDecimal value) {
-            addCriterion("product_real_amount >", value, "productRealAmount");
+        public Criteria andProductSkuIdGreaterThan(Long value) {
+            addCriterion("product_sku_id >", value, "productSkuId");
             return (Criteria) this;
         }
 
-        public Criteria andProductRealAmountGreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("product_real_amount >=", value, "productRealAmount");
+        public Criteria andProductSkuIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("product_sku_id >=", value, "productSkuId");
             return (Criteria) this;
         }
 
-        public Criteria andProductRealAmountLessThan(BigDecimal value) {
-            addCriterion("product_real_amount <", value, "productRealAmount");
+        public Criteria andProductSkuIdLessThan(Long value) {
+            addCriterion("product_sku_id <", value, "productSkuId");
             return (Criteria) this;
         }
 
-        public Criteria andProductRealAmountLessThanOrEqualTo(BigDecimal value) {
-            addCriterion("product_real_amount <=", value, "productRealAmount");
+        public Criteria andProductSkuIdLessThanOrEqualTo(Long value) {
+            addCriterion("product_sku_id <=", value, "productSkuId");
             return (Criteria) this;
         }
 
-        public Criteria andProductRealAmountIn(List<BigDecimal> values) {
-            addCriterion("product_real_amount in", values, "productRealAmount");
+        public Criteria andProductSkuIdIn(List<Long> values) {
+            addCriterion("product_sku_id in", values, "productSkuId");
             return (Criteria) this;
         }
 
-        public Criteria andProductRealAmountNotIn(List<BigDecimal> values) {
-            addCriterion("product_real_amount not in", values, "productRealAmount");
+        public Criteria andProductSkuIdNotIn(List<Long> values) {
+            addCriterion("product_sku_id not in", values, "productSkuId");
             return (Criteria) this;
         }
 
-        public Criteria andProductRealAmountBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("product_real_amount between", value1, value2, "productRealAmount");
+        public Criteria andProductSkuIdBetween(Long value1, Long value2) {
+            addCriterion("product_sku_id between", value1, value2, "productSkuId");
             return (Criteria) this;
         }
 
-        public Criteria andProductRealAmountNotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("product_real_amount not between", value1, value2, "productRealAmount");
+        public Criteria andProductSkuIdNotBetween(Long value1, Long value2) {
+            addCriterion("product_sku_id not between", value1, value2, "productSkuId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSkuCodeIsNull() {
+            addCriterion("product_sku_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSkuCodeIsNotNull() {
+            addCriterion("product_sku_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSkuCodeEqualTo(String value) {
+            addCriterion("product_sku_code =", value, "productSkuCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSkuCodeNotEqualTo(String value) {
+            addCriterion("product_sku_code <>", value, "productSkuCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSkuCodeGreaterThan(String value) {
+            addCriterion("product_sku_code >", value, "productSkuCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSkuCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("product_sku_code >=", value, "productSkuCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSkuCodeLessThan(String value) {
+            addCriterion("product_sku_code <", value, "productSkuCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSkuCodeLessThanOrEqualTo(String value) {
+            addCriterion("product_sku_code <=", value, "productSkuCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSkuCodeLike(String value) {
+            addCriterion("product_sku_code like", value, "productSkuCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSkuCodeNotLike(String value) {
+            addCriterion("product_sku_code not like", value, "productSkuCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSkuCodeIn(List<String> values) {
+            addCriterion("product_sku_code in", values, "productSkuCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSkuCodeNotIn(List<String> values) {
+            addCriterion("product_sku_code not in", values, "productSkuCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSkuCodeBetween(String value1, String value2) {
+            addCriterion("product_sku_code between", value1, value2, "productSkuCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSkuCodeNotBetween(String value1, String value2) {
+            addCriterion("product_sku_code not between", value1, value2, "productSkuCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryIdIsNull() {
+            addCriterion("product_category_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryIdIsNotNull() {
+            addCriterion("product_category_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryIdEqualTo(Long value) {
+            addCriterion("product_category_id =", value, "productCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryIdNotEqualTo(Long value) {
+            addCriterion("product_category_id <>", value, "productCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryIdGreaterThan(Long value) {
+            addCriterion("product_category_id >", value, "productCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("product_category_id >=", value, "productCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryIdLessThan(Long value) {
+            addCriterion("product_category_id <", value, "productCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryIdLessThanOrEqualTo(Long value) {
+            addCriterion("product_category_id <=", value, "productCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryIdIn(List<Long> values) {
+            addCriterion("product_category_id in", values, "productCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryIdNotIn(List<Long> values) {
+            addCriterion("product_category_id not in", values, "productCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryIdBetween(Long value1, Long value2) {
+            addCriterion("product_category_id between", value1, value2, "productCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryIdNotBetween(Long value1, Long value2) {
+            addCriterion("product_category_id not between", value1, value2, "productCategoryId");
             return (Criteria) this;
         }
 
@@ -1024,6 +1154,436 @@ public class OmsOrderItemExample {
             addCriterion("sp3 not between", value1, value2, "sp3");
             return (Criteria) this;
         }
+
+        public Criteria andPromotionNameIsNull() {
+            addCriterion("promotion_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionNameIsNotNull() {
+            addCriterion("promotion_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionNameEqualTo(String value) {
+            addCriterion("promotion_name =", value, "promotionName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionNameNotEqualTo(String value) {
+            addCriterion("promotion_name <>", value, "promotionName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionNameGreaterThan(String value) {
+            addCriterion("promotion_name >", value, "promotionName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionNameGreaterThanOrEqualTo(String value) {
+            addCriterion("promotion_name >=", value, "promotionName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionNameLessThan(String value) {
+            addCriterion("promotion_name <", value, "promotionName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionNameLessThanOrEqualTo(String value) {
+            addCriterion("promotion_name <=", value, "promotionName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionNameLike(String value) {
+            addCriterion("promotion_name like", value, "promotionName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionNameNotLike(String value) {
+            addCriterion("promotion_name not like", value, "promotionName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionNameIn(List<String> values) {
+            addCriterion("promotion_name in", values, "promotionName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionNameNotIn(List<String> values) {
+            addCriterion("promotion_name not in", values, "promotionName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionNameBetween(String value1, String value2) {
+            addCriterion("promotion_name between", value1, value2, "promotionName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionNameNotBetween(String value1, String value2) {
+            addCriterion("promotion_name not between", value1, value2, "promotionName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionAmountIsNull() {
+            addCriterion("promotion_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionAmountIsNotNull() {
+            addCriterion("promotion_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionAmountEqualTo(BigDecimal value) {
+            addCriterion("promotion_amount =", value, "promotionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionAmountNotEqualTo(BigDecimal value) {
+            addCriterion("promotion_amount <>", value, "promotionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionAmountGreaterThan(BigDecimal value) {
+            addCriterion("promotion_amount >", value, "promotionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("promotion_amount >=", value, "promotionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionAmountLessThan(BigDecimal value) {
+            addCriterion("promotion_amount <", value, "promotionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("promotion_amount <=", value, "promotionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionAmountIn(List<BigDecimal> values) {
+            addCriterion("promotion_amount in", values, "promotionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionAmountNotIn(List<BigDecimal> values) {
+            addCriterion("promotion_amount not in", values, "promotionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("promotion_amount between", value1, value2, "promotionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andPromotionAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("promotion_amount not between", value1, value2, "promotionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponAmountIsNull() {
+            addCriterion("coupon_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponAmountIsNotNull() {
+            addCriterion("coupon_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponAmountEqualTo(BigDecimal value) {
+            addCriterion("coupon_amount =", value, "couponAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponAmountNotEqualTo(BigDecimal value) {
+            addCriterion("coupon_amount <>", value, "couponAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponAmountGreaterThan(BigDecimal value) {
+            addCriterion("coupon_amount >", value, "couponAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("coupon_amount >=", value, "couponAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponAmountLessThan(BigDecimal value) {
+            addCriterion("coupon_amount <", value, "couponAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("coupon_amount <=", value, "couponAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponAmountIn(List<BigDecimal> values) {
+            addCriterion("coupon_amount in", values, "couponAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponAmountNotIn(List<BigDecimal> values) {
+            addCriterion("coupon_amount not in", values, "couponAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("coupon_amount between", value1, value2, "couponAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("coupon_amount not between", value1, value2, "couponAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntegrationAmountIsNull() {
+            addCriterion("integration_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntegrationAmountIsNotNull() {
+            addCriterion("integration_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntegrationAmountEqualTo(BigDecimal value) {
+            addCriterion("integration_amount =", value, "integrationAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntegrationAmountNotEqualTo(BigDecimal value) {
+            addCriterion("integration_amount <>", value, "integrationAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntegrationAmountGreaterThan(BigDecimal value) {
+            addCriterion("integration_amount >", value, "integrationAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntegrationAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("integration_amount >=", value, "integrationAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntegrationAmountLessThan(BigDecimal value) {
+            addCriterion("integration_amount <", value, "integrationAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntegrationAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("integration_amount <=", value, "integrationAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntegrationAmountIn(List<BigDecimal> values) {
+            addCriterion("integration_amount in", values, "integrationAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntegrationAmountNotIn(List<BigDecimal> values) {
+            addCriterion("integration_amount not in", values, "integrationAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntegrationAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("integration_amount between", value1, value2, "integrationAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntegrationAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("integration_amount not between", value1, value2, "integrationAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealAmountIsNull() {
+            addCriterion("real_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealAmountIsNotNull() {
+            addCriterion("real_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealAmountEqualTo(BigDecimal value) {
+            addCriterion("real_amount =", value, "realAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealAmountNotEqualTo(BigDecimal value) {
+            addCriterion("real_amount <>", value, "realAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealAmountGreaterThan(BigDecimal value) {
+            addCriterion("real_amount >", value, "realAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("real_amount >=", value, "realAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealAmountLessThan(BigDecimal value) {
+            addCriterion("real_amount <", value, "realAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("real_amount <=", value, "realAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealAmountIn(List<BigDecimal> values) {
+            addCriterion("real_amount in", values, "realAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealAmountNotIn(List<BigDecimal> values) {
+            addCriterion("real_amount not in", values, "realAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("real_amount between", value1, value2, "realAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("real_amount not between", value1, value2, "realAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftIntegrationIsNull() {
+            addCriterion("gift_integration is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftIntegrationIsNotNull() {
+            addCriterion("gift_integration is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftIntegrationEqualTo(Integer value) {
+            addCriterion("gift_integration =", value, "giftIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftIntegrationNotEqualTo(Integer value) {
+            addCriterion("gift_integration <>", value, "giftIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftIntegrationGreaterThan(Integer value) {
+            addCriterion("gift_integration >", value, "giftIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftIntegrationGreaterThanOrEqualTo(Integer value) {
+            addCriterion("gift_integration >=", value, "giftIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftIntegrationLessThan(Integer value) {
+            addCriterion("gift_integration <", value, "giftIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftIntegrationLessThanOrEqualTo(Integer value) {
+            addCriterion("gift_integration <=", value, "giftIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftIntegrationIn(List<Integer> values) {
+            addCriterion("gift_integration in", values, "giftIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftIntegrationNotIn(List<Integer> values) {
+            addCriterion("gift_integration not in", values, "giftIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftIntegrationBetween(Integer value1, Integer value2) {
+            addCriterion("gift_integration between", value1, value2, "giftIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftIntegrationNotBetween(Integer value1, Integer value2) {
+            addCriterion("gift_integration not between", value1, value2, "giftIntegration");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftGrowthIsNull() {
+            addCriterion("gift_growth is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftGrowthIsNotNull() {
+            addCriterion("gift_growth is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftGrowthEqualTo(Integer value) {
+            addCriterion("gift_growth =", value, "giftGrowth");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftGrowthNotEqualTo(Integer value) {
+            addCriterion("gift_growth <>", value, "giftGrowth");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftGrowthGreaterThan(Integer value) {
+            addCriterion("gift_growth >", value, "giftGrowth");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftGrowthGreaterThanOrEqualTo(Integer value) {
+            addCriterion("gift_growth >=", value, "giftGrowth");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftGrowthLessThan(Integer value) {
+            addCriterion("gift_growth <", value, "giftGrowth");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftGrowthLessThanOrEqualTo(Integer value) {
+            addCriterion("gift_growth <=", value, "giftGrowth");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftGrowthIn(List<Integer> values) {
+            addCriterion("gift_growth in", values, "giftGrowth");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftGrowthNotIn(List<Integer> values) {
+            addCriterion("gift_growth not in", values, "giftGrowth");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftGrowthBetween(Integer value1, Integer value2) {
+            addCriterion("gift_growth between", value1, value2, "giftGrowth");
+            return (Criteria) this;
+        }
+
+        public Criteria andGiftGrowthNotBetween(Integer value1, Integer value2) {
+            addCriterion("gift_growth not between", value1, value2, "giftGrowth");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mall-mbg/src/main/resources/com/macro/mall/mapper/OmsCartItemMapper.xml

@@ -20,6 +20,8 @@
     <result column="modify_date" jdbcType="TIMESTAMP" property="modifyDate" />
     <result column="delete_status" jdbcType="INTEGER" property="deleteStatus" />
     <result column="product_category_id" jdbcType="BIGINT" property="productCategoryId" />
+    <result column="product_brand" jdbcType="VARCHAR" property="productBrand" />
+    <result column="product_sn" jdbcType="VARCHAR" property="productSn" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -82,7 +84,7 @@
   <sql id="Base_Column_List">
     id, product_id, product_sku_id, member_id, quantity, price, sp1, sp2, sp3, product_pic, 
     product_name, product_sub_title, product_sku_code, member_nickname, create_date, 
-    modify_date, delete_status, product_category_id
+    modify_date, delete_status, product_category_id, product_brand, product_sn
   </sql>
   <select id="selectByExample" parameterType="com.macro.mall.model.OmsCartItemExample" resultMap="BaseResultMap">
     select
@@ -123,13 +125,15 @@
       sp2, sp3, product_pic, 
       product_name, product_sub_title, product_sku_code, 
       member_nickname, create_date, modify_date, 
-      delete_status, product_category_id)
+      delete_status, product_category_id, product_brand, 
+      product_sn)
     values (#{productId,jdbcType=BIGINT}, #{productSkuId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, 
       #{quantity,jdbcType=INTEGER}, #{price,jdbcType=DECIMAL}, #{sp1,jdbcType=VARCHAR}, 
       #{sp2,jdbcType=VARCHAR}, #{sp3,jdbcType=VARCHAR}, #{productPic,jdbcType=VARCHAR}, 
       #{productName,jdbcType=VARCHAR}, #{productSubTitle,jdbcType=VARCHAR}, #{productSkuCode,jdbcType=VARCHAR}, 
       #{memberNickname,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{modifyDate,jdbcType=TIMESTAMP}, 
-      #{deleteStatus,jdbcType=INTEGER}, #{productCategoryId,jdbcType=BIGINT})
+      #{deleteStatus,jdbcType=INTEGER}, #{productCategoryId,jdbcType=BIGINT}, #{productBrand,jdbcType=VARCHAR}, 
+      #{productSn,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.macro.mall.model.OmsCartItem">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -188,6 +192,12 @@
       <if test="productCategoryId != null">
         product_category_id,
       </if>
+      <if test="productBrand != null">
+        product_brand,
+      </if>
+      <if test="productSn != null">
+        product_sn,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="productId != null">
@@ -241,6 +251,12 @@
       <if test="productCategoryId != null">
         #{productCategoryId,jdbcType=BIGINT},
       </if>
+      <if test="productBrand != null">
+        #{productBrand,jdbcType=VARCHAR},
+      </if>
+      <if test="productSn != null">
+        #{productSn,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.macro.mall.model.OmsCartItemExample" resultType="java.lang.Integer">
@@ -306,6 +322,12 @@
       <if test="record.productCategoryId != null">
         product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
       </if>
+      <if test="record.productBrand != null">
+        product_brand = #{record.productBrand,jdbcType=VARCHAR},
+      </if>
+      <if test="record.productSn != null">
+        product_sn = #{record.productSn,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -330,7 +352,9 @@
       create_date = #{record.createDate,jdbcType=TIMESTAMP},
       modify_date = #{record.modifyDate,jdbcType=TIMESTAMP},
       delete_status = #{record.deleteStatus,jdbcType=INTEGER},
-      product_category_id = #{record.productCategoryId,jdbcType=BIGINT}
+      product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
+      product_brand = #{record.productBrand,jdbcType=VARCHAR},
+      product_sn = #{record.productSn,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -389,6 +413,12 @@
       <if test="productCategoryId != null">
         product_category_id = #{productCategoryId,jdbcType=BIGINT},
       </if>
+      <if test="productBrand != null">
+        product_brand = #{productBrand,jdbcType=VARCHAR},
+      </if>
+      <if test="productSn != null">
+        product_sn = #{productSn,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -410,7 +440,9 @@
       create_date = #{createDate,jdbcType=TIMESTAMP},
       modify_date = #{modifyDate,jdbcType=TIMESTAMP},
       delete_status = #{deleteStatus,jdbcType=INTEGER},
-      product_category_id = #{productCategoryId,jdbcType=BIGINT}
+      product_category_id = #{productCategoryId,jdbcType=BIGINT},
+      product_brand = #{productBrand,jdbcType=VARCHAR},
+      product_sn = #{productSn,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderItemMapper.xml

@@ -6,16 +6,25 @@
     <result column="order_id" jdbcType="BIGINT" property="orderId" />
     <result column="order_sn" jdbcType="VARCHAR" property="orderSn" />
     <result column="product_id" jdbcType="BIGINT" property="productId" />
-    <result column="proudct_pic" jdbcType="VARCHAR" property="proudctPic" />
+    <result column="product_pic" jdbcType="VARCHAR" property="productPic" />
     <result column="product_name" jdbcType="VARCHAR" property="productName" />
     <result column="product_brand" jdbcType="VARCHAR" property="productBrand" />
     <result column="product_sn" jdbcType="VARCHAR" property="productSn" />
-    <result column="product_amount" jdbcType="DECIMAL" property="productAmount" />
-    <result column="product_count" jdbcType="INTEGER" property="productCount" />
-    <result column="product_real_amount" jdbcType="DECIMAL" property="productRealAmount" />
+    <result column="product_price" jdbcType="DECIMAL" property="productPrice" />
+    <result column="product_quantity" jdbcType="INTEGER" property="productQuantity" />
+    <result column="product_sku_id" jdbcType="BIGINT" property="productSkuId" />
+    <result column="product_sku_code" jdbcType="VARCHAR" property="productSkuCode" />
+    <result column="product_category_id" jdbcType="BIGINT" property="productCategoryId" />
     <result column="sp1" jdbcType="VARCHAR" property="sp1" />
     <result column="sp2" jdbcType="VARCHAR" property="sp2" />
     <result column="sp3" jdbcType="VARCHAR" property="sp3" />
+    <result column="promotion_name" jdbcType="VARCHAR" property="promotionName" />
+    <result column="promotion_amount" jdbcType="DECIMAL" property="promotionAmount" />
+    <result column="coupon_amount" jdbcType="DECIMAL" property="couponAmount" />
+    <result column="integration_amount" jdbcType="DECIMAL" property="integrationAmount" />
+    <result column="real_amount" jdbcType="DECIMAL" property="realAmount" />
+    <result column="gift_integration" jdbcType="INTEGER" property="giftIntegration" />
+    <result column="gift_growth" jdbcType="INTEGER" property="giftGrowth" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -76,8 +85,10 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, order_id, order_sn, product_id, proudct_pic, product_name, product_brand, product_sn, 
-    product_amount, product_count, product_real_amount, sp1, sp2, sp3
+    id, order_id, order_sn, product_id, product_pic, product_name, product_brand, product_sn, 
+    product_price, product_quantity, product_sku_id, product_sku_code, product_category_id, 
+    sp1, sp2, sp3, promotion_name, promotion_amount, coupon_amount, integration_amount, 
+    real_amount, gift_integration, gift_growth
   </sql>
   <select id="selectByExample" parameterType="com.macro.mall.model.OmsOrderItemExample" resultMap="BaseResultMap">
     select
@@ -114,15 +125,21 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into oms_order_item (order_id, order_sn, product_id, 
-      proudct_pic, product_name, product_brand, 
-      product_sn, product_amount, product_count, 
-      product_real_amount, sp1, sp2, 
-      sp3)
+      product_pic, product_name, product_brand, 
+      product_sn, product_price, product_quantity, 
+      product_sku_id, product_sku_code, product_category_id, 
+      sp1, sp2, sp3, promotion_name, 
+      promotion_amount, coupon_amount, integration_amount, 
+      real_amount, gift_integration, gift_growth
+      )
     values (#{orderId,jdbcType=BIGINT}, #{orderSn,jdbcType=VARCHAR}, #{productId,jdbcType=BIGINT}, 
-      #{proudctPic,jdbcType=VARCHAR}, #{productName,jdbcType=VARCHAR}, #{productBrand,jdbcType=VARCHAR}, 
-      #{productSn,jdbcType=VARCHAR}, #{productAmount,jdbcType=DECIMAL}, #{productCount,jdbcType=INTEGER}, 
-      #{productRealAmount,jdbcType=DECIMAL}, #{sp1,jdbcType=VARCHAR}, #{sp2,jdbcType=VARCHAR}, 
-      #{sp3,jdbcType=VARCHAR})
+      #{productPic,jdbcType=VARCHAR}, #{productName,jdbcType=VARCHAR}, #{productBrand,jdbcType=VARCHAR}, 
+      #{productSn,jdbcType=VARCHAR}, #{productPrice,jdbcType=DECIMAL}, #{productQuantity,jdbcType=INTEGER}, 
+      #{productSkuId,jdbcType=BIGINT}, #{productSkuCode,jdbcType=VARCHAR}, #{productCategoryId,jdbcType=BIGINT}, 
+      #{sp1,jdbcType=VARCHAR}, #{sp2,jdbcType=VARCHAR}, #{sp3,jdbcType=VARCHAR}, #{promotionName,jdbcType=VARCHAR}, 
+      #{promotionAmount,jdbcType=DECIMAL}, #{couponAmount,jdbcType=DECIMAL}, #{integrationAmount,jdbcType=DECIMAL}, 
+      #{realAmount,jdbcType=DECIMAL}, #{giftIntegration,jdbcType=INTEGER}, #{giftGrowth,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.macro.mall.model.OmsOrderItem">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -139,8 +156,8 @@
       <if test="productId != null">
         product_id,
       </if>
-      <if test="proudctPic != null">
-        proudct_pic,
+      <if test="productPic != null">
+        product_pic,
       </if>
       <if test="productName != null">
         product_name,
@@ -151,14 +168,20 @@
       <if test="productSn != null">
         product_sn,
       </if>
-      <if test="productAmount != null">
-        product_amount,
+      <if test="productPrice != null">
+        product_price,
       </if>
-      <if test="productCount != null">
-        product_count,
+      <if test="productQuantity != null">
+        product_quantity,
       </if>
-      <if test="productRealAmount != null">
-        product_real_amount,
+      <if test="productSkuId != null">
+        product_sku_id,
+      </if>
+      <if test="productSkuCode != null">
+        product_sku_code,
+      </if>
+      <if test="productCategoryId != null">
+        product_category_id,
       </if>
       <if test="sp1 != null">
         sp1,
@@ -169,6 +192,27 @@
       <if test="sp3 != null">
         sp3,
       </if>
+      <if test="promotionName != null">
+        promotion_name,
+      </if>
+      <if test="promotionAmount != null">
+        promotion_amount,
+      </if>
+      <if test="couponAmount != null">
+        coupon_amount,
+      </if>
+      <if test="integrationAmount != null">
+        integration_amount,
+      </if>
+      <if test="realAmount != null">
+        real_amount,
+      </if>
+      <if test="giftIntegration != null">
+        gift_integration,
+      </if>
+      <if test="giftGrowth != null">
+        gift_growth,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderId != null">
@@ -180,8 +224,8 @@
       <if test="productId != null">
         #{productId,jdbcType=BIGINT},
       </if>
-      <if test="proudctPic != null">
-        #{proudctPic,jdbcType=VARCHAR},
+      <if test="productPic != null">
+        #{productPic,jdbcType=VARCHAR},
       </if>
       <if test="productName != null">
         #{productName,jdbcType=VARCHAR},
@@ -192,14 +236,20 @@
       <if test="productSn != null">
         #{productSn,jdbcType=VARCHAR},
       </if>
-      <if test="productAmount != null">
-        #{productAmount,jdbcType=DECIMAL},
+      <if test="productPrice != null">
+        #{productPrice,jdbcType=DECIMAL},
       </if>
-      <if test="productCount != null">
-        #{productCount,jdbcType=INTEGER},
+      <if test="productQuantity != null">
+        #{productQuantity,jdbcType=INTEGER},
       </if>
-      <if test="productRealAmount != null">
-        #{productRealAmount,jdbcType=DECIMAL},
+      <if test="productSkuId != null">
+        #{productSkuId,jdbcType=BIGINT},
+      </if>
+      <if test="productSkuCode != null">
+        #{productSkuCode,jdbcType=VARCHAR},
+      </if>
+      <if test="productCategoryId != null">
+        #{productCategoryId,jdbcType=BIGINT},
       </if>
       <if test="sp1 != null">
         #{sp1,jdbcType=VARCHAR},
@@ -210,6 +260,27 @@
       <if test="sp3 != null">
         #{sp3,jdbcType=VARCHAR},
       </if>
+      <if test="promotionName != null">
+        #{promotionName,jdbcType=VARCHAR},
+      </if>
+      <if test="promotionAmount != null">
+        #{promotionAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="couponAmount != null">
+        #{couponAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="integrationAmount != null">
+        #{integrationAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="realAmount != null">
+        #{realAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="giftIntegration != null">
+        #{giftIntegration,jdbcType=INTEGER},
+      </if>
+      <if test="giftGrowth != null">
+        #{giftGrowth,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.macro.mall.model.OmsOrderItemExample" resultType="java.lang.Integer">
@@ -233,8 +304,8 @@
       <if test="record.productId != null">
         product_id = #{record.productId,jdbcType=BIGINT},
       </if>
-      <if test="record.proudctPic != null">
-        proudct_pic = #{record.proudctPic,jdbcType=VARCHAR},
+      <if test="record.productPic != null">
+        product_pic = #{record.productPic,jdbcType=VARCHAR},
       </if>
       <if test="record.productName != null">
         product_name = #{record.productName,jdbcType=VARCHAR},
@@ -245,14 +316,20 @@
       <if test="record.productSn != null">
         product_sn = #{record.productSn,jdbcType=VARCHAR},
       </if>
-      <if test="record.productAmount != null">
-        product_amount = #{record.productAmount,jdbcType=DECIMAL},
+      <if test="record.productPrice != null">
+        product_price = #{record.productPrice,jdbcType=DECIMAL},
       </if>
-      <if test="record.productCount != null">
-        product_count = #{record.productCount,jdbcType=INTEGER},
+      <if test="record.productQuantity != null">
+        product_quantity = #{record.productQuantity,jdbcType=INTEGER},
       </if>
-      <if test="record.productRealAmount != null">
-        product_real_amount = #{record.productRealAmount,jdbcType=DECIMAL},
+      <if test="record.productSkuId != null">
+        product_sku_id = #{record.productSkuId,jdbcType=BIGINT},
+      </if>
+      <if test="record.productSkuCode != null">
+        product_sku_code = #{record.productSkuCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.productCategoryId != null">
+        product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
       </if>
       <if test="record.sp1 != null">
         sp1 = #{record.sp1,jdbcType=VARCHAR},
@@ -263,6 +340,27 @@
       <if test="record.sp3 != null">
         sp3 = #{record.sp3,jdbcType=VARCHAR},
       </if>
+      <if test="record.promotionName != null">
+        promotion_name = #{record.promotionName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.promotionAmount != null">
+        promotion_amount = #{record.promotionAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.couponAmount != null">
+        coupon_amount = #{record.couponAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.integrationAmount != null">
+        integration_amount = #{record.integrationAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.realAmount != null">
+        real_amount = #{record.realAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.giftIntegration != null">
+        gift_integration = #{record.giftIntegration,jdbcType=INTEGER},
+      </if>
+      <if test="record.giftGrowth != null">
+        gift_growth = #{record.giftGrowth,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -274,16 +372,25 @@
       order_id = #{record.orderId,jdbcType=BIGINT},
       order_sn = #{record.orderSn,jdbcType=VARCHAR},
       product_id = #{record.productId,jdbcType=BIGINT},
-      proudct_pic = #{record.proudctPic,jdbcType=VARCHAR},
+      product_pic = #{record.productPic,jdbcType=VARCHAR},
       product_name = #{record.productName,jdbcType=VARCHAR},
       product_brand = #{record.productBrand,jdbcType=VARCHAR},
       product_sn = #{record.productSn,jdbcType=VARCHAR},
-      product_amount = #{record.productAmount,jdbcType=DECIMAL},
-      product_count = #{record.productCount,jdbcType=INTEGER},
-      product_real_amount = #{record.productRealAmount,jdbcType=DECIMAL},
+      product_price = #{record.productPrice,jdbcType=DECIMAL},
+      product_quantity = #{record.productQuantity,jdbcType=INTEGER},
+      product_sku_id = #{record.productSkuId,jdbcType=BIGINT},
+      product_sku_code = #{record.productSkuCode,jdbcType=VARCHAR},
+      product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
       sp1 = #{record.sp1,jdbcType=VARCHAR},
       sp2 = #{record.sp2,jdbcType=VARCHAR},
-      sp3 = #{record.sp3,jdbcType=VARCHAR}
+      sp3 = #{record.sp3,jdbcType=VARCHAR},
+      promotion_name = #{record.promotionName,jdbcType=VARCHAR},
+      promotion_amount = #{record.promotionAmount,jdbcType=DECIMAL},
+      coupon_amount = #{record.couponAmount,jdbcType=DECIMAL},
+      integration_amount = #{record.integrationAmount,jdbcType=DECIMAL},
+      real_amount = #{record.realAmount,jdbcType=DECIMAL},
+      gift_integration = #{record.giftIntegration,jdbcType=INTEGER},
+      gift_growth = #{record.giftGrowth,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -300,8 +407,8 @@
       <if test="productId != null">
         product_id = #{productId,jdbcType=BIGINT},
       </if>
-      <if test="proudctPic != null">
-        proudct_pic = #{proudctPic,jdbcType=VARCHAR},
+      <if test="productPic != null">
+        product_pic = #{productPic,jdbcType=VARCHAR},
       </if>
       <if test="productName != null">
         product_name = #{productName,jdbcType=VARCHAR},
@@ -312,14 +419,20 @@
       <if test="productSn != null">
         product_sn = #{productSn,jdbcType=VARCHAR},
       </if>
-      <if test="productAmount != null">
-        product_amount = #{productAmount,jdbcType=DECIMAL},
+      <if test="productPrice != null">
+        product_price = #{productPrice,jdbcType=DECIMAL},
       </if>
-      <if test="productCount != null">
-        product_count = #{productCount,jdbcType=INTEGER},
+      <if test="productQuantity != null">
+        product_quantity = #{productQuantity,jdbcType=INTEGER},
       </if>
-      <if test="productRealAmount != null">
-        product_real_amount = #{productRealAmount,jdbcType=DECIMAL},
+      <if test="productSkuId != null">
+        product_sku_id = #{productSkuId,jdbcType=BIGINT},
+      </if>
+      <if test="productSkuCode != null">
+        product_sku_code = #{productSkuCode,jdbcType=VARCHAR},
+      </if>
+      <if test="productCategoryId != null">
+        product_category_id = #{productCategoryId,jdbcType=BIGINT},
       </if>
       <if test="sp1 != null">
         sp1 = #{sp1,jdbcType=VARCHAR},
@@ -330,6 +443,27 @@
       <if test="sp3 != null">
         sp3 = #{sp3,jdbcType=VARCHAR},
       </if>
+      <if test="promotionName != null">
+        promotion_name = #{promotionName,jdbcType=VARCHAR},
+      </if>
+      <if test="promotionAmount != null">
+        promotion_amount = #{promotionAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="couponAmount != null">
+        coupon_amount = #{couponAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="integrationAmount != null">
+        integration_amount = #{integrationAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="realAmount != null">
+        real_amount = #{realAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="giftIntegration != null">
+        gift_integration = #{giftIntegration,jdbcType=INTEGER},
+      </if>
+      <if test="giftGrowth != null">
+        gift_growth = #{giftGrowth,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -338,16 +472,25 @@
     set order_id = #{orderId,jdbcType=BIGINT},
       order_sn = #{orderSn,jdbcType=VARCHAR},
       product_id = #{productId,jdbcType=BIGINT},
-      proudct_pic = #{proudctPic,jdbcType=VARCHAR},
+      product_pic = #{productPic,jdbcType=VARCHAR},
       product_name = #{productName,jdbcType=VARCHAR},
       product_brand = #{productBrand,jdbcType=VARCHAR},
       product_sn = #{productSn,jdbcType=VARCHAR},
-      product_amount = #{productAmount,jdbcType=DECIMAL},
-      product_count = #{productCount,jdbcType=INTEGER},
-      product_real_amount = #{productRealAmount,jdbcType=DECIMAL},
+      product_price = #{productPrice,jdbcType=DECIMAL},
+      product_quantity = #{productQuantity,jdbcType=INTEGER},
+      product_sku_id = #{productSkuId,jdbcType=BIGINT},
+      product_sku_code = #{productSkuCode,jdbcType=VARCHAR},
+      product_category_id = #{productCategoryId,jdbcType=BIGINT},
       sp1 = #{sp1,jdbcType=VARCHAR},
       sp2 = #{sp2,jdbcType=VARCHAR},
-      sp3 = #{sp3,jdbcType=VARCHAR}
+      sp3 = #{sp3,jdbcType=VARCHAR},
+      promotion_name = #{promotionName,jdbcType=VARCHAR},
+      promotion_amount = #{promotionAmount,jdbcType=DECIMAL},
+      coupon_amount = #{couponAmount,jdbcType=DECIMAL},
+      integration_amount = #{integrationAmount,jdbcType=DECIMAL},
+      real_amount = #{realAmount,jdbcType=DECIMAL},
+      gift_integration = #{giftIntegration,jdbcType=INTEGER},
+      gift_growth = #{giftGrowth,jdbcType=INTEGER}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>