From ed6b607c938fa3911ab999607d0e1eda74f87967 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 11 Jul 2019 11:57:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=BB=9F=E8=AE=A1][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=99=9A=E4=B8=8A=E4=B8=9A=E6=80=81=E5=88=86=E6=9E=90]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/WxBusinessController.java | 25 ++++++- .../iformall/service/WxBusinessService.java | 3 +- .../service/impl/WxBusinessServiceImpl.java | 4 +- .../resources/mapper/WxBusinessMapper.xml | 70 +++++++------------ 4 files changed, 52 insertions(+), 50 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index a1ac70854..0329f478e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -69,7 +69,28 @@ public class WxBusinessController extends BaseController { wxBusiness.setStartdate(sdT.parse(sd.format(sDate)+" 00:00:00")); wxBusiness.setEnddate(sdT.parse(sd.format(eDate)+" 23:59:59")); } - return wxBusinessService.businessDataList(wxBusiness); + + List> mapList = wxBusinessService.businessDataList(wxBusiness); + for (Map map:mapList) { + if(map.get("rent") == null){ + map.put("rent",0); + } + if(map.get("sale") == null){ + map.put("sale",0); + map.put("rentSaleRate",0); + continue; + } + BigDecimal sale = new BigDecimal(map.get("sale").toString()); + BigDecimal rent = new BigDecimal(map.get("rent").toString()); + if(sale.doubleValue() <= 0){ + map.put("rentSaleRate",0); + continue; + }else { + BigDecimal divide = rent.divide(sale, 2, BigDecimal.ROUND_HALF_UP); + map.put("rentSaleRate", divide); + } + } + return new ResultData(mapList); } @ApiOperation("导出业态数据列表") @@ -86,7 +107,7 @@ public class WxBusinessController extends BaseController { wxBusiness.setStartdate(sdT.parse(sd.format(sDate)+" 00:00:00")); wxBusiness.setEnddate(sdT.parse(sd.format(eDate)+" 23:59:59")); } - List> dataList = (List>)wxBusinessService.businessDataList(wxBusiness).data; + List> dataList = wxBusinessService.businessDataList(wxBusiness); List exeList = new ArrayList<>(); for (Map m:dataList) { WxBusinessDataVo businessDataVo = new WxBusinessDataVo(); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java index 00a95a37a..57496cfdf 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxBusiness; import java.util.List; +import java.util.Map; public interface WxBusinessService { @@ -42,7 +43,7 @@ public interface WxBusinessService { - ResultData businessDataList(WxBusiness wxBusiness); + List> businessDataList(WxBusiness wxBusiness); ResultData devoteList(WxBusiness wxBusiness,Integer pageNum, Integer pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index 9e5f09641..4791fd635 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -57,8 +57,8 @@ public class WxBusinessServiceImpl implements WxBusinessService { @Override - public ResultData businessDataList(WxBusiness wxBusiness) { - return new ResultData(wxBusinessMapper.businessDataList(wxBusiness)); + public List> businessDataList(WxBusiness wxBusiness) { + return wxBusinessMapper.businessDataList(wxBusiness); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml index bbc917743..982c74165 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml @@ -115,36 +115,6 @@ left join wx_shop ws on(mtd.shop_id = ws.id) where m.business_id = b.id and m.tenant_id=#{tenantId} and m.status = 1 and m.is_del = 0 ) /100,2) rent, - - round( - round( - (select if(sum(mtd.trade_amt) is null,0,sum(mtd.trade_amt)) - from wx_merchant m - left join wx_merchant_trade_daily mtd on mtd.merchant_id = m.id where m.business_id = b.id and m.tenant_id=#{tenantId} and mtd.create_date between #{startdate} and #{enddate} and m.status = 1 and m.is_del = 0 ) - / - (select if(sum(ws.operation_area) is null,0,sum(ws.operation_area)) - from wx_merchant m - left join wx_merchant_shop mtd on mtd.merchant_id = m.id - left join wx_shop ws on(mtd.shop_id = ws.id) - where m.business_id = b.id and m.tenant_id=#{tenantId} and m.status = 1 and m.is_del = 0 ) - /100,2) - / - round( - (select - (select if(sum(br.receive_pay) is null,0,sum(br.receive_pay)) receive_pay from wx_merchant m - left join wx_bill_rent br on(br.merchant_id=m.id) where m.business_id = b.id and m.tenant_id=#{tenantId} and br.receive_date between #{startdate} and #{enddate} and m.status = 1 and m.is_del = 0 ) - + - (select if(sum(br.receive_pay) is null,0,sum(br.receive_pay)) receive_pay from wx_merchant m - left join wx_bill_property br on(br.merchant_id=m.id) where m.business_id = b.id and m.tenant_id=#{tenantId} and br.receive_date between #{startdate} and #{enddate} and m.status = 1 and m.is_del = 0 ) - from dual) / - (select if(sum(ws.operation_area) is null,0,sum(ws.operation_area)) - from wx_merchant m - left join wx_merchant_shop mtd on mtd.merchant_id = m.id - left join wx_shop ws on(mtd.shop_id = ws.id) - where m.business_id = b.id and m.status = 1 and m.is_del = 0 ) - /100,2) - ,4) - rentSaleRate, round( (select if(sum(mtd.trade_amt) is null,0,sum(mtd.trade_amt)) @@ -159,44 +129,54 @@