| @@ -175,6 +175,8 @@ public class WxFinanceReceive extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<WxBillPayWay> payWays; | private List<WxBillPayWay> payWays; | ||||
| @TableField(exist = false) | |||||
| private String usePerson; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String shopNumber; | private String shopNumber; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @@ -13,6 +13,7 @@ import com.iformall.domain.po.WxAllBill; | |||||
| import com.iformall.domain.po.WxEnergyFees; | import com.iformall.domain.po.WxEnergyFees; | ||||
| import com.iformall.domain.po.WxFinanceReceive; | import com.iformall.domain.po.WxFinanceReceive; | ||||
| import com.iformall.domain.po.WxMerchant; | import com.iformall.domain.po.WxMerchant; | ||||
| import com.iformall.enums.EnumYesOrNo; | |||||
| import com.iformall.print.data.PrintDataParser; | import com.iformall.print.data.PrintDataParser; | ||||
| import com.iformall.utils.DateUtils; | import com.iformall.utils.DateUtils; | ||||
| import com.iformall.utils.PriceUtilV2; | import com.iformall.utils.PriceUtilV2; | ||||
| @@ -69,10 +70,17 @@ public class PrintFinanceReceiveDataHandler implements PrintDataParser{ | |||||
| if (null != merchantMap) { | if (null != merchantMap) { | ||||
| WxMerchant m = merchantMap.get(receive.getMerchantId()); | WxMerchant m = merchantMap.get(receive.getMerchantId()); | ||||
| if (null != m) { | if (null != m) { | ||||
| return m.getName(); | |||||
| //如果商户是私密的,则不返回 | |||||
| if (m.getIsPrivate() == EnumYesOrNo.YES.getCode()) { | |||||
| return ""; | |||||
| }else { | |||||
| return m.getName(); | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| return ""; | return ""; | ||||
| }else if (name.equals("usePerson")) { | |||||
| return receive.getUsePerson(); | |||||
| }else if (name.equals("shopNumber")) { | }else if (name.equals("shopNumber")) { | ||||
| return receive.getShopNumber(); | return receive.getShopNumber(); | ||||
| } | } | ||||
| @@ -230,4 +230,6 @@ public interface WxMerchantService { | |||||
| Map<Long,WxMerchant> getShopMerchantMap(WxShop wxShop); | Map<Long,WxMerchant> getShopMerchantMap(WxShop wxShop); | ||||
| List<Long> getShopMerchantIds(WxShop wxShop); | List<Long> getShopMerchantIds(WxShop wxShop); | ||||
| String getPrivateMerchantUser(Long merchantId); | |||||
| } | } | ||||
| @@ -257,6 +257,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { | |||||
| JSONArray items = o.getJSONArray("tempItems"); | JSONArray items = o.getJSONArray("tempItems"); | ||||
| EnumFinancePrintDataType printDatatype = EnumFinancePrintDataType.getEnum(template.getType()); | EnumFinancePrintDataType printDatatype = EnumFinancePrintDataType.getEnum(template.getType()); | ||||
| WxMerchant mq = new WxMerchant(); | WxMerchant mq = new WxMerchant(); | ||||
| mq.setIsDel(EnumYesOrNo.NO.getCode()); | |||||
| mq.setTenantId(tenantId); | mq.setTenantId(tenantId); | ||||
| Map<Long,WxMerchant> merchantMap = wxMerchantService.findMerchantMap(mq); | Map<Long,WxMerchant> merchantMap = wxMerchantService.findMerchantMap(mq); | ||||
| WxEnergyFees feq = new WxEnergyFees(); | WxEnergyFees feq = new WxEnergyFees(); | ||||
| @@ -283,6 +284,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { | |||||
| }else { | }else { | ||||
| re.setShopNumber(""); | re.setShopNumber(""); | ||||
| } | } | ||||
| //私密的查询业主和租户 | |||||
| if (null != re.getMerchantId()) { | |||||
| re.setUsePerson(wxMerchantService.getPrivateMerchantUser(re.getMerchantId())); | |||||
| } | |||||
| List<WxFinanceReceiveBill> rbills = wxFinanceService.getReceiveBills(rb); | List<WxFinanceReceiveBill> rbills = wxFinanceService.getReceiveBills(rb); | ||||
| PrintVo vo = handleComponentData(re.getId(),templateId,o,items, printFinanceReceiveDataHandler,re,printReceiveBillDataHandler, rbills,merchantMap,feesMap,shopNumber); | PrintVo vo = handleComponentData(re.getId(),templateId,o,items, printFinanceReceiveDataHandler,re,printReceiveBillDataHandler, rbills,merchantMap,feesMap,shopNumber); | ||||
| if (null != vo) { | if (null != vo) { | ||||
| @@ -59,6 +59,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| @Autowired | @Autowired | ||||
| WxShopMapper wxShopMapper; | WxShopMapper wxShopMapper; | ||||
| @Autowired | |||||
| WxShopUsersMapper wxShopUsersMapper; | |||||
| @Autowired | @Autowired | ||||
| WxMerchantShopMapper wxMerchantShopMapper; | WxMerchantShopMapper wxMerchantShopMapper; | ||||
| @@ -2114,7 +2117,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| Map<Long,WxMerchant> merchantMap = new HashMap<>(); | Map<Long,WxMerchant> merchantMap = new HashMap<>(); | ||||
| List<WxMerchant> list = this.findList(merchantQ); | List<WxMerchant> list = this.findList(merchantQ); | ||||
| if(!list.isEmpty()){ | if(!list.isEmpty()){ | ||||
| merchantMap = list.stream().collect(Collectors.toMap(WxMerchant::getId, Function.identity())); | |||||
| for (int i = 0 ; i < list.size(); i++ ){ | |||||
| WxMerchant m = list.get(i); | |||||
| merchantMap.put(m.getId(), m); | |||||
| } | |||||
| } | } | ||||
| return merchantMap; | return merchantMap; | ||||
| } | } | ||||
| @@ -2390,4 +2396,31 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| merchantShopQ.setIsDel(0); | merchantShopQ.setIsDel(0); | ||||
| return wxMerchantShopMapper.findMerchantIdList(merchantShopQ); | return wxMerchantShopMapper.findMerchantIdList(merchantShopQ); | ||||
| } | } | ||||
| @Override | |||||
| public String getPrivateMerchantUser(Long merchantId) { | |||||
| WxMerchant m = this.selectById(merchantId); | |||||
| if (null == m || m.getIsPrivate() != EnumYesOrNo.YES.getCode()){ | |||||
| return null; | |||||
| } | |||||
| WxMerchantShop merchantShopQ = new WxMerchantShop(); | |||||
| merchantShopQ.updateTenantInfo(m); | |||||
| merchantShopQ.setMerchantId(merchantId); | |||||
| merchantShopQ.setIsDel(0); | |||||
| List<WxMerchantShop> merchantShopList = wxMerchantShopMapper.findList(merchantShopQ); | |||||
| if (null == merchantShopList || merchantShopList.size() <= 0 ) { | |||||
| return null; | |||||
| } | |||||
| WxMerchantShop ms = merchantShopList.get(0); | |||||
| WxShopUsers suq = new WxShopUsers(); | |||||
| suq.updateTenantInfo(m); | |||||
| suq.setShopId(ms.getShopId()); | |||||
| suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); | |||||
| suq.setSortColumn(" type desc"); | |||||
| List<WxShopUsers> userList = wxShopUsersMapper.findList(suq); | |||||
| if (null == userList || userList.size() <= 0 ){ | |||||
| return null; | |||||
| } | |||||
| return userList.get(0).getName(); | |||||
| } | |||||
| } | } | ||||
| @@ -370,7 +370,7 @@ public class WxShopServiceImpl implements WxShopService { | |||||
| if (record.getType() == EnumRentShopType.XIZILOU.getCode()) { | if (record.getType() == EnumRentShopType.XIZILOU.getCode()) { | ||||
| WxMerchant merchant = new WxMerchant(); | WxMerchant merchant = new WxMerchant(); | ||||
| merchant.updateTenantInfo(record); | merchant.updateTenantInfo(record); | ||||
| merchant.setName("[系统]"+record.getShopNumber()); | |||||
| merchant.setName("[系统房号]"+record.getShopNumber()); | |||||
| int count = wxMerchantMapper.hasMerchant(merchant); | int count = wxMerchantMapper.hasMerchant(merchant); | ||||
| if (count <= 0 ) { | if (count <= 0 ) { | ||||
| merchant.setId(idWorker.nextId()); | merchant.setId(idWorker.nextId()); | ||||