czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加部分退款接口

Browse Source
This commit is contained in:
韩鹏辉
2023-08-17 11:39:44 +08:00
parent b01ed04003
commit f788f3fb23
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pluss-common-bundle/src/main/java/cn/pluss/platform/ty/Ys4GEnum.java
View File

@@ -17,7 +17,7 @@ public enum Ys4GEnum {
* @date: 2021/12/6 18:24
*/
//BSJ_4G_YYS("ZF042","2021bsjZF042",""),
BSJ_4G_YYS("ZF544","2022bsjZF544GAH","https://ioe.car900.com/v1/openApi/dev/controlDevice.json"),
BSJ_4G_YYS("ZF544","2022bsjZF544GAH","https://ioe.car900.com/v1/openApi/dev/controlDevice.json"),
/**
* @description:天喻4G正式环境
* @date: 2021/12/6 18:25

2
pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/pay/impl/RyxPayServiceimpl.java
View File

@@ -292,7 +292,7 @@ public class RyxPayServiceimpl implements RyxPayService {
reqData.put("merchantCode",mchNo);
reqData.put("oriReqDate",DateUtils.formatDateDefault(order.getCreateDt(),"yyyyMMdd"));
reqData.put("oriReqMsgId",order.getOrderNumber());
reqData.put("refundAmount",StringUtil.isNotEmpty(order.getRefundType()) && order.getRefundType() == 2 ? order.getRefundAmt() : order.getConsumeFee());
reqData.put("refundAmount",StringUtil.isNotEmpty(order.getRefundType()) && order.getRefundType() == 2 ? order.getPayReturnAmount() : order.getConsumeFee());
reqData.put("refundReason",order.getRemark());
JSONObject respMap = ryxService.analysisCommonPayParams(RyxConfig.refundUrl,RyxConfig.barCodePayRefund,reqData);
log.info("==============>【瑞银信】交易订单退款接口，退款返回参数报文解析成功：{}<==================",respMap);

2
pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/SxfMchMachineCallbackServiceImpl.java
View File

@@ -330,7 +330,7 @@ public class SxfMchMachineCallbackServiceImpl implements MchMachineCallbackServi
merchantRefundOrder.setRefundNo(refundOrderNumber);
merchantRefundOrderService.save(merchantRefundOrder);
// 退款去分润操作
realFansService.removeProfit(merchantOrder.getOrderNumber());
realFansService.removeProfit(merchantOrder);
}
@Override

2
pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/impl/SxfPayServiceImpl.java
View File

@@ -279,7 +279,7 @@ public class SxfPayServiceImpl implements SxfPayService {
reqRefundData.put("ordNo", refundNo);
reqRefundData.put("mno", mchNo);//随行付测试商户号
reqRefundData.put("origOrderNo", order.getOrderNumber());
reqRefundData.put("amt", StringUtil.isNotEmpty(order.getRefundType()) && order.getRefundType() == 2 ? order.getRefundAmt() : order.getConsumeFee());
reqRefundData.put("amt", StringUtil.isNotEmpty(order.getRefundType()) && order.getRefundType() == 2 ? order.getPayReturnAmount() : order.getConsumeFee());
reqRefundData.put("notifyUrl", ParametersUtil.domain + "/wap/notify/sxfCallBack");
if (StringUtil.isNotEmpty(order.getRemark())) {
reqRefundData.put("refundReason", order.getRemark());

2
pluss-service-bundle/src/main/java/cn/pluss/platform/ys/pay/YsPayServiceImpl.java
View File

@@ -206,7 +206,7 @@ public class YsPayServiceImpl implements PayService {
Map<String,Object> result = new HashMap<>(4);
JSONObject reqData = new JSONObject();
Double amt = new BigDecimal(String.valueOf(order.getConsumeFee())).setScale(2).doubleValue();
Double amt = order.getPayReturnAmount().setScale(2).doubleValue();
String refundNo = "YSR"+StringUtil.getBillno();
reqData.put("merchantNo",mchNo);
reqData.put("origMerchantOrderNo",order.getOrderNumber());