From f788f3fb23dad6dc189f869eb9abe08e7232d09f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Thu, 17 Aug 2023 11:39:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/pluss/platform/ty/Ys4GEnum.java | 2 +- .../java/cn/pluss/platform/ryx/pay/impl/RyxPayServiceimpl.java | 2 +- .../platform/sxf/impl/SxfMchMachineCallbackServiceImpl.java | 2 +- .../java/cn/pluss/platform/sxf/pay/impl/SxfPayServiceImpl.java | 2 +- .../main/java/cn/pluss/platform/ys/pay/YsPayServiceImpl.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/ty/Ys4GEnum.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/ty/Ys4GEnum.java index d9f6525..9a7abd6 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/ty/Ys4GEnum.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/ty/Ys4GEnum.java @@ -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 diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/pay/impl/RyxPayServiceimpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/pay/impl/RyxPayServiceimpl.java index 3250d99..9d008fc 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/pay/impl/RyxPayServiceimpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/pay/impl/RyxPayServiceimpl.java @@ -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); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/SxfMchMachineCallbackServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/SxfMchMachineCallbackServiceImpl.java index a9cbdab..0782282 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/SxfMchMachineCallbackServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/SxfMchMachineCallbackServiceImpl.java @@ -330,7 +330,7 @@ public class SxfMchMachineCallbackServiceImpl implements MchMachineCallbackServi merchantRefundOrder.setRefundNo(refundOrderNumber); merchantRefundOrderService.save(merchantRefundOrder); // 退款去分润操作 - realFansService.removeProfit(merchantOrder.getOrderNumber()); + realFansService.removeProfit(merchantOrder); } @Override diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/impl/SxfPayServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/impl/SxfPayServiceImpl.java index fb13480..60b7892 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/impl/SxfPayServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/impl/SxfPayServiceImpl.java @@ -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()); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/pay/YsPayServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/pay/YsPayServiceImpl.java index 9e8a400..7762172 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/pay/YsPayServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/pay/YsPayServiceImpl.java @@ -206,7 +206,7 @@ public class YsPayServiceImpl implements PayService { Map 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());