From 5cb1bfb71724058d8c8a6960960d0cafb635350c Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 16 Jun 2023 13:35:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=AE=97=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=E7=9A=84=E7=94=B5=E8=B4=B9=E9=87=91=E9=A2=9D=E5=A4=A7?= =?UTF-8?q?=E4=BA=8E=E6=80=BB=E6=B6=88=E8=B4=B9=E9=87=91=E9=A2=9D=EF=BC=8C?= =?UTF-8?q?=E5=88=99=E7=94=B5=E8=B4=B9=E9=87=91=E9=A2=9D=E7=AD=89=E4=BA=8E?= =?UTF-8?q?=E6=80=BB=E6=B6=88=E8=B4=B9=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index c9875bbca..006860fcc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -757,6 +757,10 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { totalElectricityAmount = totalElectricityAmount.add(multiply); } + // 如果算出来的电费金额大于总消费金额，则电费金额等于总消费金额 + if (totalElectricityAmount.compareTo(orderAmount) > 0) { + totalElectricityAmount = orderAmount; + } orderDetail.setTotalElectricityAmount(totalElectricityAmount); orderDetail.setTotalServiceAmount(orderAmount.subtract(totalElectricityAmount)); orderDetail.setTotalUsedElectricity(new BigDecimal(data.getTotalElectricity())); // 总用电量 From 81a083aef9f2e6ea64003218116bc750d0ea4a33 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 16 Jun 2023 15:34:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update=20=E5=88=9B=E5=BB=BA=E6=B1=87?= =?UTF-8?q?=E4=BB=98=E7=BB=93=E7=AE=97=E8=B4=A6=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/adapay/service/AdapayMemberService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java index f98ded3ae..96c0eba91 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java @@ -83,9 +83,13 @@ public class AdapayMemberService { // 银行账户类型：1-对公；2-对私 accountInfo.put("bank_acct_type", dto.getBankAcctType()); // 银行账户开户银行所在省份编码 （省市编码），银行账户类型为对公时，必填 - accountInfo.put("prov_code", dto.getProvCode()); + if (StringUtils.isNotBlank(dto.getProvCode())) { + accountInfo.put("prov_code", dto.getProvCode()); + } // 银行账户开户银行所在地区编码（省市编码），银行账户类型为对公时，必填 - accountInfo.put("area_code", dto.getAreaCode()); + if (StringUtils.isNotBlank(dto.getAreaCode())) { + accountInfo.put("area_code", dto.getAreaCode()); + } Map settleCountParams = Maps.newHashMap(); settleCountParams.put("member_id", adapayMemberId); @@ -93,6 +97,7 @@ public class AdapayMemberService { // channel String Y 目前仅支持：bank_account（银行卡） settleCountParams.put("channel", "bank_account"); settleCountParams.put("account_info", accountInfo); + log.info("创建汇付结算账户param:{}", settleCountParams); Map settleCount = SettleAccount.create(settleCountParams); log.info("创建汇付结算账户result:{}", settleCount); From 733ff3ee5f0a4f2dca4e26076aefa7c35532c00f Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 16 Jun 2023 15:42:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update=20=E5=88=9B=E5=BB=BA=E6=B1=87?= =?UTF-8?q?=E4=BB=98=E7=BB=93=E7=AE=97=E8=B4=A6=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/adapay/service/AdapayMemberService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java index 96c0eba91..1e56fce5a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java @@ -73,13 +73,17 @@ public class AdapayMemberService { // 银行卡对应的户名 accountInfo.put("card_name", dto.getCardName()); // 证件号，银行账户类型为对私时，必填 - accountInfo.put("cert_id", dto.getCertId()); + if (StringUtils.isNotBlank(dto.getCertId())) { + accountInfo.put("cert_id", dto.getCertId()); + } // 证件类型，仅支持：00-身份证，银行账户类型为对私时，必填 accountInfo.put("cert_type", "00"); // 手机号 accountInfo.put("tel_no", dto.getTelNo()); // 银行编码，详见附录 银行代码，银行账户类型对公时，必填 - accountInfo.put("bank_code", dto.getBankCode()); + if (StringUtils.isNotBlank(dto.getBankCode())) { + accountInfo.put("bank_code", dto.getBankCode()); + } // 银行账户类型：1-对公；2-对私 accountInfo.put("bank_acct_type", dto.getBankAcctType()); // 银行账户开户银行所在省份编码 （省市编码），银行账户类型为对公时，必填