diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java index 31e6bfe83..baca5d37d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java @@ -172,12 +172,6 @@ public class WxFinanceReceive extends TenantEntity { @TableField(exist = false) private List payWays; - @TableField(exist = false) - private String usePerson; - @TableField(exist = false) - private String shopNumber; - @TableField(exist = false) - private String merchantName; @TableField(exist = false) private Long building; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxFinanceReceiveVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxFinanceReceiveVo.java index acc03214d..b2cba7810 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxFinanceReceiveVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxFinanceReceiveVo.java @@ -75,9 +75,6 @@ public class WxFinanceReceiveVo implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "moneyDetail", name = "moneyDetail") private String moneyDetail; - @io.swagger.annotations.ApiModelProperty(value = "merchantId", name = "merchantId") - private Long merchantId; - @io.swagger.annotations.ApiModelProperty(value = "remark", name = "remark") private String remark; @@ -86,8 +83,6 @@ public class WxFinanceReceiveVo implements Serializable { @TableField(exist = false) private String shopNumber; - @TableField(exist = false) - private String merchantName; @io.swagger.annotations.ApiModelProperty(value="receiveBillId",name="rid") private Long rid; @@ -153,11 +148,9 @@ public class WxFinanceReceiveVo implements Serializable { this.updateBy = receive.getUpdateBy(); this.updateByName = receive.getUpdateByName(); this.moneyDetail = receive.getMoneyDetail(); - this.merchantId = receive.getMerchantId(); this.remark = receive.getRemark(); this.isPrint = receive.getIsPrint(); this.isFinish = receive.getIsFinish(); - this.merchantName = receive.getMerchantName(); this.payMoney = receive.getPayMoney(); this.receiveDate = receive.getReceiveDate(); this.rentName = receive.getRentName(); diff --git a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java index f0120d51e..8203e22fc 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java @@ -13,6 +13,8 @@ import com.iformall.domain.po.WxAllBill; import com.iformall.domain.po.WxEnergyFees; import com.iformall.domain.po.WxFinanceReceive; import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.WxShop; +import com.iformall.domain.po.WxShopUsers; import com.iformall.enums.EnumYesOrNo; import com.iformall.print.data.PrintDataParser; import com.iformall.utils.DateUtils; @@ -30,8 +32,9 @@ public class PrintFinanceReceiveDataHandler implements PrintDataParser{ @Override public Object getObjectValue(String name, Object o, Object... params) { - Map merchantMap = (Map) params[0]; + Map shopMap = (Map) params[0]; Map feesMap = (Map) params[1]; + Map shopUserMap = (Map) params[2]; WxFinanceReceive receive = (WxFinanceReceive) o; if (name.equals("id")) { return receive.getId(); @@ -63,26 +66,6 @@ public class PrintFinanceReceiveDataHandler implements PrintDataParser{ return receive.getMoneyDetail(); }else if (name.equals("remark")) { return receive.getRemark(); - }else if (name.equals("merchantId") || name.equals("merchantName")) { - if (StringUtils.isNotBlank(receive.getMerchantName())) { - return receive.getMerchantName(); - } - if (null != merchantMap) { - WxMerchant m = merchantMap.get(receive.getMerchantId()); - if (null != m) { - //如果商户是私密的,则不返回 - if (m.getIsPrivate() == EnumYesOrNo.YES.getCode()) { - return ""; - }else { - return m.getName(); - } - } - } - return ""; - }else if (name.equals("usePerson")) { - return receive.getUsePerson(); - }else if (name.equals("shopNumber")) { - return receive.getShopNumber(); } return null; } diff --git a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java index df3ef5dc6..159fc8303 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java @@ -9,6 +9,8 @@ import com.iformall.domain.po.WxAllBill; import com.iformall.domain.po.WxEnergyFees; import com.iformall.domain.po.WxFinanceReceive; import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.WxShop; +import com.iformall.domain.po.WxShopUsers; import com.iformall.domain.vo.WxShopBillVo; import com.iformall.print.data.PrintDataParser; import com.iformall.utils.DateUtils; @@ -18,9 +20,9 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{ @Override public Object getObjectValue(String name, Object o,Object... params) { - Map merchantMap = (Map) params[0]; + Map shopMap = (Map) params[0]; Map feesMap = (Map) params[1]; - Map shopNumber = (Map) params[2]; + Map shopUserMap = (Map) params[2]; WxShopBillVo receive = (WxShopBillVo) o; //根据科目来查询对应的信息 if (name.equals("maxDate")) { @@ -41,8 +43,6 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{ return receive.getNeedPayChinese(); }else if (name.equals("shopNumber")) { return receive.getShopNumber(); - }else if (name.equals("merchantName")) { - return receive.getMerchantName(); }else if (name.equals("rentArea")) { return receive.getRentArea(); }else if (name.equals("starttime")) { @@ -55,14 +55,6 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{ return receive.getMallBankAccountName(); }else if (name.equals("mallBankName")) { return receive.getMallBankName(); - }else if (name.equals("merchantId")) { - if (null != merchantMap) { - WxMerchant m = merchantMap.get(receive.getMerchantId()); - if (null != m) { - return m.getName(); - } - } - return ""; }else if (name.equals("cusName")) { return receive.getCusName(); }else if (name.equals("cusPhone")) { diff --git a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintReceiveBillDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintReceiveBillDataHandler.java index dbab44c3e..a9ab16075 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintReceiveBillDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintReceiveBillDataHandler.java @@ -62,23 +62,6 @@ public class PrintReceiveBillDataHandler implements PrintDataParser{ return DateUtils.date2String(receive.getEndtime(),DateUtils.DATE_PATTERN); } return ""; - }else if (name.equals("merchantName") || name.equals("merchantId")) { - if (null != merchantMap && null != receive.getMerchantId()) { - WxMerchant m = merchantMap.get(receive.getMerchantId()); - if (null != m) { - return m.getName(); - } - } - return ""; - }else if (name.equals("shopNumber")) { - if (StringUtils.isNotBlank(receive.getShopNumber())) { - return receive.getShopNumber(); - } - if (null != shopNumber && null != receive.getMerchantId()) { - String m = shopNumber.get(receive.getMerchantId()); - return m; - } - return ""; } return null; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java index beefb0504..8cc6fc2d1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -282,17 +282,8 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { WxFinanceReceiveBill rb = new WxFinanceReceiveBill(); rb.updateTenantInfo(re); rb.setReceiveId(re.getId()); - if (null != shopNumber && null != re.getMerchantId()) { - re.setShopNumber(shopNumber.get(re.getMerchantId())); - }else { - re.setShopNumber(""); - } - //私密的查询业主和租户 - if (null != re.getMerchantId()) { - re.setUsePerson(wxMerchantService.getPrivateMerchantUser(re.getMerchantId())); - } List 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,shopMap,feesMap,shopUserMap); if (null != vo) { voList.add(vo); } @@ -309,7 +300,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { List voList = new ArrayList(); for (int i = 0 ; i < billAllList.size(); i ++) { WxAllBill re = billAllList.get(i); - PrintVo vo = handleComponentData(re.getId(),templateId,o,items, printBillDataHandler,re,null, null,merchantMap,feesMap,shopNumber); + PrintVo vo = handleComponentData(re.getId(),templateId,o,items, printBillDataHandler,re,null, null,shopMap,feesMap,shopUserMap); if (null != vo) { voList.add(vo); } @@ -317,10 +308,11 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { return voList; }else if (printDatatype.getCode().intValue() == EnumFinancePrintDataType.RENT_OWE.getCode()) { WxShopBillVo bq = (WxShopBillVo) entity; - if (null != shopNumber && null != bq.getMerchantId()) { - bq.setShopNumber(shopNumber.get(bq.getMerchantId())); - }else { - bq.setShopNumber(""); + if (null != bq.getShopId()) { + WxShop shop = shopMap.get(bq.getShopId()); + if (null != shop) { + bq.setShopNumber(shop.getShopNumber()); + } } //打哪些科目 @@ -346,11 +338,11 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { bq.setPaid(payTotal.toPlainString()); bq.setOwe(oweTotal.toPlainString()); bq.setCurrentTime(new Date()); - if (null != merchantMap && null != bq.getMerchantId()) { - WxMerchant merchant = merchantMap.get(bq.getMerchantId()); - if (null != merchant) { - bq.setCusName(merchant.getLinkPerson()); - bq.setCusPhone(merchant.getLinkPhone()); + if (null != shopUserMap && null != bq.getShopId()) { + WxShopUsers su = shopUserMap.get(bq.getShopId()); + if (null != su) { + bq.setCusName(su.getName()); + bq.setCusPhone(su.getPhone()); }else { bq.setCusName(""); bq.setCusPhone(""); @@ -359,7 +351,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { bq.setCusName(""); bq.setCusPhone(""); } - PrintVo vo = handleComponentData(bq.getMerchantId(),templateId,o,items, printMerchantSettleDataHandler,bq,printMerchantSettleItemDataHandler, sumlist,merchantMap,feesMap,shopNumber); + PrintVo vo = handleComponentData(bq.getShopId(),templateId,o,items, printMerchantSettleDataHandler,bq,printMerchantSettleItemDataHandler, sumlist,shopMap,feesMap,shopUserMap); if (null != vo) { voList.add(vo); }