diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java index 79627d91c..b3a8f5926 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumChartType; import com.iformall.service.WxChartDataService; @@ -73,13 +74,19 @@ public class WxChartDataController extends BaseController { @ApiImplicitParam(name = "startdate", value = "startdate", dataType = "String", paramType = "query"), @ApiImplicitParam(name = "enddate", value = "enddate", dataType = "String", paramType = "query") }) - @SystemControllerLog(description = "报表-图表") public ResultData queryData(@RequestParam Map params) { String chart = params.get("chart"); logger.info("[" + getIpAddr() + "] WxChartDataController::queryData chart: " + chart); TenantEntity tenantEntity = getTenantInfo(); params.put("tenantId",tenantEntity.getTenantId()); params.put("parentTenantId", tenantEntity.getParentTenantId()); + + WxUserDataRule dr = this.getCurrentDataFloors(); + if (null != dr) { + params.put("floorRule", dr.getFloorForRule()); + params.put("bussinessRule", dr.getBusinessForRule()); + } + ResultData data = wxChartDataService.queryData(params); logger.info("[" + getIpAddr() + "] WxChartDataController::queryData chart: " + chart + " end"); return data; @@ -88,7 +95,6 @@ public class WxChartDataController extends BaseController { @TenantIgnore @GetMapping("queryWeekCount") @ApiOperation("查询用户增长 总数,今日,近一周") - @SystemControllerLog(description = "会员首页-报表数据-查询用户增长") public ResultData queryWeekCount(Integer chartType) { logger.info("[" + getIpAddr() + "] WxChartDataController::queryWeekCount chartType: " + chartType); EnumChartType enumChartType = EnumChartType.getEnum(chartType); @@ -101,7 +107,6 @@ public class WxChartDataController extends BaseController { @TenantIgnore @GetMapping("queryMonthVos") @ApiOperation("查询用户增长 总数,今日,近一周") - @SystemControllerLog(description = "会员首页-报表数据-查询用户增长") public ResultData queryMonthVos(Integer chartType) { logger.info("[" + getIpAddr() + "] WxChartDataController::queryMonthVos chartType: " + chartType); EnumChartType enumChartType = EnumChartType.getEnum(chartType); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java index 959653dcf..a2ebbaa3b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java @@ -91,8 +91,12 @@ public class WxMerchantMicroPayController extends BaseController { @GetMapping("/export") @SystemControllerLog(description = "收银台-商户收银导出") public void exportMerchantMicroPay(PageMerchantMicroPayDTO dto, HttpServletResponse response) { - logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::exportMerchantMicroPay"); dto.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + dto.setFloorForRule(dataRule.getFloorIds()); + dto.setBusinessForRule(dataRule.getBussinessIds()); + } markingDataReportService.exportMerchantMicroPay(dto, response); } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index 5a9d09be9..d7a4ac5cb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -1,6 +1,7 @@ package com.iformall.controller.rent; import com.alibaba.fastjson.JSONArray; +import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; @@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; +import java.util.HashMap; import java.util.Map; /** @@ -169,7 +171,9 @@ public class WxBillAllController extends BaseController { wxBillAll = new WxBillAll(); } wxBillAll.updateTenantInfo(getTenantInfo()); - Map result = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize); + PageInfo page = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize); + Map result = new HashMap<>(); + result.put("pageInfo", page); return new ResultData(result); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java index b04c80784..718345209 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -6,6 +6,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBillRent; +import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxBillRentService; import io.swagger.annotations.ApiImplicitParam; @@ -41,6 +42,11 @@ public class WxBillRentController extends BaseController { wxBillRent = new WxBillRent(); } wxBillRent.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillRent.setFloorForRule(dataRule.getFloorIds()); + wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); + } wxBillRent.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); return new ResultData(page); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java index e92804409..947c8959d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; +import java.util.List; /** * @author gongbiao @@ -94,4 +95,6 @@ public class WxBillDeposit extends TenantEntity { private String serviceChargePayBefore; @TableField(exist = false) private String serviceChargePayUpdate; + @TableField(exist = false) + private List rentContractIdList; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 635b31282..daf4c5375 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * @author gongbiao @@ -275,5 +276,11 @@ public class WxBillRent extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") @TableField(exist = false) private Long floor; + + @TableField(exist = false) + private List rentContractIdList; + + @TableField(exist = false) + private List merchantIdList; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java index df3e4dc12..eb2018680 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java @@ -14,6 +14,7 @@ import java.util.Map; public interface WxBillDepositMapper extends CommonMapper { List findList(WxBillDeposit wxBillDeposit); + List findRentContractIds(WxBillDeposit wxBillDeposit); List queryBillDepositList(WxBillDeposit record); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java index e9f6f2a20..4df2ec8ca 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -17,6 +17,7 @@ public interface WxBillRentMapper extends CommonMapper { List findList(WxBillRent wxBillRent); List queryBillRentList(WxBillRent record); + List queryBillRentContractIdList(WxBillRent record); Map queryPayInfo(Map params); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index 6af285ec8..5f7c27173 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -1,5 +1,6 @@ package com.iformall.service; +import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillSettle; @@ -62,7 +63,7 @@ public interface WxBillAllService { * * @return */ - Map getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize); + PageInfo getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize); void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index 00bf398b6..fc9b423d3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -648,6 +648,14 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { @Override public void exportMerchantMicroPay(PageMerchantMicroPayDTO dto, HttpServletResponse response) { + if (null != dto.getFloorForRule()) { + List mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null, 0, 0); + if (null == mids || mids.size() <= 0 ) { + dto.setMerchantId(-1L); + }else { + dto.setMerchantIds(mids); + } + } List vos = wxOrderMapper.listMerchantMicroPay(dto); Map merchantMap = wxMerchantService.listMerchant(dto, null).stream().collect(Collectors.toMap(ListMerchantVO::getId, Function.identity())); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 0fed4e50b..cadc7502a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -2056,41 +2056,47 @@ public class WxBillAllServiceImpl implements WxBillAllService { return result; } - @Override - public Map getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize) { - Map result = new HashMap<>(); - record.setLimitStart(0); - record.setLimitEnd(Integer.MAX_VALUE); - List totalList = wxBillAllMapper.getReceiveAndPayBillAsPage(record); - if (CollectionUtils.isEmpty(totalList)) { - PageHelper.startPage(pageNum, pageSize); - PageInfo> pageInfo = new PageInfo(new ArrayList()); - pageInfo.setPages(0); - pageInfo.setTotal(0); - PageHelper.clearPage(); - result.put("pageInfo", pageInfo); - return result; - } - - int total = totalList.size(); - int pages; - if (total % pageSize == 0) { - pages = total / pageSize; - } else { - pages = total / pageSize + 1; - } - record.setLimitStart((pageNum - 1) * pageSize); - record.setLimitEnd(pageSize); - List> list = wxBillAllMapper.getReceiveAndPayBillAsPage(record); - - PageHelper.startPage(pageNum, pageSize); - PageInfo> pageInfo = new PageInfo(list); - pageInfo.setPages(pages); - pageInfo.setTotal(total); - PageHelper.clearPage(); - result.put("pageInfo", pageInfo); - return result; - } +// @Override +// public Map getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize) { +// Map result = new HashMap<>(); +// record.setLimitStart(0); +// record.setLimitEnd(Integer.MAX_VALUE); +// List totalList = wxBillAllMapper.getReceiveAndPayBillAsPage(record); +// if (CollectionUtils.isEmpty(totalList)) { +// PageHelper.startPage(pageNum, pageSize); +// PageInfo> pageInfo = new PageInfo(new ArrayList()); +// pageInfo.setPages(0); +// pageInfo.setTotal(0); +// PageHelper.clearPage(); +// result.put("pageInfo", pageInfo); +// return result; +// } +// +// int total = totalList.size(); +// int pages; +// if (total % pageSize == 0) { +// pages = total / pageSize; +// } else { +// pages = total / pageSize + 1; +// } +// record.setLimitStart((pageNum - 1) * pageSize); +// record.setLimitEnd(pageSize); +// List> list = wxBillAllMapper.getReceiveAndPayBillAsPage(record); +// +// PageHelper.startPage(pageNum, pageSize); +// PageInfo> pageInfo = new PageInfo(list); +// pageInfo.setPages(pages); +// pageInfo.setTotal(total); +// PageHelper.clearPage(); +// result.put("pageInfo", pageInfo); +// return result; +// } + + @Override + public PageInfo getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize) { + PageInfo pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBillAllMapper.getReceiveAndPayBillAsPage(record)); + return pageInfo; + } /** * 使用java正则表达式去掉多余的.与0 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 1b81beb6a..f1bfaea13 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -22,6 +22,7 @@ import org.joda.time.format.DateTimeFormatter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -60,19 +61,15 @@ public class WxBillRentServiceImpl implements WxBillRentService { WxBillDepositService wxBillDepositService; @Autowired WxBillRentManageMapper wxBillRentManageMapper; + + @Lazy + @Autowired + WxMerchantService wxMerchantService; @Override public PageInfo listAsPage(WxBillRent record, Integer pageIndex, Integer pageSize) { WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); - - PageHelper.startPage(pageIndex, pageSize); - List billRentList = wxBillRentMapper.queryBillRentList(record); - billRentList.stream().forEach(e->{ - //手续费 = 合同应收+手续费+滞纳金 - computeTotalMoney(wxPayAccountBill, e); - }); - PageInfo pageInfo = new PageInfo<>(billRentList); - return pageInfo; + return getBillRentPropertyList(pageIndex,pageSize,record,wxPayAccountBill); } public void computeTotalMoney(WxPayAccountBill wxPayAccountBill, WxBillRent rent) { @@ -141,10 +138,11 @@ public class WxBillRentServiceImpl implements WxBillRentService { public WxBillRent getById(Long id) { WxBillRent record = new WxBillRent(); record.setId(id); - WxBillRent rent = wxBillRentMapper.queryBillRentList(record).get(0); WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); + PageInfo rp = getBillRentPropertyList(1,1,record,wxPayAccountBill); + WxBillRent rent = rp.getList().get(0); //手续费 = 合同应收+手续费+滞纳金 - computeTotalMoney(wxPayAccountBill, rent); + //computeTotalMoney(wxPayAccountBill, rent); rent.setOwe(rent.getRealReceivePay() - rent.getPay()); return rent; } @@ -251,17 +249,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Override public PageInfo findByRentContractId(WxBillRent record, Integer pageIndex, Integer pageSize) { WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); - PageHelper.startPage(pageIndex, pageSize); - List billRentList = wxBillRentMapper.queryBillRentList(record); - billRentList.stream().forEach(e->{ - if(e.getPayRatio() == null){ - e.setPayRatio(0l); - } - //手续费 = 合同应收+手续费+滞纳金 - computeTotalMoney(wxPayAccountBill, e); - }); - PageInfo pageInfo = new PageInfo<>(billRentList); - return pageInfo; + return getBillRentPropertyList(pageIndex,pageSize,record,wxPayAccountBill); } @Transactional(rollbackFor = {Exception.class}) @@ -439,39 +427,125 @@ public class WxBillRentServiceImpl implements WxBillRentService { WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillRent); String billName = wxBillRent.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) ? "商铺租金账单" : "多经点位租金账单"; - List billRentList = wxBillRentMapper.queryBillRentList(wxBillRent); - billRentList.stream().forEach(e->{ - //手续费 = 合同应收+手续费+滞纳金 - computeTotalMoney(wxPayAccountBill, e); - }); - Map> collect = billRentList.parallelStream() - .collect(Collectors.groupingBy(WxBillRent::getMerchantId)); - Set>> entries = collect.entrySet(); + PageInfo billRentList = getBillRentPropertyList(1,10000,wxBillRent,wxPayAccountBill); List datalist = new ArrayList<>(); - for (Map.Entry> entry : entries) { - List list = entry.getValue(); - for (WxBillRent rent : list) { - if (rent.getDepositStatus() == null) { - rent.setDepositStatus(0); - } - String shopNumber = rent.getShopNumber(); - if (StringUtils.isEmpty(shopNumber)) { - String shopInfo = rent.getShopInfo(); - if (StringUtils.isNotEmpty(shopInfo) && !shopInfo.equals("[]")) { - JSONObject jsonObject = JSONObject.parseObject(shopInfo); - StringBuffer sb = new StringBuffer(); - Set> sets = jsonObject.entrySet(); - sets.forEach(x -> sb.append(x.getKey()).append(",")); - if(StringUtils.isNotBlank(sb)){ - rent.setShopNumber(sb.deleteCharAt(sb.length() - 1).toString()); + if (null != billRentList && null != billRentList.getList()) { + Map> collect = billRentList.getList().parallelStream() + .collect(Collectors.groupingBy(WxBillRent::getMerchantId)); + Set>> entries = collect.entrySet(); + for (Map.Entry> entry : entries) { + List list = entry.getValue(); + for (WxBillRent rent : list) { + if (rent.getDepositStatus() == null) { + rent.setDepositStatus(0); + } + String shopNumber = rent.getShopNumber(); + if (StringUtils.isEmpty(shopNumber)) { + String shopInfo = rent.getShopInfo(); + if (StringUtils.isNotEmpty(shopInfo) && !shopInfo.equals("[]")) { + JSONObject jsonObject = JSONObject.parseObject(shopInfo); + StringBuffer sb = new StringBuffer(); + Set> sets = jsonObject.entrySet(); + sets.forEach(x -> sb.append(x.getKey()).append(",")); + if(StringUtils.isNotBlank(sb)){ + rent.setShopNumber(sb.deleteCharAt(sb.length() - 1).toString()); + } } } + datalist.add(rent); } - datalist.add(rent); } } excelService.exportExcel(datalist, null, billName, WxBillRent.class, billName + ".xlsx", response, false); } + + private PageInfo getBillRentPropertyList(Integer pageIndex, Integer pageSize,WxBillRent wxBillRent,WxPayAccountBill wxPayAccountBill) { + if(null != wxBillRent.getDepositStatus()) { + WxBillDeposit bdq1 = new WxBillDeposit(); + bdq1.updateTenantInfo(wxBillRent); + bdq1.setStatus(wxBillRent.getDepositStatus()); + List rentids = wxBillDepositMapper.findRentContractIds(bdq1); + if (null != rentids && rentids.size() > 0 ) { + wxBillRent.setRentContractIdList(rentids); + }else { + wxBillRent.setId(-1L); + } + } + if (null != wxBillRent.getFloor() || null != wxBillRent.getBuilding()) { + List merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRent, null, wxBillRent.getBuilding(), wxBillRent.getFloor(), 0, 0); + if (null != merchantIds) { + wxBillRent.setMerchantIdList(merchantIds); + }else { + wxBillRent.setId(-1L); + } + } + + PageInfo billRentList = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillRentMapper.queryBillRentList(wxBillRent)); + if (null == billRentList) { + return null; + } + + List rentContractIdList = wxBillRentMapper.queryBillRentContractIdList(wxBillRent); + Map rentContractMap = new HashMap(); + Map billDepositMap = new HashMap(); + if ( null != rentContractIdList && rentContractIdList.size() > 0 ) { + WxRentContract rcq = new WxRentContract(); + rcq.updateTenantInfo(wxBillRent); + rcq.setIds(rentContractIdList); + List rlist = wxRentContractMapper.findList(rcq); + if (null != rlist && rlist.size() > 0 ) { + for (int i = 0 ; i < rlist.size(); i++) { + WxRentContract rc = rlist.get(i); + rentContractMap.put(rc.getId(), rc); + } + } + + WxBillDeposit bdq = new WxBillDeposit(); + bdq.updateTenantInfo(wxBillRent); + bdq.setRentContractIdList(rentContractIdList); + List bdlist = wxBillDepositMapper.findList(bdq); + if (null != bdlist && bdlist.size() > 0 ) { + for (int i = 0 ; i < bdlist.size(); i++) { + WxBillDeposit rc = bdlist.get(i); + billDepositMap.put(rc.getId(), rc); + } + } + + } + if (null != billRentList.getList()) { + billRentList.getList().stream().forEach(e->{ + if(e.getPayRatio() == null){ + e.setPayRatio(0l); + } + //手续费 = 合同应收+手续费+滞纳金 + computeTotalMoney(wxPayAccountBill, e); + WxRentContract rent = rentContractMap.get(e.getRentContractId()); + if (null != rent) { + e.setMerchantName(rent.getMerchantName()); + e.setRentType(rent.getType()); + if (null != rent.getPayRatio()) { + e.setPayRatio(rent.getPayRatio().longValue()); + } + if (null != rent.getLatePayRatio()) { + e.setLatePayRatio(Integer.parseInt(rent.getLatePayRatio())); + } + e.setLatePayDay(rent.getLatePayDay()); + if (null != rent.getLatePayRatio()) { + e.setLatePayRatio(Integer.parseInt(rent.getLatePayRatio())); + } + } + + WxBillDeposit bd = billDepositMap.get(e.getRentContractId()); + if (null != bd) { + e.setDeposit(bd.getReceivePay()); + e.setDepositStatus(bd.getStatus()); + } + + }); + } + + return billRentList; + } @Override public ResultData updateLatePayMoney(WxBillRent record, MallUserInfo user) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 4c5d6f7d1..eb284866a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -261,6 +261,8 @@ public class WxChartServiceImpl implements WxChartDataService { tenantEntity.setTenantId(tenantId); tenantEntity.setParentTenantId(parentTenantId); + //String floorRule = paramsMap.get("floorRule"); + //String bussinessRule = paramsMap.get("bussinessRule"); //出租率 if (chart.equals(EnumChart.CZL.getCode())) { return getRentRate(tenantEntity); diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index 062910ee9..961915af1 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -67,6 +67,12 @@ and `rent_shop_type` = #{rentShopType} and `pay_way` = #{payWay} + + and rent_contract_id in + + #{rdItem} + + and id in @@ -81,6 +87,11 @@ + + - - + select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, + case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`contract_need_pay`,br.`rent_price_info`,br.`need_pay`,br.`bussiness_manage_fee_need_pay`,br.`operating_manage_fee_need_pay`, + br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`revenue`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`, + br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.`comments`,br.starttime,br.endtime,br.bus_discount_ratio,br.freeze,br.join_rent_price,br.service_charge_pay + from wx_bill_rent br + + order by ${sortColumns} limit #{limitStart},#{limitEnd} + +