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

手动执行订单分账

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-08 15:50:22 +08:00
parent d1b87f8993
commit ae05198fdb
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
View File

@@ -201,8 +201,8 @@ public class TempController extends BaseController {
List<String> dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime); List<String> dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime);
for (String tradeDate : dateList) { for (String tradeDate : dateList) {
// orderBasicInfoService.tempOrderSplittingOperations(dto.getMerchantId(), tradeDate); orderBasicInfoService.tempOrderSplittingOperations(dto.getMerchantId(), tradeDate);
orderBasicInfoService.orderSplittingOperations(dto.getMerchantId(), tradeDate); // orderBasicInfoService.orderSplittingOperations(dto.getMerchantId(), tradeDate);
} }
response = new RestApiResponse<>(); response = new RestApiResponse<>();

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

@@ -1009,14 +1009,20 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
/** /**
* 手动接口执行订单分账逻辑 * 手动接口执行订单分账逻辑
* 8月1号之前的交易，全部结算到本商户
*/ */
@Override @Override
public void tempOrderSplittingOperations(String merchantId, String tradeDate) { public void tempOrderSplittingOperations(String merchantId, String tradeDate) {
logger.info("运营商:{}, 交易日期:{}, 进行分账处理start", merchantId, tradeDate); logger.info("运营商:{}, 交易日期:{}, 进行分账处理start", merchantId, tradeDate);
AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount(); // AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount();
adapayMemberAccount.setAdapayMemberId("0"); // adapayMemberAccount.setAdapayMemberId("0");
// 查询运营商有没有开通结算账户
AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId);
if (adapayMemberAccount == null) {
logger.error("订单分账逻辑error, 运营商id:{}, 未配置结算账户", merchantId);
return;
}
// 根据交易日期查询运营商下面所有站点的交易日报 // 根据交易日期查询运营商下面所有站点的交易日报
List<SettleOrderReport> stationReportList = settleOrderReportService.selectByMerchantIdAndDate(merchantId, tradeDate); List<SettleOrderReport> stationReportList = settleOrderReportService.selectByMerchantIdAndDate(merchantId, tradeDate);
@@ -1035,17 +1041,23 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// 执行分账 // 执行分账
for (OrderBasicInfo orderBasicInfo : orderBasicInfos) { for (OrderBasicInfo orderBasicInfo : orderBasicInfos) {
try { try {
OrderSettleResult orderSettleResult = doPaymentConfirm(orderBasicInfo, adapayMemberAccount); OrderSettleResult orderSettleResult = null;
if (orderSettleResult != null && AdapayStatusEnum.SUCCEEDED.getValue().equals(orderSettleResult.getStatus())) { if (PayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) {
JSONObject jsonObject = JSON.parseObject(orderSettleResult.getDescription()); // 余额支付的订单 只用余额支付转账
String orderCode = (String) jsonObject.get("orderCode"); orderSettleResult = doBalancePayment(orderBasicInfo, adapayMemberAccount);
logger.info("手动接口执行订单分账逻辑order:{}, result:{}", JSON.toJSONString(orderBasicInfo), JSON.toJSONString(orderSettleResult));
} else {
// 在线支付，进行支付确认分账
// orderSettleResult = doPaymentConfirm(orderBasicInfo, adapayMemberAccount);
} }
// if (orderSettleResult != null && AdapayStatusEnum.SUCCEEDED.getValue().equals(orderSettleResult.getStatus())) {
// JSONObject jsonObject = JSON.parseObject(orderSettleResult.getDescription());
// String orderCode = (String) jsonObject.get("orderCode");
// }
} catch (Exception e) { } catch (Exception e) {
logger.error("订单交易确认失败:{}", orderBasicInfo.getOrderCode(), e); logger.error("订单交易确认失败:{}", orderBasicInfo.getOrderCode(), e);
} }
} }
} }
logger.info("运营商:{}, 交易日期:{}, 进行分账处理end", merchantId, tradeDate); logger.info("运营商:{}, 交易日期:{}, 进行分账处理end", merchantId, tradeDate);
} }