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 cd1b1b014..3710393ac 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -227,6 +227,7 @@ public class WxAllBillController extends BillBaseController { vo.setMerchantId(m.getId()); vo.setMerchantName(m.getName()); vo.setShopNumber(billAllHelper.getMerchantShopNumber(m)); + vo.setRentArea(billAllHelper.getMerchantShopRentArea(m)); wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode()); if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java index e7aa89fc5..6c387bf3b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java @@ -26,6 +26,8 @@ public class WxMerchantBillVo implements Serializable { @Excel(name = "商铺号", width = 20, orderNum = "3") @TableField(exist = false) private String shopNumber; + @TableField(exist = false) + private String rentArea; private String needPay; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxShopVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxShopVo.java index 61ff98b0a..6f785f82e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxShopVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxShopVo.java @@ -41,4 +41,8 @@ public class WxShopVo extends WxShop { @io.swagger.annotations.ApiModelProperty(value="经营业态",name="business") @Excel(name="经营业态",width = 20,orderNum = "9") private String business; + + @io.swagger.annotations.ApiModelProperty(value="计租面积",name="operationArea") + @Excel(name="计租面积",width = 20,orderNum = "13") + private String operationArea; } 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 3f9860664..90757771a 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 @@ -43,6 +43,8 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{ return receive.getShopNumber(); }else if (name.equals("merchantName")) { return receive.getMerchantName(); + }else if (name.equals("rentArea")) { + return receive.getRentArea(); }else if (name.equals("merchantId")) { if (null != merchantMap) { WxMerchant m = merchantMap.get(receive.getMerchantId()); diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java index 54403b316..7dd8595c2 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -196,6 +196,21 @@ public class WxBillAllHelper { return null; } + public String getMerchantShopRentArea(WxMerchant merchant) { + List shopList = wxShopService.findMerchantShopVoList(merchant, merchant.getId()); + if (null != shopList && shopList.size() > 0 ) { + BigDecimal rs = new BigDecimal(0); + for (int i = 0 ; i < shopList.size() ; i ++) { + WxShopVo v = shopList.get(i); + if (null != v.getOperationArea()) { + rs = rs.add(new BigDecimal(v.getOperationArea())); + } + } + return rs.toPlainString(); + } + return "0"; + } + public List getOwdMerchantIds(WxMerchant wxMerchant,Date starttime, Date enttime) { WxAllBill br = new WxAllBill(); updateQueryParm(wxMerchant, br,starttime,enttime); diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index ce93b90d3..e709aad93 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -650,7 +650,7 @@