Przeglądaj źródła

[审批][修改][修改库存报错]

release_toaliyun_real
luozukai 6 lat temu
rodzic
commit
7c81320e0d
2 zmienionych plików z 1 dodań i 8 usunięć
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +0
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Wyświetl plik

@@ -176,7 +176,7 @@ public class WxCouponController extends BaseController {


WxCoupon coupon = wxCouponService.findById(wxCoupon); WxCoupon coupon = wxCouponService.findById(wxCoupon);
if(coupon!=null){ 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); return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR);
} }
} }


+ 0
- 7
mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java Wyświetl plik

@@ -43,7 +43,6 @@ public class WxBillRent extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId")
private Long rentContractId; private Long rentContractId;


@SortColumn(column = "receivePay")
@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay")
private Long receivePay; private Long receivePay;


@@ -71,7 +70,6 @@ public class WxBillRent extends BaseEntity {
private Date receiveDate; private Date receiveDate;


@Excel(name = "收款日期", format = "yyyy-MM-dd", width = 20, orderNum = "11") @Excel(name = "收款日期", format = "yyyy-MM-dd", width = 20, orderNum = "11")
@SortColumn(column = "payDate")
@io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate")
private Date payDate; private Date payDate;


@@ -79,7 +77,6 @@ public class WxBillRent extends BaseEntity {
private Date createtime; private Date createtime;


@Excel(name = "逾期(天) ", width = 20, orderNum = "13") @Excel(name = "逾期(天) ", width = 20, orderNum = "13")
@SortColumn(column = "expiredDay")
@io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay")
private Long expiredDay; private Long expiredDay;


@@ -104,7 +101,6 @@ public class WxBillRent extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel") @io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel")
private Integer isDel; private Integer isDel;


@SortColumn(column = "needPay")
@io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay")
private Long needPay; private Long needPay;


@@ -140,7 +136,6 @@ public class WxBillRent extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "滞纳金时间", name = "latePayTime") @io.swagger.annotations.ApiModelProperty(value = "滞纳金时间", name = "latePayTime")
private Date latePayTime; private Date latePayTime;


@SortColumn(column = "latePayPrice")
@io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice") @io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice")
private Long latePayPrice; private Long latePayPrice;


@@ -173,12 +168,10 @@ public class WxBillRent extends BaseEntity {
private String comments; private String comments;


@Transient @Transient
@SortColumn(column = "allPeriod")
private Integer allPeriod; private Integer allPeriod;


@Excel(name = "商铺号", width = 20, orderNum = "1") @Excel(name = "商铺号", width = 20, orderNum = "1")
@Transient @Transient
@SortColumn(column = "shopNumber")
private String shopNumber; private String shopNumber;


@Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "3") @Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "3")


Ładowanie…
Anuluj
Zapisz