diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java index 1da4e4137..2c4ba19d6 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java @@ -39,10 +39,8 @@ public class WxBillRent implements Serializable { } @Transient - protected WxMerchant wxMerchant; + protected String shopNumber; - @Transient - protected WxShop wxShop; /*商铺ID**/ @@ -93,6 +91,18 @@ public class WxBillRent implements Serializable { @io.swagger.annotations.ApiModelProperty(value="欠缴金额",name="owe") private BigDecimal owe; + /***/ + @io.swagger.annotations.ApiModelProperty(value="payStatus",name="payStatus") + private Integer payStatus; + + + public String getShopNumber() { + return shopNumber; + } + + public void setShopNumber(String shopNumber) { + this.shopNumber = shopNumber; + } public Integer getShopId() { return shopId; @@ -181,13 +191,6 @@ public class WxBillRent implements Serializable { this.tenantId = tenantId; } - public WxMerchant getWxMerchant() { - return wxMerchant; - } - - public void setWxMerchant(WxMerchant wxMerchant) { - this.wxMerchant = wxMerchant; - } public BigDecimal getOwe() { return owe; @@ -197,12 +200,12 @@ public class WxBillRent implements Serializable { this.owe = owe; } - public WxShop getWxShop() { - return wxShop; + public Integer getPayStatus() { + return payStatus; } - public void setWxShop(WxShop wxShop) { - this.wxShop = wxShop; + public void setPayStatus(Integer payStatus) { + this.payStatus = payStatus; } public static enum Field diff --git a/mallinkService/src/main/java/com/simple/service/WxBillRentService.java b/mallinkService/src/main/java/com/simple/service/WxBillRentService.java index 2e35d4efe..42524eaa6 100644 --- a/mallinkService/src/main/java/com/simple/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/simple/service/WxBillRentService.java @@ -22,7 +22,7 @@ public interface WxBillRentService { * @param id * @return */ - WxBillRent getById(String id); + Map getById(Long id); /** * 保存或更新实体 diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxBillRentServiceImpl.java index 7309d2330..2cf5f2330 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxBillRentServiceImpl.java @@ -27,8 +27,10 @@ public class WxBillRentServiceImpl implements WxBillRentService { } @Override - public WxBillRent getById(String id) { - return wxBillRentMapper.selectByPrimaryKey(id); + public Map getById(Long id) { + WxBillRent record = new WxBillRent(); + record.setId(id); + return wxBillRentMapper.findListMap(record).get(0); } @Override @@ -36,8 +38,11 @@ public class WxBillRentServiceImpl implements WxBillRentService { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); + record.setCreatetime(new Date()); + record.setPayStatus(record.getOwe().doubleValue()>0?0:1); wxBillRentMapper.insertSelective(record); } else { + record.setPayStatus(record.getOwe().doubleValue()>0?0:1); wxBillRentMapper.updateByPrimaryKeySelective(record); } } diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 9288e348a..6f5de73b2 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -18,12 +18,12 @@ - + - `id`,`shop_id`,`user_area`,`price`,`need_pay`,`receive_pay`,`pay`,`receive_period`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`pay_way`,`receipt_num`,`tenant_id`,`owe` + `id`,`shop_id`,`user_area`,`price`,`need_pay`,`receive_pay`,`pay`,`receive_period`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`pay_way`,`receipt_num`,`tenant_id`,`owe`,`pay_status` @@ -61,7 +61,7 @@ select br.id,br.shop_id shopId,br.user_area userArea,br.price,br.need_pay needPay,br.receive_pay receivePay, br.pay,br.receive_period receivePeriod,br.receive_date receiveDate,br.pay_date payDate,br.createtime, br.expired_day expiredDay,br.pay_way payWay,br.receipt_num receiptNum,m.`name` merchantName, - s.build_area buildArea,s.operation_area operationArea,s.shop_number shopNumber,br.owe + s.build_area buildArea,s.operation_area operationArea,s.shop_number shopNumber,br.owe,br.pay_status payStatus from wx_bill_rent br left join wx_merchant_shop ms on br.shop_id=ms.shop_id and ms.is_del=0 inner join wx_merchant m on ms.merchant_id=m.id inner join wx_shop s on ms.shop_id=s.id @@ -81,6 +81,9 @@ and br.`pay_way` = #{payWay} and br.`receipt_num` = #{receiptNum} and br.`tenant_id` = #{tenantId} + and br.`shop_number` = #{shopNumber} + and br.`pay_status` = #{payStatus} + and br.id in