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-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/CityController.java
View File

@@ -38,7 +38,7 @@ public class CityController {
@PostMapping("/createOrder")
public R<Object> createOrder(@RequestBody PayOrderInfoDTO dto){
PayReturnResp orderAli = payTrdConfigService.createOrderAli(dto);
PayReturnResp orderAli = payTrdConfigService.createOrderAli(dto,false);
return R.ok(orderAli);
}

28
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java
View File

@@ -86,10 +86,34 @@ public class PayController {
return R.ok(orderPayStatusResp);
}
@PostMapping(value = "/merge/wx")
@Operation(summary = "微信聚合支付")
@Log(title = "微信聚合支付", businessType = BusinessType.OTHER, isSaveDb = true)
public R<PayReturnResp> trdWxPay(@RequestBody PayControllerDTO dto){
PayOrderInfoDTO payOrderInfo = payManager.getOrderInfo(dto.getOrderNo());
if(payOrderInfo == null){
return R.fail(600,"支付失败，未找到订单");
}
try {
boolean openAliPay = systemConfigManager.getSystemConfigOfBool(SystemConfigEnum.OPEN_WX_PAY);
if(!openAliPay){
orderLogsService.createBaseFail(dto.getOrderNo(),"四方微信支付","第四方微信未开启");
return R.fail(600,"微信支付失败！未开启微信通道！");
}
log.info("微信聚合支付 使用第三方支付 dto={}",JSON.toJSONString(dto));
PayReturnResp orderAli = payTrdConfigService.createOrderAli(payOrderInfo,true);
return R.ok(orderAli);
}catch (Exception e){
orderLogsService.createBaseFail(dto.getOrderNo(),"四方支付宝支付",StringUtils.cat(e.getMessage(),2000));
log.error("微信聚合支付 使用第三方支付失败! dto={}",JSON.toJSONString(dto), e);
return R.fail(600,"支付宝支付失败！");
}
}
@PostMapping(value = "/merge/ali")
@Operation(summary = "支付宝聚合支付")
@Log(title = "支付宝聚合支付", businessType = BusinessType.OTHER, isSaveDb = true)
public R<PayReturnResp> trdWxPay(@RequestBody PayControllerDTO dto){
public R<PayReturnResp> trdAliPay(@RequestBody PayControllerDTO dto){
PayOrderInfoDTO payOrderInfo = payManager.getOrderInfo(dto.getOrderNo());
if(payOrderInfo == null){
return R.fail(600,"支付失败，未找到订单");
@@ -104,7 +128,7 @@ public class PayController {
return R.fail(600,"支付宝支付失败！未开启支付宝通道！");
}
log.info("支付宝聚合支付 使用第三方支付 dto={}",JSON.toJSONString(dto));
PayReturnResp orderAli = payTrdConfigService.createOrderAli(payOrderInfo);
PayReturnResp orderAli = payTrdConfigService.createOrderAli(payOrderInfo,false);
// orderLogsService.createBaseSuccess(dto.getOrderNo(),"四方支付宝支付");
return R.ok(orderAli);
}catch (Exception e){

2
ruoyi-admin/src/test/java/com/ruoyi/test/business/PayTest.java
View File

@@ -30,7 +30,7 @@ public class PayTest {
dto.setSubject("subject");
dto.setPrice(new BigDecimal("10"));
dto.setOrderNo("ORSKALKLASJDKLAS");
PayReturnResp orderAli = payTrdConfigService.createOrderAli(dto);
PayReturnResp orderAli = payTrdConfigService.createOrderAli(dto,false);
log.info(JSON.toJSONString(orderAli));
}