diff --git a/mallinkAdmin/src/main/resources/db/migration/V202103190001__wx_bill_rent.sql b/mallinkAdmin/src/main/resources/db/migration/V202103190001__wx_bill_rent.sql new file mode 100644 index 000000000..5e73547f8 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V202103190001__wx_bill_rent.sql @@ -0,0 +1,23 @@ + + +ALTER TABLE `wx_bill_rent` +ADD COLUMN `contract_need_pay` bigint(12) COMMENT '原合同应收金额' AFTER `is_del`, +ADD COLUMN `rent_price_info` json COMMENT '合同应收明细' AFTER `contract_need_pay`; + + + + + + + + + + +ALTER TABLE `wx_bill_daily` +ADD COLUMN `shop_name` varchar(500) COMMENT '商铺编号' AFTER `shop_id`; + +ALTER TABLE `wx_bill_other` +ADD COLUMN `shop_name` varchar(500) COMMENT '商铺' AFTER `shop_id`; + +ALTER TABLE `wx_bill_other_deposit` +ADD COLUMN `shop_name` varchar(500) COMMENT '商铺' AFTER `shop_id`; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index 35411a06e..4d185f1d6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -65,6 +65,8 @@ public class WxBillDaily extends TenantEntity { private Long userId; @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") private Long shopId; + @io.swagger.annotations.ApiModelProperty(value="商铺",name="shopName") + private String shopName; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; @@ -92,10 +94,7 @@ public class WxBillDaily extends TenantEntity { private Integer period; @TableField(exist = false) - private String shopNumber; - - @TableField(exist = false) - private List> shops; + private WxMerchant merchant; @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") private Date starttime; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index 93ba7be84..0af0b5520 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -93,8 +93,7 @@ public class WxBillOther extends TenantEntity { private Integer period; @Excel(name = "商铺号", width = 20, orderNum = "1") - @TableField(exist = false) - private String shopNumber; + private String shopName; @TableField(exist = false) private String receivePayStr; @@ -125,7 +124,9 @@ public class WxBillOther extends TenantEntity { } @TableField(exist = false) - private List> shops; + private WxMerchant merchant; + + @io.swagger.annotations.ApiModelProperty(value = "冻结状态,0正常1冻结", name = "freeze") private Integer freeze; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index d426b09c2..c19072902 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -96,8 +96,7 @@ public class WxBillOtherDeposit extends TenantEntity { private Integer period; @Excel(name = "商铺号", width = 20, orderNum = "1") - @TableField(exist = false) - private String shopNumber; + private String shopName; @TableField(exist = false) @@ -125,6 +124,10 @@ public class WxBillOtherDeposit extends TenantEntity { @TableField(exist = false) @Excel(name = "退款日", orderNum = "7", width = 20, format = "yyyy-MM-dd") private Date returnDate; + + @TableField(exist = false) + private WxMerchant merchant; + @TableField(exist = false) private List> shops; 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 dcac97cef..4cd359f94 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -200,4 +200,14 @@ public class WxBillProperty extends TenantEntity { public String getRealReceivePayStr() { return new BigDecimal(realReceivePay == null ? 0 : realReceivePay).divide(new BigDecimal(100)).toPlainString(); } + + + + @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") + @TableField(exist = false) + private Long building; + + @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") + @TableField(exist = false) + private Long floor; } 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 363f1be7d..7247e8dc0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -85,6 +85,12 @@ public class WxBillRent extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel") private Integer isDel; + @io.swagger.annotations.ApiModelProperty(value="原合同应收金额",name="contractNeedPay") + private Long contractNeedPay; + + @io.swagger.annotations.ApiModelProperty(value = "合同应收明细", name = "rentPriceInfo") + private String rentPriceInfo; + @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") private Long needPay; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 9ad10b407..b0a3a09f8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -13,6 +13,7 @@ import com.iformall.domain.vo.WxBillDailyVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillDailyMapper; +import com.iformall.mapper.WxMerchantMapper; import com.iformall.mapper.WxMerchantShopMapper; import com.iformall.mapper.WxShopMapper; import com.iformall.service.ExcelService; @@ -55,6 +56,8 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { @Autowired WxMerchantShopMapper wxMerchantShopMapper; @Autowired + WxMerchantMapper wxMerchantMapper; + @Autowired WxPayAccountBillService wxPayAccountBillService; @Override @@ -145,14 +148,15 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillDaily); computeTotalMoney(wxPayAccountBill, wxBillDaily); wxBillDaily.setOwe(wxBillDaily.getRealReceivePay() - wxBillDaily.getPay()); - if (wxBillDaily.getShopId() != null) { - WxShop shop = new WxShop(); - shop.setId(wxBillDaily.getShopId()); - List> shoplist = wxShopMapper.findListMap(shop); - wxBillDaily.setShops(shoplist); - }else{ - wxBillDaily.setShops(Collections.EMPTY_LIST); - } + wxBillDaily.setMerchant(wxMerchantMapper.selectById(wxBillDaily.getMerchantId())); +// if (wxBillDaily.getShopId() != null) { +// WxShop shop = new WxShop(); +// shop.setId(wxBillDaily.getShopId()); +// List> shoplist = wxShopMapper.findListMap(shop); +// wxBillDaily.setShops(shoplist); +// }else{ +// wxBillDaily.setShops(Collections.EMPTY_LIST); +// } return wxBillDaily; } @@ -377,7 +381,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { for (int i = 0, size = billDailyList.size(); i < size; i++) { WxBillDaily b = billDailyList.get(i); wxBillDailyExportVo = new WxBillDailyExportVo(); - wxBillDailyExportVo.setShopNumber(b.getShopNumber()); + wxBillDailyExportVo.setShopNumber(b.getShopName()); wxBillDailyExportVo.setMerchantName(b.getMerchantName()); wxBillDailyExportVo.setReceivePay(b.getRealReceivePay()); wxBillDailyExportVo.setPay(b.getPay()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index ba44257fa..014ebb89e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.*; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillOtherDepositMapper; +import com.iformall.mapper.WxMerchantMapper; import com.iformall.mapper.WxShopMapper; import com.iformall.service.ExcelService; import com.iformall.service.WxBillActionService; @@ -41,6 +42,9 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService @Autowired WxShopMapper wxShopMapper; + @Autowired + WxMerchantMapper wxMerchantMapper; + @Autowired WxBillActionService wxBillActionService; @@ -133,14 +137,15 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillOther); computeTotalMoney(wxPayAccountBill, wxBillOther); wxBillOther.setOwe(wxBillOther.getRealReceivePay() - wxBillOther.getPay()); - if (wxBillOther.getShopId() != null) { - WxShop shop = new WxShop(); - shop.setId(wxBillOther.getShopId()); - List> shoplist = wxShopMapper.findListMap(shop); - wxBillOther.setShops(shoplist); - } else { - wxBillOther.setShops(Collections.EMPTY_LIST); - } + wxBillOther.setMerchant(wxMerchantMapper.selectById(wxBillOther.getMerchantId())); +// if (wxBillOther.getShopId() != null) { +// WxShop shop = new WxShop(); +// shop.setId(wxBillOther.getShopId()); +// List> shoplist = wxShopMapper.findListMap(shop); +// wxBillOther.setShops(shoplist); +// } else { +// wxBillOther.setShops(Collections.EMPTY_LIST); +// } return wxBillOther; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index b7d8c6b97..8fe040f62 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.*; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillOtherMapper; +import com.iformall.mapper.WxMerchantMapper; import com.iformall.mapper.WxShopMapper; import com.iformall.service.ExcelService; import com.iformall.service.WxBillActionService; @@ -41,6 +42,9 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { @Autowired WxShopMapper wxShopMapper; + @Autowired + WxMerchantMapper wxMerchantMapper; + @Autowired WxBillActionService wxBillActionService; @@ -133,14 +137,15 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillOther); computeTotalMoney(wxPayAccountBill, wxBillOther); wxBillOther.setOwe(wxBillOther.getRealReceivePay() - wxBillOther.getPay()); - if (wxBillOther.getShopId() != null) { - WxShop shop = new WxShop(); - shop.setId(wxBillOther.getShopId()); - List> shoplist = wxShopMapper.findListMap(shop); - wxBillOther.setShops(shoplist); - }else{ - wxBillOther.setShops(Collections.EMPTY_LIST); - } + wxBillOther.setMerchant(wxMerchantMapper.selectById(wxBillOther.getMerchantId())); +// if (wxBillOther.getShopId() != null) { +// WxShop shop = new WxShop(); +// shop.setId(wxBillOther.getShopId()); +// List> shoplist = wxShopMapper.findListMap(shop); +// wxBillOther.setShops(shoplist); +// }else{ +// wxBillOther.setShops(Collections.EMPTY_LIST); +// } return wxBillOther; } diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 6d535ee39..70097b56e 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -17,14 +17,13 @@ + - - @@ -34,7 +33,7 @@ `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, - `tenant_id`,`parent_tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`type`, + `tenant_id`,`parent_tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`type`, `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay @@ -57,8 +56,7 @@ and `status` = #{status} and `is_del` = #{isDel} and `merchant_id` = #{merchantId} - and `user_id` = #{userId} - and `shop_id` = #{shopId} + and `user_id` = #{userId} and `updatetime` = #{updatetime} and `type` = #{type} and `rent_shop_type` = #{rentShopType} @@ -81,11 +79,10 @@ select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`, br.`pay_date`,br.`createtime`,br.`expired_day`, case when br.status=1 then br.owe else 0 end owe,br.`status`,m.`name` - merchant_name,s.shop_number,br.`updatetime`, + merchant_name,br.shop_name,br.`updatetime`, br.`merchant_id`,br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way, br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay from wx_bill_other br left join wx_merchant m on br.merchant_id=m.id - left join wx_shop s on br.shop_id=s.id and br.`id` = #{id} and br.`freeze` = #{freeze} diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 4a08b6765..1d28579a8 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -15,6 +15,8 @@ + + @@ -53,7 +55,7 @@ `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, - `createtime`,`expired_day`,`owe`,`status`,`is_del`,`need_pay`, + `createtime`,`expired_day`,`owe`,`status`,`is_del`,`contract_need_pay`,`rent_price_info`,`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`,`shop_info`, `pay_way`,`late_pay_status`,`comments`,starttime,endtime,bus_discount_ratio,freeze,join_rent_price,service_charge_pay @@ -106,7 +108,7 @@