diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index 03f44630b..992eca464 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -19,6 +19,8 @@ import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxEnergyFees; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxPayAccountBill; +import com.iformall.domain.po.WxShop; +import com.iformall.domain.po.WxShopUsers; import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxBillBad; @@ -32,6 +34,7 @@ import com.iformall.enums.EnumBillOweOrNearType; import com.iformall.enums.EnumBillStatus; import com.iformall.enums.EnumCouponType; import com.iformall.enums.EnumRentContractManageFeeType; +import com.iformall.enums.EnumShopUsersStatus; import com.iformall.enums.EnumYesOrNo; import com.iformall.service.ExcelService; import com.iformall.service.SysConfigService; @@ -684,11 +687,45 @@ public class WxAllBillController extends BillBaseController { } } be.setMerchantName(m.getName()); + be.setRentName(getBillRentName(be,m)); } } return new ResultData(list); } + private String getBillRentName(WxAllBill be,WxMerchant m) { + if (StringUtils.isNotBlank(be.getCusName())) { + return be.getCusName(); + }else { + //如果不是虚拟商户,则取商户的名称 + if (m.getIsPrivate() == EnumYesOrNo.NO.getCode()) { + return m.getName(); + }else { + if (StringUtils.isBlank(m.getCreateShopNumber())) { + return m.getName(); + } + WxShop shop = wxShopSerivce.getShopByShopNumber(m, m.getCreateShopNumber()) ; + if (null != shop ) { + //查询租户和业主 + WxShopUsers suq = new WxShopUsers(); + suq.updateTenantInfo(be); + suq.setShopId(shop.getId()); + suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); + suq.setSortColumns("type desc"); + WxShopUsers wsu = wxShopSerivce.getOneShopUsers(suq); + if (null != wsu) { + return wsu.getName(); + }else { + return m.getName(); + } + }else { + return m.getName(); + } + + } + } + } + //待支付给商户的账单 @GetMapping("toPaymerchantBills") public ResultData toPaymerchantBills(@ModelAttribute WxMerchant wxMerchant) { @@ -738,6 +775,7 @@ public class WxAllBillController extends BillBaseController { } } be.setMerchantName(m.getName()); + be.setRentName(getBillRentName(be,m)); } } return new ResultData(list); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java index b192ecd1b..21ffdb9b9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java @@ -287,6 +287,9 @@ public class WxAllBill extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "是否可以编辑", name = "canEdit") private Integer canEdit; + @io.swagger.annotations.ApiModelProperty(value = "客户名称(临时费用添加时设置)", name = "cusName") + private String cusName; + @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") @TableField(exist = false) public Long building; @@ -414,4 +417,6 @@ public class WxAllBill extends TenantEntity { private String merchantPhone; @TableField(exist = false) private String queryShopNumber; + @TableField(exist = false) + private String rentName; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 1e3fe5133..e18a47008 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -1217,6 +1217,14 @@ public class WxFinanceServiceImpl implements WxFinanceService { WxAllBill advanceBill = new WxAllBill(); advanceBill.updateTenantInfo(record); advanceBill.setMerchantId(merchant.getId()); + if (null != record.getShopId()) { + WxShop shop = wxShopService.getById(record.getShopId()); + if (null != shop) { + advanceBill.setShopNumber(shop.getShopNumber()); + advanceBill.setShopId(shop.getId()); + } + } + advanceBill.setNeedPay(record.getReceivePay()); advanceBill.setReceivePay(receivePay); advanceBill.setPay(pay); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index ccbf66caa..6e1033450 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -965,6 +965,7 @@ public class WxShopServiceImpl implements WxShopService { WxShop shopQ = new WxShop(); shopQ.updateTenantInfo(tenantEntity); shopQ.setQueryShopNumber(shopNumber); + shopQ.setIsDel(EnumYesOrNo.NO.getCode()); List shopList = wxShopMapper.findList(shopQ); if (null != shopList && shopList.size() > 0 ) { return shopList.get(0); diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index c56db72cc..dba1f6be1 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -47,6 +47,7 @@ + @@ -54,7 +55,7 @@ `price_detail`,`need_pay`,`receive_pay`,`pay`,`bill_type`,`pay_way`,`pay_date`,`set_off`,`use_money`,`starttime`,`endtime`,`status`,`energy_fees_id`,`return_pay`, `bill_remark`,`last_owe_call_time`,`last_owe_call_user`,`bussiness_manage_fee_need_pay`,`operating_manage_fee_need_pay`,`shop_id`,`shop_number`,`receive_date`,`period`, `is_preview`,`shop_info`,`rent_contract_id`,`rent_contract_agile_fees_type`,`property_contract_id`,`parent_bill_id`,`energy_reading_calcuteId`,`energy_reading_id`,`extra_create_from`,`rent_area`, - `can_edit` + `can_edit`,`cus_name` @@ -364,7 +365,7 @@ #{item.starttime},#{item.endtime},#{item.status},#{item.energyFeesId},#{item.returnPay},#{item.billRemark}, #{item.lastOweCallTime},#{item.lastOweCallUser},#{item.bussinessManageFeeNeedPay},#{item.operatingManageFeeNeedPay}, #{item.shopId},#{item.shopNumber},#{item.receiveDate},#{item.period},#{item.isPreview},#{item.shopInfo},#{item.rentContractId},#{item.rentContractAgileFeesType},#{item.propertyContractId}, - #{item.parentBillId},#{item.energyReadingCalcuteId},#{item.energyReadingId},#{item.extraCreateFrom},#{item.rentArea},#{item.canEdit} + #{item.parentBillId},#{item.energyReadingCalcuteId},#{item.energyReadingId},#{item.extraCreateFrom},#{item.rentArea},#{item.canEdit},#{item.cusName} )