From 239a89b5e35c534863ec1c8c6e688f2fb4e7afe8 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 5 Sep 2019 10:49:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=BB=93=E7=AE=97=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/enums/EnumBillType.java | 3 ++- .../iformall/service/impl/WxBillAllServiceImpl.java | 4 +++- .../iformall/service/impl/WxPayBillServiceImpl.java | 11 +++++++++++ .../src/main/resources/mapper/WxBillAllMapper.xml | 1 - 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillType.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillType.java index 35a51cd87..1395a4de3 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBillType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillType.java @@ -14,7 +14,8 @@ public enum EnumBillType { POWER(5, "电费"), ROUTINE(6, "其他"), AIR_CONDITIONING(7, "空调费"), - OTHER_DEPOSIT(8, "其他押金") + OTHER_DEPOSIT(8, "其他押金"), + SETTLE(10, "结算单") ; public static EnumBillType getEnum(Integer code) { 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 e72acfd82..69d544ac5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -174,7 +174,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAll.setBillTypeValue(EnumBillTypeParam.ROUTINE.getCode()); } else if (wxBillAll.getBillTypeValue().equals(EnumBillType.AIR_CONDITIONING.getCode())) { wxBillAll.setBillTypeValue(EnumBillTypeParam.AIR_CONDITIONING.getCode()); - } else { + }else if (wxBillAll.getBillTypeValue().equals(EnumBillType.SETTLE.getCode())) { + wxBillAll.setBillTypeValue(EnumBillTypeParam.SETTLE.getCode()); + } else { logger.info("账单不存在"); return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java index 52ae8f1f4..bcb75a321 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java @@ -13,6 +13,7 @@ import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.pay.*; import com.iformall.service.WxBillAllService; +import com.iformall.service.WxBillSettleService; import com.iformall.service.WxPayBillService; import com.iformall.utils.*; import org.apache.commons.lang3.StringUtils; @@ -51,6 +52,9 @@ public class WxPayBillServiceImpl implements WxPayBillService { @Autowired WxMerchantBUserMapper wxMerchantBUserMapper; + @Autowired + private WxBillSettleService wxBillSettleService; + JSONObject errorMap = JSON.parseObject("{" + "\"NOAUTH\":{\"detail\":\"商户无此接口权限\",\"reason\":\"商户未开通此接口权限\",\"resolution\":\"请商户前往申请此接口权限\"}," + "\"NOTENOUGH\":{\"detail\":\"余额不足\",\"reason\":\"用户帐号余额不足\",\"resolution\":\"用户帐号余额不足,请用户充值或更换支付卡后再支付\"}," + @@ -98,6 +102,13 @@ public class WxPayBillServiceImpl implements WxPayBillService { //获取账单数据 Map bill = bills.get(0); Long owe = (Long) bill.get("owe"); + Integer billTypeValue = (Integer) bill.get("billTypeValue"); + + if(EnumBillType.SETTLE.getCode().equals(billTypeValue)){ + WxBillSettle wxBillSettle = wxBillSettleService.getById(record.getBillId()); + owe = wxBillSettle.getBalance(); + logger.info("wxBillSettle.balance:{}",owe); + } if (owe.longValue() <= 0) { logger.info("账单欠缴为0"); return new ResultData(ErrorCode.BILL_OWE_ZERO); diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 3f9189da8..ea7883a89 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -375,7 +375,6 @@ left join wx_pay_bill pb on bill.id=pb.bill_id where 1=1 - and bill.id=#{id}