shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

33333333333

Browse Source
This commit is contained in:
777
2025-01-18 00:50:39 +08:00
parent a096f565e1
commit 1a9802a916
20 changed files with 92 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-cai/src/main/java/com/ruoyi/cai/service/OrderLogsService.java
View File

@@ -21,5 +21,5 @@ public interface OrderLogsService extends IService<OrderLogs> {
void createBaseSuccess(String orderNo, String stepName);
void createAliPayLogs(String orderNo, String inParams, JSONObject jsonObject, boolean success,TrdPayTypeEnum typeEnum);
void createAliPayLogs(String orderNo, String inParams, JSONObject jsonObject, boolean success,TrdPayTypeEnum typeEnum,String stepName);
}

2
ruoyi-cai/src/main/java/com/ruoyi/cai/service/PayTrdConfigService.java
View File

@@ -15,7 +15,7 @@ import com.ruoyi.cai.pay.PayReturnResp;
public interface PayTrdConfigService extends IService<PayTrdConfig> {
void resetPayTrdConfig();
PayReturnResp createOrderAli(PayOrderInfoDTO dto);
PayReturnResp createOrderAli(PayOrderInfoDTO dto, boolean wx);
JSONObject queryOrder(String orderNo, String trdPayType);

5
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/OrderLogsServiceImpl.java
View File

@@ -49,11 +49,10 @@ public class OrderLogsServiceImpl extends ServiceImpl<OrderLogsMapper, OrderLogs
}
@Override
public void createAliPayLogs(String orderNo, String inParams, JSONObject jsonObject, boolean success,TrdPayTypeEnum typeEnum){
public void createAliPayLogs(String orderNo, String inParams, JSONObject jsonObject, boolean success,TrdPayTypeEnum typeEnum,String stepName){
OrderLogs orderLogs = new OrderLogs();
orderLogs.setOrderNo(orderNo);
orderLogs.setStepName("四方支付宝支付请求日志");
orderLogs.setSuccess("请求日志");
orderLogs.setStepName(stepName);
orderLogs.setInParams(JSON.toJSONString(new UrlJson(inParams)));
orderLogs.setOutParams(JSON.toJSONString(jsonObject));
orderLogs.setFlagName(typeEnum.name());

21
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PayTrdConfigServiceImpl.java
View File

@@ -67,8 +67,7 @@ public class PayTrdConfigServiceImpl extends ServiceImpl<PayTrdConfigMapper, Pay
}
@Override
public PayReturnResp createOrderAli(PayOrderInfoDTO dto){
// PayTrdConfig payTrdConfig = getEnableStatus();
public PayReturnResp createOrderAli(PayOrderInfoDTO dto, boolean wx){
String payCustom = systemConfigManager.getSystemConfig(SystemConfigEnum.PAY_CUSTOM);
PayTrdConfig payTrdConfig = null;
if(StringUtils.isNotEmpty(payCustom)){
@@ -78,7 +77,7 @@ public class PayTrdConfigServiceImpl extends ServiceImpl<PayTrdConfigMapper, Pay
}
}
if(payTrdConfig == null){
payTrdConfig = getConfig(dto.getPrice());
payTrdConfig = getConfig(dto.getPrice(),wx);
}
if(payTrdConfig == null){
throw new ServiceException("未开启支付，请联系客服");
@@ -87,16 +86,22 @@ public class PayTrdConfigServiceImpl extends ServiceImpl<PayTrdConfigMapper, Pay
if(typeEnum == null){
throw new ServiceException("未开启支付，请联系客服");
}
log.info("使用支付 {}", payTrdConfig.getType());
log.info("使用支付 {} wx={}", payTrdConfig.getType(), wx);
payManager.updatePayType(dto.getOrderNo(), payTrdConfig.getType());
return trdPayManager.createOrderAliMerge(dto, payTrdConfig, typeEnum);
return trdPayManager.createOrderAliMerge(dto, payTrdConfig, typeEnum, wx);
}
private PayTrdConfig getConfig(BigDecimal amount){
private PayTrdConfig getConfig(BigDecimal amount,boolean wx){
List<PayTrdConfig> list = new ArrayList<>();
for(PayTrdConfig payTrdConfig : PAY_TRD_CONFIG_LIST){
if(payTrdConfig.getEnableStatus() == 0){
continue;
if(wx){
if(payTrdConfig.getEnableWxStatus() == 0){
continue;
}
}else{
if(payTrdConfig.getEnableStatus() == 0){
continue;
}
}
if(payTrdConfig.getMaxAmount().compareTo(BigDecimal.ZERO) == 0 && payTrdConfig.getMinAmount().compareTo(BigDecimal.ZERO) == 0){
list.add(payTrdConfig);