From 7c81320e0df0f06a6badde735ae1bdf9bdcf1962 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 4 Jul 2019 17:10:39 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E6=8A=A5=E9=94=99]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/market/WxCouponController.java | 2 +- .../src/main/java/com/iformall/domain/po/WxBillRent.java | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 4aa68c51c..9def9d0b9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -176,7 +176,7 @@ public class WxCouponController extends BaseController { WxCoupon coupon = wxCouponService.findById(wxCoupon); if(coupon!=null){ - if(wxCoupon.getValidEndDate().before(coupon.getValidEndDate())){ + if(wxCoupon.getValidEndDate()!=null && wxCoupon.getValidEndDate().before(coupon.getValidEndDate())){ return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 8ff241f3c..2d373016b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -43,7 +43,6 @@ public class WxBillRent extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") private Long rentContractId; - @SortColumn(column = "receivePay") @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") private Long receivePay; @@ -71,7 +70,6 @@ public class WxBillRent extends BaseEntity { private Date receiveDate; @Excel(name = "收款日期", format = "yyyy-MM-dd", width = 20, orderNum = "11") - @SortColumn(column = "payDate") @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") private Date payDate; @@ -79,7 +77,6 @@ public class WxBillRent extends BaseEntity { private Date createtime; @Excel(name = "逾期(天) ", width = 20, orderNum = "13") - @SortColumn(column = "expiredDay") @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; @@ -104,7 +101,6 @@ public class WxBillRent extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel") private Integer isDel; - @SortColumn(column = "needPay") @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") private Long needPay; @@ -140,7 +136,6 @@ public class WxBillRent extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "滞纳金时间", name = "latePayTime") private Date latePayTime; - @SortColumn(column = "latePayPrice") @io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice") private Long latePayPrice; @@ -173,12 +168,10 @@ public class WxBillRent extends BaseEntity { private String comments; @Transient - @SortColumn(column = "allPeriod") private Integer allPeriod; @Excel(name = "商铺号", width = 20, orderNum = "1") @Transient - @SortColumn(column = "shopNumber") private String shopNumber; @Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "3")