|
|
|
@@ -697,7 +697,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
wxShop.setNeedPayNoDays(EnumYesOrNo.YES.getCode()); |
|
|
|
|
|
|
|
WxShop shop = wxShopSerivce.getById(wxShop.getId()); |
|
|
|
WxShopUsersInfo shopUser = wxShopSerivce.getCurrentShopUser(shop, shop.getId()); |
|
|
|
WxShopUsers shopUser = wxShopSerivce.getCurrentShopUser(shop, shop.getId()); |
|
|
|
|
|
|
|
List<WxAllBill> list = billAllHelper.getMerchantBillList(wxShop); |
|
|
|
if (null != list && list.size() > 0 ) { |
|
|
|
@@ -713,8 +713,8 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
be.setEnergyFeesName(fees.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (null != shopUser) { |
|
|
|
be.setRentName(shopUser.getName()); |
|
|
|
if (null != shopUser && StringUtils.isBlank(be.getCusName())) { |
|
|
|
be.setCusName(shopUser.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@@ -747,7 +747,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
} |
|
|
|
List<WxAllBill> list = billAllHelper.getMerchantBillList(wxShop); |
|
|
|
WxShop shop = wxShopSerivce.getById(wxShop.getId()); |
|
|
|
WxShopUsersInfo shopUser = wxShopSerivce.getCurrentShopUser(shop, shop.getId()); |
|
|
|
WxShopUsers shopUser = wxShopSerivce.getCurrentShopUser(shop, shop.getId()); |
|
|
|
if (null != list && list.size() > 0 ) { |
|
|
|
WxEnergyFees fq = new WxEnergyFees(); |
|
|
|
fq.updateTenantInfo(shop); |
|
|
|
@@ -761,8 +761,8 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
be.setEnergyFeesName(fees.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (null != shopUser) { |
|
|
|
be.setRentName(shopUser.getName()); |
|
|
|
if (null != shopUser && StringUtils.isBlank(be.getCusName())) { |
|
|
|
be.setCusName(shopUser.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|