From a3ec2d4d894067e40ceea6b0ba44c457c856c517 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 6 Sep 2018 16:01:51 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E5=A1=94=E5=8F=B0][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=9F=E9=87=91=E5=87=BA=E7=A7=9F=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/domain/po/WxBillRent.java | 13 ++++++++++ .../com/simple/mapper/WxBillRentMapper.java | 2 ++ .../service/impl/DataTowerServiceImpl.java | 26 +++++++++++++++++++ .../resources/mapper/WxBillRentMapper.xml | 11 ++++++-- 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java index 0c4b7238a..63edafde8 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java @@ -89,6 +89,11 @@ public class WxBillRent implements Serializable { @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; + /*欠缴**/ + @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") + private BigDecimal owe; + + public Integer getShopId() { return shopId; } @@ -184,6 +189,14 @@ public class WxBillRent implements Serializable { this.wxMerchant = wxMerchant; } + public BigDecimal getOwe() { + return owe; + } + + public void setOwe(BigDecimal owe) { + this.owe = owe; + } + public WxShop getWxShop() { return wxShop; } diff --git a/mallinkService/src/main/java/com/simple/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxBillRentMapper.java index 8bbb53c04..69e8414c8 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxBillRentMapper.java @@ -12,4 +12,6 @@ public interface WxBillRentMapper extends CommonMapper { List> findListMap(WxBillRent record); + Map queryPayInfo(Map params); + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java index 63b316e7f..3e80e330a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java @@ -13,6 +13,7 @@ import com.simple.utils.DateUtils; import com.simple.utils.HashUtil; import com.simple.utils.HttpUtil; import org.apache.log4j.Logger; +import org.apache.poi.ss.usermodel.DateUtil; import org.apache.shiro.codec.Base64; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -46,6 +47,9 @@ public class DataTowerServiceImpl implements DataTowerService { @Autowired WxMallMapper wxMallMapper; + @Autowired + WxBillRentMapper wxBillRentMapper; + @Override @@ -78,6 +82,28 @@ public class DataTowerServiceImpl implements DataTowerService { datamap.put("wczl", wczl+"%"); } + //租金 + Map params=new HashMap<>(); + params.put("tenantId",tenantId); + Calendar calendar = Calendar.getInstance();//日历对象 + calendar.setTime(new Date());//设置当前日期 + calendar.add(Calendar.MONTH, -1);//月份减一 + params.put("receiveDate", DateUtils.date2String(calendar.getTime(),"yyyy-MM")); + Map payinfo=wxBillRentMapper.queryPayInfo(params); + if(payinfo!=null){ + BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); + BigDecimal pay = (BigDecimal) payinfo.get("pay"); + BigDecimal divide = receivepay.divide(pay); + double zjcjl = divide.doubleValue()*100; + datamap.put("ysje",receivepay); + datamap.put("ssje",pay); + datamap.put("zjsjl",zjcjl+"%"); + }else{ + datamap.put("ysje",0); + datamap.put("ssje",0); + datamap.put("zjsjl",0); + } + //上报 WxMerchant wxMerchant = new WxMerchant(); wxMerchant.setTenantId(tenantId); diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index b1e29738a..9288e348a 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -17,11 +17,13 @@ + + - `id`,`shop_id`,`user_area`,`price`,`need_pay`,`receive_pay`,`pay`,`receive_period`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`pay_way`,`receipt_num`,`tenant_id` + `id`,`shop_id`,`user_area`,`price`,`need_pay`,`receive_pay`,`pay`,`receive_period`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`pay_way`,`receipt_num`,`tenant_id`,`owe` @@ -59,7 +61,7 @@ select br.id,br.shop_id shopId,br.user_area userArea,br.price,br.need_pay needPay,br.receive_pay receivePay, br.pay,br.receive_period receivePeriod,br.receive_date receiveDate,br.pay_date payDate,br.createtime, br.expired_day expiredDay,br.pay_way payWay,br.receipt_num receiptNum,m.`name` merchantName, - s.build_area buildArea,s.operation_area operationArea,s.shop_number shopNumber + s.build_area buildArea,s.operation_area operationArea,s.shop_number shopNumber,br.owe from wx_bill_rent br left join wx_merchant_shop ms on br.shop_id=ms.shop_id and ms.is_del=0 inner join wx_merchant m on ms.merchant_id=m.id inner join wx_shop s on ms.shop_id=s.id @@ -89,6 +91,11 @@ +