From 06388c0b5f123c220b981ef08a7b829902b414f2 Mon Sep 17 00:00:00 2001 From: zhh Date: Wed, 17 Oct 2018 11:29:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90mybatis?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../macro/mall/model/OmsCompanyAddress.java | 31 ++ .../mall/model/OmsCompanyAddressExample.java | 70 +++ .../macro/mall/model/OmsOrderReturnApply.java | 153 ++++--- .../model/OmsOrderReturnApplyExample.java | 416 +++++++++--------- .../mall/mapper/OmsCompanyAddressMapper.xml | 28 +- .../mall/mapper/OmsOrderReturnApplyMapper.xml | 145 +++--- 6 files changed, 503 insertions(+), 340 deletions(-) diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsCompanyAddress.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsCompanyAddress.java index 7176a3b..4dd29de 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsCompanyAddress.java +++ b/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(); diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsCompanyAddressExample.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsCompanyAddressExample.java index a6f740e..1773b1f 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsCompanyAddressExample.java +++ b/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 values) { + addCriterion("detail_address in", values, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressNotIn(List 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 { diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnApply.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnApply.java index 8cbdb5f..8d09f01 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnApply.java +++ b/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); diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnApplyExample.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnApplyExample.java index 8f61e24..873e07e 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnApplyExample.java +++ b/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 values) { + addCriterion("product_id in", values, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdNotIn(List 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 values) { - addCriterion("brand_name in", values, "brandName"); + public Criteria andProductBrandIn(List values) { + addCriterion("product_brand in", values, "productBrand"); return (Criteria) this; } - public Criteria andBrandNameNotIn(List values) { - addCriterion("brand_name not in", values, "brandName"); + public Criteria andProductBrandNotIn(List 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 values) { + addCriterion("product_price in", values, "productPrice"); + return (Criteria) this; + } + + public Criteria andProductPriceNotIn(List 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 values) { + addCriterion("product_real_price in", values, "productRealPrice"); + return (Criteria) this; + } + + public Criteria andProductRealPriceNotIn(List 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 values) { - addCriterion("return_post_amount in", values, "returnPostAmount"); - return (Criteria) this; - } - - public Criteria andReturnPostAmountNotIn(List 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 values) { - addCriterion("return_post_status in", values, "returnPostStatus"); - return (Criteria) this; - } - - public Criteria andReturnPostStatusNotIn(List 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 values) { - addCriterion("confirm_return_amount in", values, "confirmReturnAmount"); - return (Criteria) this; - } - - public Criteria andConfirmReturnAmountNotIn(List 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; diff --git a/mall-mbg/src/main/resources/com/macro/mall/mapper/OmsCompanyAddressMapper.xml b/mall-mbg/src/main/resources/com/macro/mall/mapper/OmsCompanyAddressMapper.xml index cf36e32..908cb32 100644 --- a/mall-mbg/src/main/resources/com/macro/mall/mapper/OmsCompanyAddressMapper.xml +++ b/mall-mbg/src/main/resources/com/macro/mall/mapper/OmsCompanyAddressMapper.xml @@ -11,6 +11,7 @@ + @@ -71,7 +72,8 @@ - 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 @@ -208,6 +218,9 @@ region = #{record.region,jdbcType=VARCHAR}, + + detail_address = #{record.detailAddress,jdbcType=VARCHAR}, + @@ -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} @@ -255,6 +269,9 @@ region = #{region,jdbcType=VARCHAR}, + + detail_address = #{detailAddress,jdbcType=VARCHAR}, + where id = #{id,jdbcType=BIGINT} @@ -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} \ No newline at end of file diff --git a/mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderReturnApplyMapper.xml b/mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderReturnApplyMapper.xml index 12e47d0..b8b5f30 100644 --- a/mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderReturnApplyMapper.xml +++ b/mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderReturnApplyMapper.xml @@ -5,6 +5,7 @@ + @@ -15,15 +16,14 @@ - + + + - - - @@ -89,11 +89,10 @@ - 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