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

update 修改分账逻辑

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-10-23 11:57:26 +08:00
parent b6b5ae11cc
commit b2021741d7
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java
View File

@@ -151,7 +151,7 @@ public interface IOrderBasicInfoService {
List<OrderVO> getListByMemberIdAndOrderStatus(String memberId, List<String> orderStatusList, LocalDateTime dateTime, String stationId); List<OrderVO> getListByMemberIdAndOrderStatus(String memberId, List<String> orderStatusList, LocalDateTime dateTime, String stationId);
void orderSplittingOperations(AdapayMemberAccount adapayMemberAccount, List<SettleOrderReport> stationReportList); void orderSplittingOperations(String merchantId, AdapayMemberAccount adapayMemberAccount, List<SettleOrderReport> stationReportList);
void orderSplittingOperations(String merchantId, String tradeDate); void orderSplittingOperations(String merchantId, String tradeDate);

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

@@ -1148,7 +1148,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
* 只有开通结算账户的运营商才走分账逻辑 * 只有开通结算账户的运营商才走分账逻辑
*/ */
@Override @Override
public void orderSplittingOperations(AdapayMemberAccount adapayMemberAccount, List<SettleOrderReport> stationReportList) { public void orderSplittingOperations(String merchantId, AdapayMemberAccount adapayMemberAccount, List<SettleOrderReport> stationReportList) {
// 运营商有没有开通结算账户 // 运营商有没有开通结算账户
if (adapayMemberAccount == null) { if (adapayMemberAccount == null) {
logger.error("订单分账逻辑error-运营商有没有开通结算账户"); logger.error("订单分账逻辑error-运营商有没有开通结算账户");
@@ -1162,7 +1162,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
String tradeDate = stationReportList.get(0).getTradeDate(); String tradeDate = stationReportList.get(0).getTradeDate();
logger.info("运营商:{}, 交易日期:{}, 进行分账处理start", adapayMemberAccount, JSON.toJSONString(stationReportList)); logger.info("运营商:{}, 交易日期:{}, 进行分账处理start", adapayMemberAccount, JSON.toJSONString(stationReportList));
String merchantId = adapayMemberAccount.getMerchantId(); // String merchantId = adapayMemberAccount.getMerchantId();
String appId = pileMerchantInfoService.queryAppIdByMerchantId(merchantId); String appId = pileMerchantInfoService.queryAppIdByMerchantId(merchantId);
// 根据运营商id和结算日期查询清分账单 // 根据运营商id和结算日期查询清分账单
@@ -1273,12 +1273,13 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId);
if (adapayMemberAccount == null) { if (adapayMemberAccount == null) {
logger.error("订单分账逻辑error, 运营商id:{}, 未配置结算账户", merchantId); logger.error("订单分账逻辑error, 运营商id:{}, 未配置结算账户", merchantId);
return; adapayMemberAccount = adapayMemberAccountService.getDefault();
// return;
} }
// 根据交易日期查询运营商下面所有站点的交易日报 // 根据交易日期查询运营商下面所有站点的交易日报
List<SettleOrderReport> stationReportList = settleOrderReportService.selectByMerchantIdAndDate(merchantId, tradeDate); List<SettleOrderReport> stationReportList = settleOrderReportService.selectByMerchantIdAndDate(merchantId, tradeDate);
orderSplittingOperations(adapayMemberAccount, stationReportList); orderSplittingOperations(merchantId, adapayMemberAccount, stationReportList);
} }