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

123

Browse Source
This commit is contained in:
鲨鱼
2024-12-21 00:21:28 +08:00
parent 10a5f1c903
commit 583fb29acc
15 changed files with 712 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/CityController.java
View File

@@ -30,8 +30,8 @@ public class CityController {
}
@GetMapping("/resetOrder")
public R<JSONObject> resetOrder(String orderNo,String payType){
JSONObject jsonObject = payTrdConfigService.resetOrder(orderNo,payType);
public R<JSONObject> resetOrder(String orderNo,String payType,boolean updateData){
JSONObject jsonObject = payTrdConfigService.resetOrder(orderNo,payType,updateData);
return R.ok(jsonObject);
}

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

@@ -24,6 +24,8 @@ import com.ruoyi.cai.service.OrderLogsService;
import com.ruoyi.cai.service.PayTrdConfigService;
import com.ruoyi.cai.trdpay.TrdPayManager;
import com.ruoyi.cai.trdpay.TrdPayProperties;
import com.ruoyi.cai.trdpay.TrdPayTypeEnum;
import com.ruoyi.cai.trdpay.dto.NotifyResp;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
@@ -310,13 +312,11 @@ public class PayController {
try {
Map<String, String> params = AliPayApi.toMap(request);
log.info("第三方支付回调V1:{}",JSON.toJSONString(params));
String mchOrderNo = params.get("mchOrderNo");
String payOrderId = params.get("payOrderId");
String productId = params.get("productId");
payManager.callBack(mchOrderNo,payOrderId,params,"V1", PayTypeEnum.TRD);
NotifyResp notifyResp = trdPayManager.getNotifyResp(params, TrdPayTypeEnum.V1);
payManager.callBack(notifyResp.getOrderNo(),notifyResp.getTrdOrderNo(),params,notifyResp.getPayTypeEnum().name(), PayTypeEnum.TRD);
return "success";
} catch (Exception e) {
log.error("第三方支付回调失败!",e);
log.error("第三方支付回调失败V1!",e);
return "failure";
}
}
@@ -330,13 +330,11 @@ public class PayController {
try {
Map<String, String> params = AliPayApi.toMap(request);
log.info("第三方支付回调V2:{}",JSON.toJSONString(params));
String mchOrderNo = params.get("mchOrderNo");
String payOrderId = params.get("payOrderId");
String productId = params.get("productId");
payManager.callBack(mchOrderNo,payOrderId,params,"V2", PayTypeEnum.TRD);
NotifyResp notifyResp = trdPayManager.getNotifyResp(params, TrdPayTypeEnum.V2);
payManager.callBack(notifyResp.getOrderNo(),notifyResp.getTrdOrderNo(),params,notifyResp.getPayTypeEnum().name(), PayTypeEnum.TRD);
return "success";
} catch (Exception e) {
log.error("第三方支付回调失败!",e);
log.error("第三方支付回调失败V2!",e);
return "failure";
}
}
@@ -350,13 +348,11 @@ public class PayController {
try {
Map<String, String> params = AliPayApi.toMap(request);
log.info("第三方支付回调V3:{}",JSON.toJSONString(params));
String mchOrderNo = params.get("mchOrderNo");
String payOrderId = params.get("payOrderId");
String productId = params.get("productId");
payManager.callBack(mchOrderNo,payOrderId,params,"V3", PayTypeEnum.TRD);
NotifyResp notifyResp = trdPayManager.getNotifyResp(params, TrdPayTypeEnum.V3);
payManager.callBack(notifyResp.getOrderNo(),notifyResp.getTrdOrderNo(),params,notifyResp.getPayTypeEnum().name(), PayTypeEnum.TRD);
return "success";
} catch (Exception e) {
log.error("第三方支付回调失败!",e);
log.error("第三方支付回调失败V3!",e);
return "failure";
}
}