diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 62f92fd89..2d710094c 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -669,13 +669,16 @@ public class SpringBootTestController { System.out.println("=================已分账:" + JSON.toJSONString(successList)); } + /** + * 测试分账 + */ @Test public void test() { - String paymentId = "002212023091113071210547174455434940416"; + String paymentId = "002212023102616240210563531446717337600"; AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount(); - adapayMemberAccount.setAdapayMemberId("ACM69460507"); - BigDecimal deductionAmount = new BigDecimal("19.9"); - String orderCode = "C88200971107"; + adapayMemberAccount.setAdapayMemberId("ACM25158725"); + BigDecimal deductionAmount = new BigDecimal("12.14"); + String orderCode = "C63381533584"; String wechatAppId = "wxbb3e0d474569481d"; // 延时分账,使用确认交易API PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequest(paymentId, diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/SMSUtil.java b/jsowell-common/src/main/java/com/jsowell/common/util/SMSUtil.java index ec3dc4d9e..002acfcac 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/SMSUtil.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/SMSUtil.java @@ -24,7 +24,6 @@ public class SMSUtil { SMSUtil.redisCache = redisCache; } - // 短信应用SDK AppKey private static final String APP_KEY = "8ebcf52de98416814b440891350cd594"; 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 ec92ce8f6..3b92886cb 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 @@ -1218,11 +1218,16 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 在线支付,进行支付确认分账 orderSettleResult = doPaymentConfirmWithDelay(orderBasicInfo, adapayMemberAccount, appId); } - + // 记录详情 + ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder() + .clearingBillCode(clearingBillCode) + .orderCode(orderBasicInfo.getOrderCode()) + .createTime(DateUtils.getNowDate()) + .delFlag(DelFlagEnum.NORMAL.getValue()) + .build(); if (orderSettleResult != null && AdapayStatusEnum.SUCCEEDED.getValue().equals(orderSettleResult.getStatus())) { BigDecimal confirmAmt = new BigDecimal(orderSettleResult.getConfirmAmt()); BigDecimal feeAmt = new BigDecimal(orderSettleResult.getFeeAmt()); - // 应收金额 = 订单结算金额汇总 receivableAmount = receivableAmount.add(orderBasicInfo.getSettleAmount()); // 应清分金额 = 订单产生的电费+服务费实际消费 汇总 @@ -1235,14 +1240,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { withdrawableAmount = withdrawableAmount .add(confirmAmt) .subtract(feeAmt); - ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder() - .clearingBillCode(clearingBillCode) - .orderCode(orderBasicInfo.getOrderCode()) - .feeAmt(feeAmt) - .confirmAmt(confirmAmt) - .createTime(DateUtils.getNowDate()) - .delFlag(DelFlagEnum.NORMAL.getValue()) - .build(); + clearingBillDetail.setFeeAmt(feeAmt); + clearingBillDetail.setConfirmAmt(confirmAmt); + billDetailList.add(clearingBillDetail); + } else { + clearingBillDetail.setFeeAmt(BigDecimal.ZERO); + clearingBillDetail.setConfirmAmt(BigDecimal.ZERO); billDetailList.add(clearingBillDetail); } } catch (Exception e) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java index 73243b1d8..8b72e1248 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java @@ -21,7 +21,7 @@ public class OrderInvoiceRecordVO { private String orderCodes; private String status; private String createTime; - private String uodateTime; + private String updateTime; private BigDecimal totalAmount; private BigDecimal totalServiceAmount; private BigDecimal totalElecAmount;