From 727c6d40001f53b4642ca5c6e50753cb0ea503b7 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 10 Sep 2019 17:37:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E4=B8=9A=E6=80=81=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=89=93=E5=8D=B0=E5=95=86=E9=93=BA?= =?UTF-8?q?=E9=9D=A2=E7=A7=AF=E6=97=A5=E5=BF=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBusinessServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 48a7f548f..d77914bfc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -126,7 +126,7 @@ public class WxBusinessServiceImpl implements WxBusinessService { List billRentList = wxPropertyContractService.buildProperty(new WxMerchant(),userid,dbRent, EnumIsPreview.YES.getCode(), false); businessSumMoney = businessSumMoney.add(new BigDecimal(billRentList.get(0).getReceivePay())); } - + logger.info("业态分析>>>>>>>>>>>>>>>>>>商铺面积:" + e.get("area").toString() + ">>>>>>>>>>" + "0".equals(e.get("area").toString())); if(e.get("area") == null || "0".equals(e.get("area").toString())){ e.put("rent",0); }else { From 883cd15e22a4cb57d9f486c73d93641991096423 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 10 Sep 2019 17:45:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[=E4=B8=9A=E6=80=81=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=89=93=E5=8D=B0=E5=95=86=E9=93=BA?= =?UTF-8?q?=E9=9D=A2=E7=A7=AF=E6=97=A5=E5=BF=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxBusinessServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 d77914bfc..da383b1e8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -126,13 +126,16 @@ public class WxBusinessServiceImpl implements WxBusinessService { List billRentList = wxPropertyContractService.buildProperty(new WxMerchant(),userid,dbRent, EnumIsPreview.YES.getCode(), false); businessSumMoney = businessSumMoney.add(new BigDecimal(billRentList.get(0).getReceivePay())); } - logger.info("业态分析>>>>>>>>>>>>>>>>>>商铺面积:" + e.get("area").toString() + ">>>>>>>>>>" + "0".equals(e.get("area").toString())); - if(e.get("area") == null || "0".equals(e.get("area").toString())){ + logger.info("业态分析>>>>>>>>>>>>>>>>>>商铺面积:" + e.get("area").toString()); + if (e.get("area") == null || "0".equals(e.get("area").toString()) || + "0.0".equals(e.get("area").toString())) { e.put("rent",0); }else { BigDecimal area = new BigDecimal(e.get("area").toString()); - BigDecimal areaRatio = businessSumMoney.divide(area, 2, BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); - e.put("rent", areaRatio.toBigInteger()); + if (area.longValue() > 0) { + BigDecimal areaRatio = businessSumMoney.divide(area, 2, BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); + e.put("rent", areaRatio.toBigInteger()); + } } }); return resultList; From 1a5661deccee763d5f53520194d1de6e1cbfaa1b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 10 Sep 2019 17:55:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E5=95=86=E6=88=B7=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E6=97=B6=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=95=86=E6=88=B7=E5=90=8D=E4=B8=BA=E7=A9=BA=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxBillAllMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 42360c9f4..5836eea59 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -814,7 +814,7 @@ and tt.tenant_id = #{tenantId} and tt.id = #{merchantId} - and tt.name like concat('%', #{merchantName},'%') + and tt.name like concat('%', #{merchantName},'%') and tt.rent_shop_type = #{rentShopType} order by ${sortColumns} From 7d8ed4ac27b6b4784eda65ba4c2a79dfa524ebd7 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 10 Sep 2019 18:02:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E5=88=86=E8=B4=A6=E8=B4=A6=E6=88=B7][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxProfitSharingReceiverServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java index 3364d4fc5..9e3434863 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java @@ -318,15 +318,15 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage()); return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), "verifyNotifyHMAC"); } + } - receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode()); - receiver.setUpdateTime(new Date()); - wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(receiver); + receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode()); + receiver.setUpdateTime(new Date()); + wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(receiver); - //发送短信 - if (send.equals(EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode())) { - sendMsgByType(EnumMsgModel.DELETE_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), receiver.getMerchantId(), receiver.getReceiverAccount(), receiver.getTenantId()); - } + //发送短信 + if (send.equals(EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode())) { + sendMsgByType(EnumMsgModel.DELETE_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), receiver.getMerchantId(), receiver.getReceiverAccount(), receiver.getTenantId()); } return new ResultData(); }