| @@ -104,6 +104,18 @@ public class WxBillDeposit implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "退还金额", name = "returnPrice") | @io.swagger.annotations.ApiModelProperty(value = "退还金额", name = "returnPrice") | ||||
| private Integer 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() { | public Date getStarttime() { | ||||
| return starttime; | return starttime; | ||||
| } | } | ||||
| @@ -119,6 +119,17 @@ public class WxBillProperty implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "预览账单0否1是", name = "isPreview") | @io.swagger.annotations.ApiModelProperty(value = "预览账单0否1是", name = "isPreview") | ||||
| private Integer 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() { | public Integer getIsPreview() { | ||||
| return isPreview; | return isPreview; | ||||
| } | } | ||||
| @@ -104,6 +104,17 @@ public class WxBillPropertyDeposit implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "退还金额", name = "returnPrice") | @io.swagger.annotations.ApiModelProperty(value = "退还金额", name = "returnPrice") | ||||
| private Integer 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() { | public Date getStarttime() { | ||||
| return starttime; | return starttime; | ||||
| } | } | ||||
| @@ -450,7 +450,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); | JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); | ||||
| shopInfo.put(rentInfoObject.getString("shopNumber"), rentInfoObject.get("deposit")); | shopInfo.put(rentInfoObject.getString("shopNumber"), rentInfoObject.get("deposit")); | ||||
| } | } | ||||
| wxBillDeposit.setShopInfo(JSONObject.toJSONString(shopInfo)); | |||||
| } | } | ||||
| try { | try { | ||||
| wxBillDepositMapper.insertSelective(wxBillDeposit); | wxBillDepositMapper.insertSelective(wxBillDeposit); | ||||
| @@ -21,13 +21,14 @@ | |||||
| <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" /> | <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" /> | ||||
| <result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> | <result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> | ||||
| <result column="return_price" jdbcType="INTEGER" property="returnPrice"/> | <result column="return_price" jdbcType="INTEGER" property="returnPrice"/> | ||||
| <result column="shop_info" jdbcType="VARCHAR" property="shopInfo"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`, | `id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`, | ||||
| `pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, | `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` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -69,7 +70,8 @@ | |||||
| select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, | 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.`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.`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 | 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 | left join wx_shop s on br.shop_id=s.id | ||||
| <where> | <where> | ||||
| @@ -26,6 +26,7 @@ | |||||
| <result column="late_pay_price" jdbcType="INTEGER" property="latePayPrice"/> | <result column="late_pay_price" jdbcType="INTEGER" property="latePayPrice"/> | ||||
| <result column="period" jdbcType="INTEGER" property="period"/> | <result column="period" jdbcType="INTEGER" property="period"/> | ||||
| <result column="is_preview" property="isPreview"/> | <result column="is_preview" property="isPreview"/> | ||||
| <result column="shop_info" jdbcType="VARCHAR" property="shopInfo"/> | |||||
| </resultMap> | </resultMap> | ||||
| @@ -33,7 +34,7 @@ | |||||
| `id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, | `id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, | ||||
| `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, | `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, | ||||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, | `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` | |||||
| </sql> | </sql> | ||||
| @@ -84,7 +85,7 @@ | |||||
| else | else | ||||
| FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe) end latePayPrice, | 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) | (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 | 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_shop s on br.shop_id=s.id | ||||
| left join wx_bill_property_deposit d on br.property_contract_id=d.property_contract_id | left join wx_bill_property_deposit d on br.property_contract_id=d.property_contract_id | ||||