| @@ -697,7 +697,7 @@ public class WxAllBillController extends BillBaseController { | |||||
| wxShop.setNeedPayNoDays(EnumYesOrNo.YES.getCode()); | wxShop.setNeedPayNoDays(EnumYesOrNo.YES.getCode()); | ||||
| WxShop shop = wxShopSerivce.getById(wxShop.getId()); | 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); | List<WxAllBill> list = billAllHelper.getMerchantBillList(wxShop); | ||||
| if (null != list && list.size() > 0 ) { | if (null != list && list.size() > 0 ) { | ||||
| @@ -713,8 +713,8 @@ public class WxAllBillController extends BillBaseController { | |||||
| be.setEnergyFeesName(fees.getName()); | 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); | List<WxAllBill> list = billAllHelper.getMerchantBillList(wxShop); | ||||
| WxShop shop = wxShopSerivce.getById(wxShop.getId()); | 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 ) { | if (null != list && list.size() > 0 ) { | ||||
| WxEnergyFees fq = new WxEnergyFees(); | WxEnergyFees fq = new WxEnergyFees(); | ||||
| fq.updateTenantInfo(shop); | fq.updateTenantInfo(shop); | ||||
| @@ -761,8 +761,8 @@ public class WxAllBillController extends BillBaseController { | |||||
| be.setEnergyFeesName(fees.getName()); | be.setEnergyFeesName(fees.getName()); | ||||
| } | } | ||||
| } | } | ||||
| if (null != shopUser) { | |||||
| be.setRentName(shopUser.getName()); | |||||
| if (null != shopUser && StringUtils.isBlank(be.getCusName())) { | |||||
| be.setCusName(shopUser.getName()); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -149,7 +149,7 @@ public interface WxShopService { | |||||
| List<Long> getUserShopIds(WxShopUsers wxShopUsers); | List<Long> getUserShopIds(WxShopUsers wxShopUsers); | ||||
| Map<Long,WxShopUsers> getShopUserMap(WxShopUsers wxShopUsers); | Map<Long,WxShopUsers> getShopUserMap(WxShopUsers wxShopUsers); | ||||
| WxShopUsersInfo getCurrentShopUser(TenantEntity tenantEntity,Long shopId); | |||||
| WxShopUsers getCurrentShopUser(TenantEntity tenantEntity,Long shopId); | |||||
| List<Long> getFloorBuildShopIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer shopDel ,String shopNumber) ; | List<Long> getFloorBuildShopIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer shopDel ,String shopNumber) ; | ||||
| @@ -287,7 +287,7 @@ public class WxBillAllHelper { | |||||
| if (null != shop) { | if (null != shop) { | ||||
| result.put("shopNumber", shop.getShopNumber()); | result.put("shopNumber", shop.getShopNumber()); | ||||
| } | } | ||||
| WxShopUsersInfo su = wxShopService.getCurrentShopUser(bill, bill.getShopId()); | |||||
| WxShopUsers su = wxShopService.getCurrentShopUser(bill, bill.getShopId()); | |||||
| if (null != su) { | if (null != su) { | ||||
| result.put("merchantName", su.getName()); | result.put("merchantName", su.getName()); | ||||
| result.put("linkPerson", su.getLinkPerson()); | result.put("linkPerson", su.getLinkPerson()); | ||||
| @@ -1191,17 +1191,19 @@ public class WxShopServiceImpl implements WxShopService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public WxShopUsersInfo getCurrentShopUser(TenantEntity tenantEntity, Long shopId) { | |||||
| WxShopUsersInfo suq = new WxShopUsersInfo(); | |||||
| public WxShopUsers getCurrentShopUser(TenantEntity tenantEntity, Long shopId) { | |||||
| WxShopUsers suq = new WxShopUsers(); | |||||
| suq.updateTenantInfo(tenantEntity); | suq.updateTenantInfo(tenantEntity); | ||||
| suq.setShopId(shopId); | suq.setShopId(shopId); | ||||
| suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); | suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); | ||||
| suq.setSortColumn("type desc"); | suq.setSortColumn("type desc"); | ||||
| List<WxShopUsersInfo> list = wxShopUsersMapper.findList(suq); | |||||
| List<WxShopUsers> list = wxShopUsersMapper.findList(suq); | |||||
| if (null == list || list.size() <= 0 ) { | if (null == list || list.size() <= 0 ) { | ||||
| return null; | return null; | ||||
| }; | }; | ||||
| return list.get(0); | |||||
| WxShopUsers wsu = list.get(0); | |||||
| this.setShopUserProperty(wsu); | |||||
| return wsu; | |||||
| } | } | ||||
| @Override | @Override | ||||