autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-14 12:20:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2023-10-27 16:50:38 +08:00
parent d49f661eab f0f1b317db
commit ae20816e4a
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -669,13 +669,16 @@ public class SpringBootTestController {
System.out.println("=================已分账:" + JSON.toJSONString(successList)); System.out.println("=================已分账:" + JSON.toJSONString(successList));
} }
/**
* 测试分账
*/
@Test @Test
public void test() { public void test() {
String paymentId = "002212023091113071210547174455434940416"; String paymentId = "002212023102616240210563531446717337600";
AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount(); AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount();
adapayMemberAccount.setAdapayMemberId("ACM69460507"); adapayMemberAccount.setAdapayMemberId("ACM25158725");
BigDecimal deductionAmount = new BigDecimal("19.9"); BigDecimal deductionAmount = new BigDecimal("12.14");
String orderCode = "C88200971107"; String orderCode = "C63381533584";
String wechatAppId = "wxbb3e0d474569481d"; String wechatAppId = "wxbb3e0d474569481d";
// 延时分账，使用确认交易API // 延时分账，使用确认交易API
PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequest(paymentId, PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequest(paymentId,

1
jsowell-common/src/main/java/com/jsowell/common/util/SMSUtil.java
View File

@@ -24,7 +24,6 @@ public class SMSUtil {
SMSUtil.redisCache = redisCache; SMSUtil.redisCache = redisCache;
} }
// 短信应用SDK AppKey // 短信应用SDK AppKey
private static final String APP_KEY = "8ebcf52de98416814b440891350cd594"; private static final String APP_KEY = "8ebcf52de98416814b440891350cd594";

23
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1218,11 +1218,16 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// 在线支付，进行支付确认分账 // 在线支付，进行支付确认分账
orderSettleResult = doPaymentConfirmWithDelay(orderBasicInfo, adapayMemberAccount, appId); 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())) { if (orderSettleResult != null && AdapayStatusEnum.SUCCEEDED.getValue().equals(orderSettleResult.getStatus())) {
BigDecimal confirmAmt = new BigDecimal(orderSettleResult.getConfirmAmt()); BigDecimal confirmAmt = new BigDecimal(orderSettleResult.getConfirmAmt());
BigDecimal feeAmt = new BigDecimal(orderSettleResult.getFeeAmt()); BigDecimal feeAmt = new BigDecimal(orderSettleResult.getFeeAmt());
// 应收金额 = 订单结算金额汇总 // 应收金额 = 订单结算金额汇总
receivableAmount = receivableAmount.add(orderBasicInfo.getSettleAmount()); receivableAmount = receivableAmount.add(orderBasicInfo.getSettleAmount());
// 应清分金额 = 订单产生的电费+服务费实际消费 汇总 // 应清分金额 = 订单产生的电费+服务费实际消费 汇总
@@ -1235,14 +1240,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
withdrawableAmount = withdrawableAmount withdrawableAmount = withdrawableAmount
.add(confirmAmt) .add(confirmAmt)
.subtract(feeAmt); .subtract(feeAmt);
ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder() clearingBillDetail.setFeeAmt(feeAmt);
.clearingBillCode(clearingBillCode) clearingBillDetail.setConfirmAmt(confirmAmt);
.orderCode(orderBasicInfo.getOrderCode()) billDetailList.add(clearingBillDetail);
.feeAmt(feeAmt) } else {
.confirmAmt(confirmAmt) clearingBillDetail.setFeeAmt(BigDecimal.ZERO);
.createTime(DateUtils.getNowDate()) clearingBillDetail.setConfirmAmt(BigDecimal.ZERO);
.delFlag(DelFlagEnum.NORMAL.getValue())
.build();
billDetailList.add(clearingBillDetail); billDetailList.add(clearingBillDetail);
} }
} catch (Exception e) { } catch (Exception e) {

2
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java
View File

@@ -21,7 +21,7 @@ public class OrderInvoiceRecordVO {
private String orderCodes; private String orderCodes;
private String status; private String status;
private String createTime; private String createTime;
private String uodateTime; private String updateTime;
private BigDecimal totalAmount; private BigDecimal totalAmount;
private BigDecimal totalServiceAmount; private BigDecimal totalServiceAmount;
private BigDecimal totalElecAmount; private BigDecimal totalElecAmount;