重新生成mybatis文件

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

@@ -40,12 +40,34 @@ public class OmsCompanyAddress implements Serializable {
      */
     private String phone;
 
+    /**
+     * 省/直辖市
+     *
+     * @mbggenerated
+     */
     private String province;
 
+    /**
+     * 市
+     *
+     * @mbggenerated
+     */
     private String city;
 
+    /**
+     * 区
+     *
+     * @mbggenerated
+     */
     private String region;
 
+    /**
+     * 详细地址
+     *
+     * @mbggenerated
+     */
+    private String detailAddress;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -120,6 +142,14 @@ public class OmsCompanyAddress implements Serializable {
         this.region = region;
     }
 
+    public String getDetailAddress() {
+        return detailAddress;
+    }
+
+    public void setDetailAddress(String detailAddress) {
+        this.detailAddress = detailAddress;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -135,6 +165,7 @@ public class OmsCompanyAddress implements Serializable {
         sb.append(", province=").append(province);
         sb.append(", city=").append(city);
         sb.append(", region=").append(region);
+        sb.append(", detailAddress=").append(detailAddress);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -703,6 +703,76 @@ public class OmsCompanyAddressExample {
             addCriterion("region not between", value1, value2, "region");
             return (Criteria) this;
         }
+
+        public Criteria andDetailAddressIsNull() {
+            addCriterion("detail_address is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailAddressIsNotNull() {
+            addCriterion("detail_address is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailAddressEqualTo(String value) {
+            addCriterion("detail_address =", value, "detailAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailAddressNotEqualTo(String value) {
+            addCriterion("detail_address <>", value, "detailAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailAddressGreaterThan(String value) {
+            addCriterion("detail_address >", value, "detailAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailAddressGreaterThanOrEqualTo(String value) {
+            addCriterion("detail_address >=", value, "detailAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailAddressLessThan(String value) {
+            addCriterion("detail_address <", value, "detailAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailAddressLessThanOrEqualTo(String value) {
+            addCriterion("detail_address <=", value, "detailAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailAddressLike(String value) {
+            addCriterion("detail_address like", value, "detailAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailAddressNotLike(String value) {
+            addCriterion("detail_address not like", value, "detailAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailAddressIn(List<String> values) {
+            addCriterion("detail_address in", values, "detailAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailAddressNotIn(List<String> values) {
+            addCriterion("detail_address not in", values, "detailAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailAddressBetween(String value1, String value2) {
+            addCriterion("detail_address between", value1, value2, "detailAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailAddressNotBetween(String value1, String value2) {
+            addCriterion("detail_address not between", value1, value2, "detailAddress");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -14,8 +14,20 @@ public class OmsOrderReturnApply implements Serializable {
      */
     private Long orderId;
 
+    /**
+     * 收货地址表id
+     *
+     * @mbggenerated
+     */
     private Long companyAddressId;
 
+    /**
+     * 退货商品id
+     *
+     * @mbggenerated
+     */
+    private Long productId;
+
     /**
      * 订单编号
      *
@@ -23,8 +35,18 @@ public class OmsOrderReturnApply implements Serializable {
      */
     private String orderSn;
 
+    /**
+     * 申请时间
+     *
+     * @mbggenerated
+     */
     private Date createTime;
 
+    /**
+     * 会员用户名
+     *
+     * @mbggenerated
+     */
     private String memberUsername;
 
     /**
@@ -34,6 +56,11 @@ public class OmsOrderReturnApply implements Serializable {
      */
     private BigDecimal returnAmount;
 
+    /**
+     * 退货人姓名
+     *
+     * @mbggenerated
+     */
     private String returnName;
 
     /**
@@ -57,11 +84,26 @@ public class OmsOrderReturnApply implements Serializable {
      */
     private Date handleTime;
 
+    /**
+     * 商品图片
+     *
+     * @mbggenerated
+     */
     private String productPic;
 
+    /**
+     * 商品名称
+     *
+     * @mbggenerated
+     */
     private String productName;
 
-    private String brandName;
+    /**
+     * 商品品牌
+     *
+     * @mbggenerated
+     */
+    private String productBrand;
 
     /**
      * 商品销售属性：颜色：红色；尺码：xl;
@@ -77,6 +119,20 @@ public class OmsOrderReturnApply implements Serializable {
      */
     private Integer productCount;
 
+    /**
+     * 商品单价
+     *
+     * @mbggenerated
+     */
+    private BigDecimal productPrice;
+
+    /**
+     * 商品实际支付单价
+     *
+     * @mbggenerated
+     */
+    private BigDecimal productRealPrice;
+
     /**
      * 原因
      *
@@ -98,27 +154,6 @@ public class OmsOrderReturnApply implements Serializable {
      */
     private String proofPics;
 
-    /**
-     * 要退的邮费
-     *
-     * @mbggenerated
-     */
-    private BigDecimal returnPostAmount;
-
-    /**
-     * 是否退邮费：0->不退；1->退
-     *
-     * @mbggenerated
-     */
-    private Integer returnPostStatus;
-
-    /**
-     * 确认退款总金额
-     *
-     * @mbggenerated
-     */
-    private BigDecimal confirmReturnAmount;
-
     /**
      * 处理备注
      *
@@ -140,8 +175,18 @@ public class OmsOrderReturnApply implements Serializable {
      */
     private String receiveMan;
 
+    /**
+     * 收货时间
+     *
+     * @mbggenerated
+     */
     private Date receiveTime;
 
+    /**
+     * 收货备注
+     *
+     * @mbggenerated
+     */
     private String receiveNote;
 
     private static final long serialVersionUID = 1L;
@@ -170,6 +215,14 @@ public class OmsOrderReturnApply implements Serializable {
         this.companyAddressId = companyAddressId;
     }
 
+    public Long getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Long productId) {
+        this.productId = productId;
+    }
+
     public String getOrderSn() {
         return orderSn;
     }
@@ -250,12 +303,12 @@ public class OmsOrderReturnApply implements Serializable {
         this.productName = productName;
     }
 
-    public String getBrandName() {
-        return brandName;
+    public String getProductBrand() {
+        return productBrand;
     }
 
-    public void setBrandName(String brandName) {
-        this.brandName = brandName;
+    public void setProductBrand(String productBrand) {
+        this.productBrand = productBrand;
     }
 
     public String getProductAttr() {
@@ -274,6 +327,22 @@ public class OmsOrderReturnApply implements Serializable {
         this.productCount = productCount;
     }
 
+    public BigDecimal getProductPrice() {
+        return productPrice;
+    }
+
+    public void setProductPrice(BigDecimal productPrice) {
+        this.productPrice = productPrice;
+    }
+
+    public BigDecimal getProductRealPrice() {
+        return productRealPrice;
+    }
+
+    public void setProductRealPrice(BigDecimal productRealPrice) {
+        this.productRealPrice = productRealPrice;
+    }
+
     public String getReason() {
         return reason;
     }
@@ -298,30 +367,6 @@ public class OmsOrderReturnApply implements Serializable {
         this.proofPics = proofPics;
     }
 
-    public BigDecimal getReturnPostAmount() {
-        return returnPostAmount;
-    }
-
-    public void setReturnPostAmount(BigDecimal returnPostAmount) {
-        this.returnPostAmount = returnPostAmount;
-    }
-
-    public Integer getReturnPostStatus() {
-        return returnPostStatus;
-    }
-
-    public void setReturnPostStatus(Integer returnPostStatus) {
-        this.returnPostStatus = returnPostStatus;
-    }
-
-    public BigDecimal getConfirmReturnAmount() {
-        return confirmReturnAmount;
-    }
-
-    public void setConfirmReturnAmount(BigDecimal confirmReturnAmount) {
-        this.confirmReturnAmount = confirmReturnAmount;
-    }
-
     public String getHandleNote() {
         return handleNote;
     }
@@ -371,6 +416,7 @@ public class OmsOrderReturnApply implements Serializable {
         sb.append(", id=").append(id);
         sb.append(", orderId=").append(orderId);
         sb.append(", companyAddressId=").append(companyAddressId);
+        sb.append(", productId=").append(productId);
         sb.append(", orderSn=").append(orderSn);
         sb.append(", createTime=").append(createTime);
         sb.append(", memberUsername=").append(memberUsername);
@@ -381,15 +427,14 @@ public class OmsOrderReturnApply implements Serializable {
         sb.append(", handleTime=").append(handleTime);
         sb.append(", productPic=").append(productPic);
         sb.append(", productName=").append(productName);
-        sb.append(", brandName=").append(brandName);
+        sb.append(", productBrand=").append(productBrand);
         sb.append(", productAttr=").append(productAttr);
         sb.append(", productCount=").append(productCount);
+        sb.append(", productPrice=").append(productPrice);
+        sb.append(", productRealPrice=").append(productRealPrice);
         sb.append(", reason=").append(reason);
         sb.append(", description=").append(description);
         sb.append(", proofPics=").append(proofPics);
-        sb.append(", returnPostAmount=").append(returnPostAmount);
-        sb.append(", returnPostStatus=").append(returnPostStatus);
-        sb.append(", confirmReturnAmount=").append(confirmReturnAmount);
         sb.append(", handleNote=").append(handleNote);
         sb.append(", handleMan=").append(handleMan);
         sb.append(", receiveMan=").append(receiveMan);

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

@@ -286,6 +286,66 @@ public class OmsOrderReturnApplyExample {
             return (Criteria) this;
         }
 
+        public Criteria andProductIdIsNull() {
+            addCriterion("product_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdIsNotNull() {
+            addCriterion("product_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdEqualTo(Long value) {
+            addCriterion("product_id =", value, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdNotEqualTo(Long value) {
+            addCriterion("product_id <>", value, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdGreaterThan(Long value) {
+            addCriterion("product_id >", value, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("product_id >=", value, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdLessThan(Long value) {
+            addCriterion("product_id <", value, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdLessThanOrEqualTo(Long value) {
+            addCriterion("product_id <=", value, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdIn(List<Long> values) {
+            addCriterion("product_id in", values, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdNotIn(List<Long> values) {
+            addCriterion("product_id not in", values, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdBetween(Long value1, Long value2) {
+            addCriterion("product_id between", value1, value2, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdNotBetween(Long value1, Long value2) {
+            addCriterion("product_id not between", value1, value2, "productId");
+            return (Criteria) this;
+        }
+
         public Criteria andOrderSnIsNull() {
             addCriterion("order_sn is null");
             return (Criteria) this;
@@ -946,73 +1006,73 @@ public class OmsOrderReturnApplyExample {
             return (Criteria) this;
         }
 
-        public Criteria andBrandNameIsNull() {
-            addCriterion("brand_name is null");
+        public Criteria andProductBrandIsNull() {
+            addCriterion("product_brand is null");
             return (Criteria) this;
         }
 
-        public Criteria andBrandNameIsNotNull() {
-            addCriterion("brand_name is not null");
+        public Criteria andProductBrandIsNotNull() {
+            addCriterion("product_brand is not null");
             return (Criteria) this;
         }
 
-        public Criteria andBrandNameEqualTo(String value) {
-            addCriterion("brand_name =", value, "brandName");
+        public Criteria andProductBrandEqualTo(String value) {
+            addCriterion("product_brand =", value, "productBrand");
             return (Criteria) this;
         }
 
-        public Criteria andBrandNameNotEqualTo(String value) {
-            addCriterion("brand_name <>", value, "brandName");
+        public Criteria andProductBrandNotEqualTo(String value) {
+            addCriterion("product_brand <>", value, "productBrand");
             return (Criteria) this;
         }
 
-        public Criteria andBrandNameGreaterThan(String value) {
-            addCriterion("brand_name >", value, "brandName");
+        public Criteria andProductBrandGreaterThan(String value) {
+            addCriterion("product_brand >", value, "productBrand");
             return (Criteria) this;
         }
 
-        public Criteria andBrandNameGreaterThanOrEqualTo(String value) {
-            addCriterion("brand_name >=", value, "brandName");
+        public Criteria andProductBrandGreaterThanOrEqualTo(String value) {
+            addCriterion("product_brand >=", value, "productBrand");
             return (Criteria) this;
         }
 
-        public Criteria andBrandNameLessThan(String value) {
-            addCriterion("brand_name <", value, "brandName");
+        public Criteria andProductBrandLessThan(String value) {
+            addCriterion("product_brand <", value, "productBrand");
             return (Criteria) this;
         }
 
-        public Criteria andBrandNameLessThanOrEqualTo(String value) {
-            addCriterion("brand_name <=", value, "brandName");
+        public Criteria andProductBrandLessThanOrEqualTo(String value) {
+            addCriterion("product_brand <=", value, "productBrand");
             return (Criteria) this;
         }
 
-        public Criteria andBrandNameLike(String value) {
-            addCriterion("brand_name like", value, "brandName");
+        public Criteria andProductBrandLike(String value) {
+            addCriterion("product_brand like", value, "productBrand");
             return (Criteria) this;
         }
 
-        public Criteria andBrandNameNotLike(String value) {
-            addCriterion("brand_name not like", value, "brandName");
+        public Criteria andProductBrandNotLike(String value) {
+            addCriterion("product_brand not like", value, "productBrand");
             return (Criteria) this;
         }
 
-        public Criteria andBrandNameIn(List<String> values) {
-            addCriterion("brand_name in", values, "brandName");
+        public Criteria andProductBrandIn(List<String> values) {
+            addCriterion("product_brand in", values, "productBrand");
             return (Criteria) this;
         }
 
-        public Criteria andBrandNameNotIn(List<String> values) {
-            addCriterion("brand_name not in", values, "brandName");
+        public Criteria andProductBrandNotIn(List<String> values) {
+            addCriterion("product_brand not in", values, "productBrand");
             return (Criteria) this;
         }
 
-        public Criteria andBrandNameBetween(String value1, String value2) {
-            addCriterion("brand_name between", value1, value2, "brandName");
+        public Criteria andProductBrandBetween(String value1, String value2) {
+            addCriterion("product_brand between", value1, value2, "productBrand");
             return (Criteria) this;
         }
 
-        public Criteria andBrandNameNotBetween(String value1, String value2) {
-            addCriterion("brand_name not between", value1, value2, "brandName");
+        public Criteria andProductBrandNotBetween(String value1, String value2) {
+            addCriterion("product_brand not between", value1, value2, "productBrand");
             return (Criteria) this;
         }
 
@@ -1146,6 +1206,126 @@ public class OmsOrderReturnApplyExample {
             return (Criteria) this;
         }
 
+        public Criteria andProductPriceIsNull() {
+            addCriterion("product_price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductPriceIsNotNull() {
+            addCriterion("product_price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductPriceEqualTo(BigDecimal value) {
+            addCriterion("product_price =", value, "productPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductPriceNotEqualTo(BigDecimal value) {
+            addCriterion("product_price <>", value, "productPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductPriceGreaterThan(BigDecimal value) {
+            addCriterion("product_price >", value, "productPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductPriceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("product_price >=", value, "productPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductPriceLessThan(BigDecimal value) {
+            addCriterion("product_price <", value, "productPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductPriceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("product_price <=", value, "productPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductPriceIn(List<BigDecimal> values) {
+            addCriterion("product_price in", values, "productPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductPriceNotIn(List<BigDecimal> values) {
+            addCriterion("product_price not in", values, "productPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductPriceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("product_price between", value1, value2, "productPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("product_price not between", value1, value2, "productPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductRealPriceIsNull() {
+            addCriterion("product_real_price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductRealPriceIsNotNull() {
+            addCriterion("product_real_price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductRealPriceEqualTo(BigDecimal value) {
+            addCriterion("product_real_price =", value, "productRealPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductRealPriceNotEqualTo(BigDecimal value) {
+            addCriterion("product_real_price <>", value, "productRealPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductRealPriceGreaterThan(BigDecimal value) {
+            addCriterion("product_real_price >", value, "productRealPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductRealPriceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("product_real_price >=", value, "productRealPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductRealPriceLessThan(BigDecimal value) {
+            addCriterion("product_real_price <", value, "productRealPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductRealPriceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("product_real_price <=", value, "productRealPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductRealPriceIn(List<BigDecimal> values) {
+            addCriterion("product_real_price in", values, "productRealPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductRealPriceNotIn(List<BigDecimal> values) {
+            addCriterion("product_real_price not in", values, "productRealPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductRealPriceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("product_real_price between", value1, value2, "productRealPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductRealPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("product_real_price not between", value1, value2, "productRealPrice");
+            return (Criteria) this;
+        }
+
         public Criteria andReasonIsNull() {
             addCriterion("reason is null");
             return (Criteria) this;
@@ -1356,186 +1536,6 @@ public class OmsOrderReturnApplyExample {
             return (Criteria) this;
         }
 
-        public Criteria andReturnPostAmountIsNull() {
-            addCriterion("return_post_amount is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostAmountIsNotNull() {
-            addCriterion("return_post_amount is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostAmountEqualTo(BigDecimal value) {
-            addCriterion("return_post_amount =", value, "returnPostAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostAmountNotEqualTo(BigDecimal value) {
-            addCriterion("return_post_amount <>", value, "returnPostAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostAmountGreaterThan(BigDecimal value) {
-            addCriterion("return_post_amount >", value, "returnPostAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostAmountGreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("return_post_amount >=", value, "returnPostAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostAmountLessThan(BigDecimal value) {
-            addCriterion("return_post_amount <", value, "returnPostAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostAmountLessThanOrEqualTo(BigDecimal value) {
-            addCriterion("return_post_amount <=", value, "returnPostAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostAmountIn(List<BigDecimal> values) {
-            addCriterion("return_post_amount in", values, "returnPostAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostAmountNotIn(List<BigDecimal> values) {
-            addCriterion("return_post_amount not in", values, "returnPostAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostAmountBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("return_post_amount between", value1, value2, "returnPostAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostAmountNotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("return_post_amount not between", value1, value2, "returnPostAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostStatusIsNull() {
-            addCriterion("return_post_status is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostStatusIsNotNull() {
-            addCriterion("return_post_status is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostStatusEqualTo(Integer value) {
-            addCriterion("return_post_status =", value, "returnPostStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostStatusNotEqualTo(Integer value) {
-            addCriterion("return_post_status <>", value, "returnPostStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostStatusGreaterThan(Integer value) {
-            addCriterion("return_post_status >", value, "returnPostStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostStatusGreaterThanOrEqualTo(Integer value) {
-            addCriterion("return_post_status >=", value, "returnPostStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostStatusLessThan(Integer value) {
-            addCriterion("return_post_status <", value, "returnPostStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostStatusLessThanOrEqualTo(Integer value) {
-            addCriterion("return_post_status <=", value, "returnPostStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostStatusIn(List<Integer> values) {
-            addCriterion("return_post_status in", values, "returnPostStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostStatusNotIn(List<Integer> values) {
-            addCriterion("return_post_status not in", values, "returnPostStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostStatusBetween(Integer value1, Integer value2) {
-            addCriterion("return_post_status between", value1, value2, "returnPostStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andReturnPostStatusNotBetween(Integer value1, Integer value2) {
-            addCriterion("return_post_status not between", value1, value2, "returnPostStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andConfirmReturnAmountIsNull() {
-            addCriterion("confirm_return_amount is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andConfirmReturnAmountIsNotNull() {
-            addCriterion("confirm_return_amount is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andConfirmReturnAmountEqualTo(BigDecimal value) {
-            addCriterion("confirm_return_amount =", value, "confirmReturnAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andConfirmReturnAmountNotEqualTo(BigDecimal value) {
-            addCriterion("confirm_return_amount <>", value, "confirmReturnAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andConfirmReturnAmountGreaterThan(BigDecimal value) {
-            addCriterion("confirm_return_amount >", value, "confirmReturnAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andConfirmReturnAmountGreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("confirm_return_amount >=", value, "confirmReturnAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andConfirmReturnAmountLessThan(BigDecimal value) {
-            addCriterion("confirm_return_amount <", value, "confirmReturnAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andConfirmReturnAmountLessThanOrEqualTo(BigDecimal value) {
-            addCriterion("confirm_return_amount <=", value, "confirmReturnAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andConfirmReturnAmountIn(List<BigDecimal> values) {
-            addCriterion("confirm_return_amount in", values, "confirmReturnAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andConfirmReturnAmountNotIn(List<BigDecimal> values) {
-            addCriterion("confirm_return_amount not in", values, "confirmReturnAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andConfirmReturnAmountBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("confirm_return_amount between", value1, value2, "confirmReturnAmount");
-            return (Criteria) this;
-        }
-
-        public Criteria andConfirmReturnAmountNotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("confirm_return_amount not between", value1, value2, "confirmReturnAmount");
-            return (Criteria) this;
-        }
-
         public Criteria andHandleNoteIsNull() {
             addCriterion("handle_note is null");
             return (Criteria) this;

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

@@ -11,6 +11,7 @@
     <result column="province" jdbcType="VARCHAR" property="province" />
     <result column="city" jdbcType="VARCHAR" property="city" />
     <result column="region" jdbcType="VARCHAR" property="region" />
+    <result column="detail_address" jdbcType="VARCHAR" property="detailAddress" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -71,7 +72,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, address_name, send_status, receive_status, name, phone, province, city, region
+    id, address_name, send_status, receive_status, name, phone, province, city, region, 
+    detail_address
   </sql>
   <select id="selectByExample" parameterType="com.macro.mall.model.OmsCompanyAddressExample" resultMap="BaseResultMap">
     select
@@ -109,10 +111,12 @@
     </selectKey>
     insert into oms_company_address (address_name, send_status, receive_status, 
       name, phone, province, 
-      city, region)
+      city, region, detail_address
+      )
     values (#{addressName,jdbcType=VARCHAR}, #{sendStatus,jdbcType=INTEGER}, #{receiveStatus,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{province,jdbcType=VARCHAR}, 
-      #{city,jdbcType=VARCHAR}, #{region,jdbcType=VARCHAR})
+      #{city,jdbcType=VARCHAR}, #{region,jdbcType=VARCHAR}, #{detailAddress,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.macro.mall.model.OmsCompanyAddress">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -144,6 +148,9 @@
       <if test="region != null">
         region,
       </if>
+      <if test="detailAddress != null">
+        detail_address,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="addressName != null">
@@ -170,6 +177,9 @@
       <if test="region != null">
         #{region,jdbcType=VARCHAR},
       </if>
+      <if test="detailAddress != null">
+        #{detailAddress,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.macro.mall.model.OmsCompanyAddressExample" resultType="java.lang.Integer">
@@ -208,6 +218,9 @@
       <if test="record.region != null">
         region = #{record.region,jdbcType=VARCHAR},
       </if>
+      <if test="record.detailAddress != null">
+        detail_address = #{record.detailAddress,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -223,7 +236,8 @@
       phone = #{record.phone,jdbcType=VARCHAR},
       province = #{record.province,jdbcType=VARCHAR},
       city = #{record.city,jdbcType=VARCHAR},
-      region = #{record.region,jdbcType=VARCHAR}
+      region = #{record.region,jdbcType=VARCHAR},
+      detail_address = #{record.detailAddress,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -255,6 +269,9 @@
       <if test="region != null">
         region = #{region,jdbcType=VARCHAR},
       </if>
+      <if test="detailAddress != null">
+        detail_address = #{detailAddress,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -267,7 +284,8 @@
       phone = #{phone,jdbcType=VARCHAR},
       province = #{province,jdbcType=VARCHAR},
       city = #{city,jdbcType=VARCHAR},
-      region = #{region,jdbcType=VARCHAR}
+      region = #{region,jdbcType=VARCHAR},
+      detail_address = #{detailAddress,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

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

@@ -5,6 +5,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="order_id" jdbcType="BIGINT" property="orderId" />
     <result column="company_address_id" jdbcType="BIGINT" property="companyAddressId" />
+    <result column="product_id" jdbcType="BIGINT" property="productId" />
     <result column="order_sn" jdbcType="VARCHAR" property="orderSn" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="member_username" jdbcType="VARCHAR" property="memberUsername" />
@@ -15,15 +16,14 @@
     <result column="handle_time" jdbcType="TIMESTAMP" property="handleTime" />
     <result column="product_pic" jdbcType="VARCHAR" property="productPic" />
     <result column="product_name" jdbcType="VARCHAR" property="productName" />
-    <result column="brand_name" jdbcType="VARCHAR" property="brandName" />
+    <result column="product_brand" jdbcType="VARCHAR" property="productBrand" />
     <result column="product_attr" jdbcType="VARCHAR" property="productAttr" />
     <result column="product_count" jdbcType="INTEGER" property="productCount" />
+    <result column="product_price" jdbcType="DECIMAL" property="productPrice" />
+    <result column="product_real_price" jdbcType="DECIMAL" property="productRealPrice" />
     <result column="reason" jdbcType="VARCHAR" property="reason" />
     <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="proof_pics" jdbcType="VARCHAR" property="proofPics" />
-    <result column="return_post_amount" jdbcType="DECIMAL" property="returnPostAmount" />
-    <result column="return_post_status" jdbcType="INTEGER" property="returnPostStatus" />
-    <result column="confirm_return_amount" jdbcType="DECIMAL" property="confirmReturnAmount" />
     <result column="handle_note" jdbcType="VARCHAR" property="handleNote" />
     <result column="handle_man" jdbcType="VARCHAR" property="handleMan" />
     <result column="receive_man" jdbcType="VARCHAR" property="receiveMan" />
@@ -89,11 +89,10 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, order_id, company_address_id, order_sn, create_time, member_username, return_amount, 
-    return_name, return_phone, status, handle_time, product_pic, product_name, brand_name, 
-    product_attr, product_count, reason, description, proof_pics, return_post_amount, 
-    return_post_status, confirm_return_amount, handle_note, handle_man, receive_man, 
-    receive_time, receive_note
+    id, order_id, company_address_id, product_id, order_sn, create_time, member_username, 
+    return_amount, return_name, return_phone, status, handle_time, product_pic, product_name, 
+    product_brand, product_attr, product_count, product_price, product_real_price, reason, 
+    description, proof_pics, handle_note, handle_man, receive_man, receive_time, receive_note
   </sql>
   <select id="selectByExample" parameterType="com.macro.mall.model.OmsOrderReturnApplyExample" resultMap="BaseResultMap">
     select
@@ -129,22 +128,22 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into oms_order_return_apply (order_id, company_address_id, order_sn, 
-      create_time, member_username, return_amount, 
-      return_name, return_phone, status, 
-      handle_time, product_pic, product_name, 
-      brand_name, product_attr, product_count, 
+    insert into oms_order_return_apply (order_id, company_address_id, product_id, 
+      order_sn, create_time, member_username, 
+      return_amount, return_name, return_phone, 
+      status, handle_time, product_pic, 
+      product_name, product_brand, product_attr, 
+      product_count, product_price, product_real_price, 
       reason, description, proof_pics, 
-      return_post_amount, return_post_status, confirm_return_amount, 
       handle_note, handle_man, receive_man, 
       receive_time, receive_note)
-    values (#{orderId,jdbcType=BIGINT}, #{companyAddressId,jdbcType=BIGINT}, #{orderSn,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{memberUsername,jdbcType=VARCHAR}, #{returnAmount,jdbcType=DECIMAL}, 
-      #{returnName,jdbcType=VARCHAR}, #{returnPhone,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
-      #{handleTime,jdbcType=TIMESTAMP}, #{productPic,jdbcType=VARCHAR}, #{productName,jdbcType=VARCHAR}, 
-      #{brandName,jdbcType=VARCHAR}, #{productAttr,jdbcType=VARCHAR}, #{productCount,jdbcType=INTEGER}, 
+    values (#{orderId,jdbcType=BIGINT}, #{companyAddressId,jdbcType=BIGINT}, #{productId,jdbcType=BIGINT}, 
+      #{orderSn,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{memberUsername,jdbcType=VARCHAR}, 
+      #{returnAmount,jdbcType=DECIMAL}, #{returnName,jdbcType=VARCHAR}, #{returnPhone,jdbcType=VARCHAR}, 
+      #{status,jdbcType=INTEGER}, #{handleTime,jdbcType=TIMESTAMP}, #{productPic,jdbcType=VARCHAR}, 
+      #{productName,jdbcType=VARCHAR}, #{productBrand,jdbcType=VARCHAR}, #{productAttr,jdbcType=VARCHAR}, 
+      #{productCount,jdbcType=INTEGER}, #{productPrice,jdbcType=DECIMAL}, #{productRealPrice,jdbcType=DECIMAL}, 
       #{reason,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{proofPics,jdbcType=VARCHAR}, 
-      #{returnPostAmount,jdbcType=DECIMAL}, #{returnPostStatus,jdbcType=INTEGER}, #{confirmReturnAmount,jdbcType=DECIMAL}, 
       #{handleNote,jdbcType=VARCHAR}, #{handleMan,jdbcType=VARCHAR}, #{receiveMan,jdbcType=VARCHAR}, 
       #{receiveTime,jdbcType=TIMESTAMP}, #{receiveNote,jdbcType=VARCHAR})
   </insert>
@@ -160,6 +159,9 @@
       <if test="companyAddressId != null">
         company_address_id,
       </if>
+      <if test="productId != null">
+        product_id,
+      </if>
       <if test="orderSn != null">
         order_sn,
       </if>
@@ -190,8 +192,8 @@
       <if test="productName != null">
         product_name,
       </if>
-      <if test="brandName != null">
-        brand_name,
+      <if test="productBrand != null">
+        product_brand,
       </if>
       <if test="productAttr != null">
         product_attr,
@@ -199,6 +201,12 @@
       <if test="productCount != null">
         product_count,
       </if>
+      <if test="productPrice != null">
+        product_price,
+      </if>
+      <if test="productRealPrice != null">
+        product_real_price,
+      </if>
       <if test="reason != null">
         reason,
       </if>
@@ -208,15 +216,6 @@
       <if test="proofPics != null">
         proof_pics,
       </if>
-      <if test="returnPostAmount != null">
-        return_post_amount,
-      </if>
-      <if test="returnPostStatus != null">
-        return_post_status,
-      </if>
-      <if test="confirmReturnAmount != null">
-        confirm_return_amount,
-      </if>
       <if test="handleNote != null">
         handle_note,
       </if>
@@ -240,6 +239,9 @@
       <if test="companyAddressId != null">
         #{companyAddressId,jdbcType=BIGINT},
       </if>
+      <if test="productId != null">
+        #{productId,jdbcType=BIGINT},
+      </if>
       <if test="orderSn != null">
         #{orderSn,jdbcType=VARCHAR},
       </if>
@@ -270,8 +272,8 @@
       <if test="productName != null">
         #{productName,jdbcType=VARCHAR},
       </if>
-      <if test="brandName != null">
-        #{brandName,jdbcType=VARCHAR},
+      <if test="productBrand != null">
+        #{productBrand,jdbcType=VARCHAR},
       </if>
       <if test="productAttr != null">
         #{productAttr,jdbcType=VARCHAR},
@@ -279,6 +281,12 @@
       <if test="productCount != null">
         #{productCount,jdbcType=INTEGER},
       </if>
+      <if test="productPrice != null">
+        #{productPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="productRealPrice != null">
+        #{productRealPrice,jdbcType=DECIMAL},
+      </if>
       <if test="reason != null">
         #{reason,jdbcType=VARCHAR},
       </if>
@@ -288,15 +296,6 @@
       <if test="proofPics != null">
         #{proofPics,jdbcType=VARCHAR},
       </if>
-      <if test="returnPostAmount != null">
-        #{returnPostAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="returnPostStatus != null">
-        #{returnPostStatus,jdbcType=INTEGER},
-      </if>
-      <if test="confirmReturnAmount != null">
-        #{confirmReturnAmount,jdbcType=DECIMAL},
-      </if>
       <if test="handleNote != null">
         #{handleNote,jdbcType=VARCHAR},
       </if>
@@ -332,6 +331,9 @@
       <if test="record.companyAddressId != null">
         company_address_id = #{record.companyAddressId,jdbcType=BIGINT},
       </if>
+      <if test="record.productId != null">
+        product_id = #{record.productId,jdbcType=BIGINT},
+      </if>
       <if test="record.orderSn != null">
         order_sn = #{record.orderSn,jdbcType=VARCHAR},
       </if>
@@ -362,8 +364,8 @@
       <if test="record.productName != null">
         product_name = #{record.productName,jdbcType=VARCHAR},
       </if>
-      <if test="record.brandName != null">
-        brand_name = #{record.brandName,jdbcType=VARCHAR},
+      <if test="record.productBrand != null">
+        product_brand = #{record.productBrand,jdbcType=VARCHAR},
       </if>
       <if test="record.productAttr != null">
         product_attr = #{record.productAttr,jdbcType=VARCHAR},
@@ -371,6 +373,12 @@
       <if test="record.productCount != null">
         product_count = #{record.productCount,jdbcType=INTEGER},
       </if>
+      <if test="record.productPrice != null">
+        product_price = #{record.productPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.productRealPrice != null">
+        product_real_price = #{record.productRealPrice,jdbcType=DECIMAL},
+      </if>
       <if test="record.reason != null">
         reason = #{record.reason,jdbcType=VARCHAR},
       </if>
@@ -380,15 +388,6 @@
       <if test="record.proofPics != null">
         proof_pics = #{record.proofPics,jdbcType=VARCHAR},
       </if>
-      <if test="record.returnPostAmount != null">
-        return_post_amount = #{record.returnPostAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="record.returnPostStatus != null">
-        return_post_status = #{record.returnPostStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.confirmReturnAmount != null">
-        confirm_return_amount = #{record.confirmReturnAmount,jdbcType=DECIMAL},
-      </if>
       <if test="record.handleNote != null">
         handle_note = #{record.handleNote,jdbcType=VARCHAR},
       </if>
@@ -414,6 +413,7 @@
     set id = #{record.id,jdbcType=BIGINT},
       order_id = #{record.orderId,jdbcType=BIGINT},
       company_address_id = #{record.companyAddressId,jdbcType=BIGINT},
+      product_id = #{record.productId,jdbcType=BIGINT},
       order_sn = #{record.orderSn,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       member_username = #{record.memberUsername,jdbcType=VARCHAR},
@@ -424,15 +424,14 @@
       handle_time = #{record.handleTime,jdbcType=TIMESTAMP},
       product_pic = #{record.productPic,jdbcType=VARCHAR},
       product_name = #{record.productName,jdbcType=VARCHAR},
-      brand_name = #{record.brandName,jdbcType=VARCHAR},
+      product_brand = #{record.productBrand,jdbcType=VARCHAR},
       product_attr = #{record.productAttr,jdbcType=VARCHAR},
       product_count = #{record.productCount,jdbcType=INTEGER},
+      product_price = #{record.productPrice,jdbcType=DECIMAL},
+      product_real_price = #{record.productRealPrice,jdbcType=DECIMAL},
       reason = #{record.reason,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=VARCHAR},
       proof_pics = #{record.proofPics,jdbcType=VARCHAR},
-      return_post_amount = #{record.returnPostAmount,jdbcType=DECIMAL},
-      return_post_status = #{record.returnPostStatus,jdbcType=INTEGER},
-      confirm_return_amount = #{record.confirmReturnAmount,jdbcType=DECIMAL},
       handle_note = #{record.handleNote,jdbcType=VARCHAR},
       handle_man = #{record.handleMan,jdbcType=VARCHAR},
       receive_man = #{record.receiveMan,jdbcType=VARCHAR},
@@ -451,6 +450,9 @@
       <if test="companyAddressId != null">
         company_address_id = #{companyAddressId,jdbcType=BIGINT},
       </if>
+      <if test="productId != null">
+        product_id = #{productId,jdbcType=BIGINT},
+      </if>
       <if test="orderSn != null">
         order_sn = #{orderSn,jdbcType=VARCHAR},
       </if>
@@ -481,8 +483,8 @@
       <if test="productName != null">
         product_name = #{productName,jdbcType=VARCHAR},
       </if>
-      <if test="brandName != null">
-        brand_name = #{brandName,jdbcType=VARCHAR},
+      <if test="productBrand != null">
+        product_brand = #{productBrand,jdbcType=VARCHAR},
       </if>
       <if test="productAttr != null">
         product_attr = #{productAttr,jdbcType=VARCHAR},
@@ -490,6 +492,12 @@
       <if test="productCount != null">
         product_count = #{productCount,jdbcType=INTEGER},
       </if>
+      <if test="productPrice != null">
+        product_price = #{productPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="productRealPrice != null">
+        product_real_price = #{productRealPrice,jdbcType=DECIMAL},
+      </if>
       <if test="reason != null">
         reason = #{reason,jdbcType=VARCHAR},
       </if>
@@ -499,15 +507,6 @@
       <if test="proofPics != null">
         proof_pics = #{proofPics,jdbcType=VARCHAR},
       </if>
-      <if test="returnPostAmount != null">
-        return_post_amount = #{returnPostAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="returnPostStatus != null">
-        return_post_status = #{returnPostStatus,jdbcType=INTEGER},
-      </if>
-      <if test="confirmReturnAmount != null">
-        confirm_return_amount = #{confirmReturnAmount,jdbcType=DECIMAL},
-      </if>
       <if test="handleNote != null">
         handle_note = #{handleNote,jdbcType=VARCHAR},
       </if>
@@ -530,6 +529,7 @@
     update oms_order_return_apply
     set order_id = #{orderId,jdbcType=BIGINT},
       company_address_id = #{companyAddressId,jdbcType=BIGINT},
+      product_id = #{productId,jdbcType=BIGINT},
       order_sn = #{orderSn,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       member_username = #{memberUsername,jdbcType=VARCHAR},
@@ -540,15 +540,14 @@
       handle_time = #{handleTime,jdbcType=TIMESTAMP},
       product_pic = #{productPic,jdbcType=VARCHAR},
       product_name = #{productName,jdbcType=VARCHAR},
-      brand_name = #{brandName,jdbcType=VARCHAR},
+      product_brand = #{productBrand,jdbcType=VARCHAR},
       product_attr = #{productAttr,jdbcType=VARCHAR},
       product_count = #{productCount,jdbcType=INTEGER},
+      product_price = #{productPrice,jdbcType=DECIMAL},
+      product_real_price = #{productRealPrice,jdbcType=DECIMAL},
       reason = #{reason,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},
       proof_pics = #{proofPics,jdbcType=VARCHAR},
-      return_post_amount = #{returnPostAmount,jdbcType=DECIMAL},
-      return_post_status = #{returnPostStatus,jdbcType=INTEGER},
-      confirm_return_amount = #{confirmReturnAmount,jdbcType=DECIMAL},
       handle_note = #{handleNote,jdbcType=VARCHAR},
       handle_man = #{handleMan,jdbcType=VARCHAR},
       receive_man = #{receiveMan,jdbcType=VARCHAR},