diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java
index 652d0ee9f..ae9846d5a 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java
@@ -104,6 +104,18 @@ public class WxBillDeposit implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "退还金额", name = "returnPrice")
private Integer returnPrice;
+ @io.swagger.annotations.ApiModelProperty(value = "商铺信息", name = "shopInfo")
+ private String shopInfo;
+
+ public String getShopInfo() {
+ return shopInfo;
+ }
+
+ public void setShopInfo(String shopInfo) {
+ this.shopInfo = shopInfo;
+ }
+
+
public Date getStarttime() {
return starttime;
}
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
index 6de3ee128..3bf185759 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
@@ -119,6 +119,17 @@ public class WxBillProperty implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "预览账单0否1是", name = "isPreview")
private Integer isPreview;
+ @io.swagger.annotations.ApiModelProperty(value = "商铺信息", name = "shopInfo")
+ private String shopInfo;
+
+ public String getShopInfo() {
+ return shopInfo;
+ }
+
+ public void setShopInfo(String shopInfo) {
+ this.shopInfo = shopInfo;
+ }
+
public Integer getIsPreview() {
return isPreview;
}
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java
index 5f0540a43..7dc143b2e 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java
@@ -104,6 +104,17 @@ public class WxBillPropertyDeposit implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "退还金额", name = "returnPrice")
private Integer returnPrice;
+ @io.swagger.annotations.ApiModelProperty(value = "商铺信息", name = "shopInfo")
+ private String shopInfo;
+
+ public String getShopInfo() {
+ return shopInfo;
+ }
+
+ public void setShopInfo(String shopInfo) {
+ this.shopInfo = shopInfo;
+ }
+
public Date getStarttime() {
return starttime;
}
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
index c80e08712..fbae7c59b 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
@@ -450,7 +450,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
JSONObject rentInfoObject = rentInfoArray.getJSONObject(i);
shopInfo.put(rentInfoObject.getString("shopNumber"), rentInfoObject.get("deposit"));
}
-
+ wxBillDeposit.setShopInfo(JSONObject.toJSONString(shopInfo));
}
try {
wxBillDepositMapper.insertSelective(wxBillDeposit);
diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml
index 1885f39a5..a657487f4 100644
--- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml
@@ -21,13 +21,14 @@
+
`id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,
`pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,
- `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`
+ `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info`
@@ -69,7 +70,8 @@
select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate,
br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`,
br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`,
- br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,br.`return_price` returnPrice
+ br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,br.`return_price` returnPrice,br.`shop_info`
+ shopInfo
from wx_bill_property_deposit br left join wx_merchant m on br.merchant_id=m.id
left join wx_shop s on br.shop_id=s.id
diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
index 01deb3916..843c72541 100644
--- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
@@ -26,6 +26,7 @@
+
@@ -33,7 +34,7 @@
`id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,
`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,
- `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`
+ `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`
@@ -84,7 +85,7 @@
else
FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe) end latePayPrice,
(select max(period) from wx_bill_property where property_contract_id=br.property_contract_id)
- allPeriod,d.`status` depositStatus
+ allPeriod,d.`status` depositStatus,br.`shop_info` shopInfo
from wx_bill_property br left join wx_merchant m on br.merchant_id=m.id
left join wx_shop s on br.shop_id=s.id
left join wx_bill_property_deposit d on br.property_contract_id=d.property_contract_id