From d3412aa43c13fb0b2edbafea8be285964c550274 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 27 May 2019 16:53:12 +0800 Subject: [PATCH] =?UTF-8?q?[bug][=E4=BF=AE=E6=94=B9][1001653=E3=80=8110016?= =?UTF-8?q?46=E3=80=811001620]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schedule/BillNotificationSchedule.java | 20 ++------------ .../service/impl/WxChartServiceImpl.java | 26 +++++++++++++------ .../impl/WxPropertyContractServiceImpl.java | 4 +-- .../impl/WxRentContractServiceImpl.java | 2 +- .../main/resources/mapper/WxBillAllMapper.xml | 2 +- 5 files changed, 24 insertions(+), 30 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java index 6a7718e0f..33311c52c 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java @@ -85,26 +85,9 @@ public class BillNotificationSchedule { BigDecimal price = needPay.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN); String phone = bill.get("linkPhone").toString(); String appname = bill.get("appname").toString(); + String merchantName = bill.get("merchantName").toString(); logger.info("待缴账单检验短信配置信息"); -// WxMsgConfig wxMsgConfig = checkMsgConfig(tenantId); -// if (wxMsgConfig != null) { -// logger.info("待缴账单获取模板内容"); -// WxMsgValidationcodeModel wxMsgValidationcodeModel = getMsgModel(tenantId, EnumMsgModel.BILL_WAIT_PAY.getCode()); -// if (wxMsgValidationcodeModel != null) { -// String signature = wxMsgValidationcodeModel.getSignature(); -// String msg = wxMsgValidationcodeModel.getContent(). -// replace("{price}", price.toString()). -// replace("{date}", receiveDate). -// replace("{app}", appname); -// String notifyUrl = wxMsgConfig.getNotifyurl(); -// String secret = wxMsgConfig.getSecret(); -// String bid = wxMsgConfig.getBid(); -// String publickey = wxMsgConfig.getPublickey(); -// sendWaitPayBillMsg(phone, signature, msg, notifyUrl, secret, bid, publickey); -// } -// } - WxMsgRecord wxMsgRecord = new WxMsgRecord(); wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.BILL_WAIT_PAY.getCode()); @@ -114,6 +97,7 @@ public class BillNotificationSchedule { map.put("price",price.toString()); map.put("app",appname); map.put("date",receiveDate); + map.put("merName",merchantName); wxMsgRecord.setDynamicContentMap(map); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); } 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 699b979d0..8e15f7b18 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2349,14 +2349,24 @@ public class WxChartServiceImpl implements WxChartDataService { datamap.put("notRentTotalShop",notRentTotalShop); datamap.put("notRentTotalPoint",notRentTotalPoint); - double totalRentRate = new Double(rentTotal)/new Double(total)*100; - datamap.put("rentTotalRate",formatDouble(totalRentRate)); - double rentTotalShopRate = new Double(rentTotalShop)/ new Double(totalShop)*100; - datamap.put("rentTotalShopRate",formatDouble(rentTotalShopRate)); - double rentTotalPointRate = new Double(rentTotalPoint)/ new Double(totalPoint)*100; - logger.info("chartimpl rentTotalPoint:{},totalPoint:{}",rentTotalPoint,totalPoint); - datamap.put("rentTotalPointRate",formatDouble(rentTotalPointRate)); - + if(total == 0){ + datamap.put("rentTotalRate",0); + }else{ + double totalRentRate = new Double(rentTotal)/new Double(total)*100; + datamap.put("rentTotalRate",formatDouble(totalRentRate)); + } + if(totalShop == 0){ + datamap.put("rentTotalShopRate",0); + }else{ + double rentTotalShopRate = new Double(rentTotalShop)/ new Double(totalShop)*100; + datamap.put("rentTotalShopRate",formatDouble(rentTotalShopRate)); + } + if(totalPoint == 0){ + datamap.put("rentTotalPointRate",0); + }else{ + double rentTotalPointRate = new Double(rentTotalPoint)/ new Double(totalPoint)*100; + datamap.put("rentTotalPointRate",formatDouble(rentTotalPointRate)); + } return new ResultData(datamap); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 125e9e08f..337c6f33a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -613,9 +613,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxBillProperty.setExpiredDay(0L); } } - wxBillProperty.setTenantId(wxMerchant.getTenantId()); + wxBillProperty.setTenantId(wxPropertyContract.getTenantId()); wxBillProperty.setIsDel(0); - wxBillProperty.setMerchantId(wxMerchant.getId()); + wxBillProperty.setMerchantId(wxPropertyContract.getMerchantId()); wxBillProperty.setUserId(userId); wxBillProperty.setShopId(wxPropertyContract.getShopId()); wxBillProperty.setCreatetime(date); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 9d21134bc..cd58dc1c2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -962,7 +962,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } } wxBillRent.setRevenue(0L); - wxBillRent.setTenantId(wxMerchant.getTenantId()); + wxBillRent.setTenantId(wxRentContract.getTenantId()); wxBillRent.setIsDel(0); wxBillRent.setMerchantId(wxMerchant.getId()); wxBillRent.setUserId(userId); diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 592f00a2d..d51f0b0a5 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -410,7 +410,7 @@