From 5fd691f71bc043bd31d6bb67f7dd8cc1c7c7a116 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sat, 15 Feb 2025 15:12:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=20=E5=9B=9E=E8=B0=83=20?= =?UTF-8?q?=E5=A4=84=E7=90=86=20=E4=BB=A5=E5=8F=8A=20=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/NotifyController.java | 16 ++-- .../java/com/czg/config/SaTokenConfigure.java | 2 +- .../com/czg/order/entity/OrderPayment.java | 93 +++++++++++++++++++ .../czg/order/service/OrderInfoService.java | 3 + .../order/service/OrderPaymentService.java | 14 +++ .../src/main/java/com/czg/CzgPayUtils.java | 29 +++++- .../service/order/enums/OrderStatusEnums.java | 30 ++++++ .../order/mapper/OrderPaymentMapper.java | 14 +++ .../czg/service/order/service/PayService.java | 15 --- .../service/impl/OrderInfoServiceImpl.java | 51 +++++++++- .../service/impl/OrderPaymentServiceImpl.java | 18 ++++ .../order/service/impl/PayServiceImpl.java | 34 ++++--- .../resources/mapper/OrderPaymentMapper.xml | 7 ++ .../java/com/czg/service/CzgPayService.java | 14 --- .../czg/service/Impl/CzgPayServiceImpl.java | 12 +-- 15 files changed, 285 insertions(+), 67 deletions(-) create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderPayment.java create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderPaymentService.java create mode 100644 cash-service/order-service/src/main/java/com/czg/service/order/enums/OrderStatusEnums.java create mode 100644 cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderPaymentMapper.java create mode 100644 cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPaymentServiceImpl.java create mode 100644 cash-service/order-service/src/main/resources/mapper/OrderPaymentMapper.xml diff --git a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java index 7c32b75fd..952fef9a7 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java @@ -3,7 +3,9 @@ package com.czg.controller; import com.alibaba.fastjson2.JSONObject; import com.czg.CzgPayUtils; import com.czg.entity.CzgBaseRespParams; -import com.czg.entity.notify.CzgPayNotifyDTO; +import com.czg.order.service.OrderInfoService; +import com.czg.utils.AssertUtil; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -17,14 +19,16 @@ import org.springframework.web.bind.annotation.RequestMapping; public class NotifyController { private static final String SUCCESS = "SUCCESS"; -// @Resource -// private PayService payService; + @Resource + private OrderInfoService orderInfoService; @PostMapping("payCallBack") - public String notifyfstCallBack(CzgBaseRespParams respParams) { - CzgPayNotifyDTO czg = CzgPayUtils.getCzg(respParams, CzgPayNotifyDTO.class); - log.info("支付回调数据为"+ JSONObject.toJSONString(czg)); + public String notifyCZGCallBack(CzgBaseRespParams respParams) { + JSONObject czg = CzgPayUtils.getCzg(respParams); + AssertUtil.isNull(czg, "回调数据为空"); + log.info("支付回调数据为:{}", czg); + orderInfoService.payCallBackOrder(czg.getString("mchOrderNo"), czg); return SUCCESS; } diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java index a71ccff4d..96c42ac03 100644 --- a/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java +++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java @@ -60,7 +60,7 @@ public class SaTokenConfigure implements WebMvcConfigurer { // .match("/**") .notMatch("/user/**") .notMatch("/admin/auth/**") - .notMatch("/admin/feign/**") + .notMatch("/notify/**") .check(r -> StpKit.USER.checkManager()); })).addPathPatterns("/**"); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderPayment.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderPayment.java new file mode 100644 index 000000000..20da6d3ad --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderPayment.java @@ -0,0 +1,93 @@ +package com.czg.order.entity; + +import com.mybatisflex.annotation.Column; +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.annotation.Table; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import java.io.Serial; + +import jakarta.validation.constraints.NotBlank; +import lombok.*; + +/** + * 支付详情 实体类。 + * + * @author ww + * @since 2025-02-15 + */ +@Data +@Table("tb_order_payment") +public class OrderPayment implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @Id(keyType = KeyType.Auto) + private Long id; + + /** + * 店铺Id + */ + private Long shopId; + + /** + * 来源Id 订单Id或充值id + */ + private Long sourceId; + + /** + * 支付方式：order,refund, memberIn,memberRefund + */ + private String payType; + + /** + * 支付单号 唯一 自己系统的 mchOrderNo + */ + private String orderNo; + + /** + * 微信或支付宝支付条码 + */ + private String authCode; + + /** + * 金额 + */ + private BigDecimal amount; + + /** + * 三方支付单号 返回结果的 payOrderId + */ + private String tradeNumber; + + @Column(onInsertValue = "now()") + private LocalDateTime payTime; + + /** + * 支付相应结果 json + */ + private String respJson; + + @Column(onInsertValue = "now()") + private LocalDateTime createTime; + + @Column(onInsertValue = "now()", onUpdateValue = "now()") + private LocalDateTime updateTime; + + public OrderPayment(@NonNull Long shopId, @NonNull Long sourceId, @NotBlank String payType, @NotBlank String orderNo, + String authCode,@NonNull BigDecimal amount) { + this.shopId = shopId; + this.sourceId = sourceId; + this.payType = payType; + this.orderNo = orderNo; + this.authCode = authCode; + this.amount = amount; + } +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java index 4ae6f8022..b06b688da 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java @@ -1,5 +1,6 @@ package com.czg.order.service; +import com.alibaba.fastjson2.JSONObject; import com.czg.order.dto.OrderInfoQueryDTO; import com.czg.order.entity.OrderInfo; import com.czg.order.vo.OrderInfoVo; @@ -15,4 +16,6 @@ import com.mybatisflex.core.service.IService; public interface OrderInfoService extends IService { Page getOrderByPage(OrderInfoQueryDTO param); + void payCallBackOrder(String orderNo, JSONObject resultJson); + void refundCallBackOrder(); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderPaymentService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderPaymentService.java new file mode 100644 index 000000000..73913384d --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderPaymentService.java @@ -0,0 +1,14 @@ +package com.czg.order.service; + +import com.mybatisflex.core.service.IService; +import com.czg.order.entity.OrderPayment; + +/** + * 支付详情 服务层。 + * + * @author ww + * @since 2025-02-15 + */ +public interface OrderPaymentService extends IService { + +} diff --git a/cash-sdk/czg-pay/src/main/java/com/czg/CzgPayUtils.java b/cash-sdk/czg-pay/src/main/java/com/czg/CzgPayUtils.java index 72289ecca..0c3dfe312 100644 --- a/cash-sdk/czg-pay/src/main/java/com/czg/CzgPayUtils.java +++ b/cash-sdk/czg-pay/src/main/java/com/czg/CzgPayUtils.java @@ -155,9 +155,8 @@ public class CzgPayUtils { } - public static T getCzg(CzgBaseRespParams respParams, Class clazz) { + public static JSONObject getCzg(CzgBaseRespParams respParams) { AssertUtil.isNull(respParams, "超掌柜交易 回调数据为空"); -// CzgBaseRespParams respParams = JSONObject.parseObject(dataJsonStr, CzgBaseRespParams.class); log.info("超掌柜交易请求响应,{}", respParams); if (!"000000".equals(respParams.getCode())) { log.error("超掌柜回调响应失败,{}", respParams); @@ -168,7 +167,7 @@ public class CzgPayUtils { log.error("超掌柜回调 验签失败,{}", respParams); } } - return JSONObject.parseObject(respParams.getBizData(), clazz); + return JSONObject.parse(respParams.getBizData()); } @@ -249,4 +248,28 @@ public class CzgPayUtils { } return sortParam; } + + + + +// public static void main(String[] args) { +// CzgResult result = CzgResult.success(); +// CzgBaseRespParams respParams = new CzgBaseRespParams(); +// respParams.setCode("000000"); +// respParams.setMsg("成功"); +// respParams.setSign("6c0f1e11b0d3a16298c2dfeee8c1491a"); +// respParams.setBizData("{\"amount\":500,\"currency\":\"cny\",\"ifCode\":\"lklspay\",\"mchOrderNo\":\"WX1889977729515615615\",\"mercNo\":\"B240612563201\",\"note\":\"成功\",\"payOrderId\":\"202502151890598483156443138V6W\",\"payType\":\"WECHAT\",\"settlementType\":\"D1\",\"state\":\"TRADE_SUCCESS\",\"storeId\":\"S2406125309\",\"subject\":\"超掌柜\",\"tradeFee\":2}"); +// respParams.setTimestamp("20250215110620"); +// log.info("超掌柜交易请求响应,{}", respParams); +// +// result.setCode("000000".equals(respParams.getCode()) ? 200 : Integer.parseInt(respParams.getCode())); +// result.setMsg(respParams.getMsg()); +// if ("000000".equals(respParams.getCode()) && StrUtil.isNotBlank(respParams.getSign())) { +// if (validateSign(respParams.getSign(), JSONObject.toJSONString(respParams))) { +// log.info("验签失败"); +// } +// result.setData(JSONObject.parseObject(respParams.getBizData(), CzgMicroPayResp.class)); +// } +// System.out.println(JSONObject.toJSONString(result)); +// } } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/enums/OrderStatusEnums.java b/cash-service/order-service/src/main/java/com/czg/service/order/enums/OrderStatusEnums.java new file mode 100644 index 000000000..beb00e5d1 --- /dev/null +++ b/cash-service/order-service/src/main/java/com/czg/service/order/enums/OrderStatusEnums.java @@ -0,0 +1,30 @@ +package com.czg.service.order.enums; + + +import lombok.Getter; + +/** + * 订单状态枚举类 + */ +@Getter +public enum OrderStatusEnums { + + + UNPAID("unpaid", "待支付"), + IN_PRODUCTION("in_production", "制作中"), + WAIT_OUT("wait_out", "待取餐"), + DONE("done", "订单完成"), + REFUNDING("refunding", "申请退单"), + REFUND("refund", "退单"), + PART_REFUND("part_refund", "部分退单"), + CANCELLED("cancelled", "取消订单"); + + + private final String code; + private final String msg; + + OrderStatusEnums(String code, String msg) { + this.code = code; + this.msg = msg; + } +} diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderPaymentMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderPaymentMapper.java new file mode 100644 index 000000000..1485bce2b --- /dev/null +++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderPaymentMapper.java @@ -0,0 +1,14 @@ +package com.czg.service.order.mapper; + +import com.mybatisflex.core.BaseMapper; +import com.czg.order.entity.OrderPayment; + +/** + * 支付详情 映射层。 + * + * @author ww + * @since 2025-02-15 + */ +public interface OrderPaymentMapper extends BaseMapper { + +} diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java index 5d6526924..a51644a1b 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java @@ -61,19 +61,4 @@ public interface PayService { * @param refundOrderId 平台退款订单号 二选一 */ CzgResult queryRefund(Long shopId, String mchRefundNo, String refundOrderId); - - - /** - * 支付回调数据处理 - * - * @param dataJsonStr 带解析数据 - */ - CzgPayNotifyDTO getPayNotifyData(String dataJsonStr); - - /** - * 退款回调数据处理 - * - * @param dataJsonStr 带解析数据 - */ - CzgRefundNotifyDTO getRefundNotifyData(String dataJsonStr); } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 823eae084..d23231720 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -1,21 +1,29 @@ package com.czg.service.order.service.impl; import cn.hutool.core.util.StrUtil; -import com.czg.order.entity.OrderDetail; -import com.czg.order.service.OrderDetailService; +import com.alibaba.fastjson2.JSONObject; +import com.czg.entity.notify.CzgPayNotifyDTO; import com.czg.order.dto.OrderInfoQueryDTO; +import com.czg.order.entity.OrderDetail; +import com.czg.order.entity.OrderInfo; +import com.czg.order.entity.OrderPayment; +import com.czg.order.service.OrderDetailService; +import com.czg.order.service.OrderInfoService; +import com.czg.order.service.OrderPaymentService; import com.czg.order.vo.OrderDetailSmallVO; import com.czg.order.vo.OrderInfoVo; +import com.czg.service.order.enums.OrderStatusEnums; +import com.czg.service.order.mapper.OrderInfoMapper; import com.czg.utils.PageUtil; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.czg.order.entity.OrderInfo; -import com.czg.order.service.OrderInfoService; -import com.czg.service.order.mapper.OrderInfoMapper; import jakarta.annotation.Resource; +import jakarta.validation.constraints.NotBlank; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.List; /** @@ -30,6 +38,9 @@ public class OrderInfoServiceImpl extends ServiceImpl getOrderByPage(OrderInfoQueryDTO param) { String productName = param.getProductName(); @@ -59,4 +70,34 @@ public class OrderInfoServiceImpl extends ServiceImpl implements OrderPaymentService{ + +} diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index 89d3c93f9..2fe310fe1 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -1,5 +1,6 @@ package com.czg.service.order.service.impl; +import cn.hutool.core.util.IdUtil; import com.czg.account.entity.ShopMerchant; import com.czg.account.service.ShopMerchantService; import com.czg.entity.notify.CzgPayNotifyDTO; @@ -7,7 +8,9 @@ import com.czg.entity.notify.CzgRefundNotifyDTO; import com.czg.entity.req.*; import com.czg.entity.resp.*; import com.czg.order.entity.OrderInfo; +import com.czg.order.entity.OrderPayment; import com.czg.order.service.OrderInfoService; +import com.czg.order.service.OrderPaymentService; import com.czg.resp.CzgResult; import com.czg.service.CzgPayService; import com.czg.service.order.dto.OrderPayParamDTO; @@ -37,6 +40,8 @@ public class PayServiceImpl implements PayService { private CzgPayService czgPayService; @Resource private OrderInfoService orderInfoService; + @Resource + private OrderPaymentService paymentService; private final BigDecimal MONEY_RATE = new BigDecimal("100"); private final String payJsonExtParam = "{\"payType\":\"1\"}"; @@ -46,7 +51,9 @@ public class PayServiceImpl implements PayService { public CzgResult h5PayOrder(@NonNull String clintIp, OrderPayParamDTO payParam) { OrderInfo orderInfo = orderInfoService.getById(payParam.getOrderId()); AssertUtil.isNull(orderInfo, "订单不存在"); - return h5Pay(payParam.getShopId(), new CzgH5PayReq(orderInfo.getOrderNo(), orderInfo.getPayAmount().multiply(MONEY_RATE).longValue(), + String payOrderNO = orderInfo.getPlatformType() + IdUtil.getSnowflakeNextId(); + initOrderPayment(new OrderPayment(payParam.getShopId(), payParam.getOrderId(), "order", payOrderNO, "", orderInfo.getOrderAmount())); + return h5Pay(payParam.getShopId(), new CzgH5PayReq(payOrderNO, orderInfo.getOrderAmount().multiply(MONEY_RATE).longValue(), "点餐支付", clintIp, payParam.getReturnUrl(), payParam.getBuyerRemark(), payJsonExtParam)); } @@ -55,7 +62,9 @@ public class PayServiceImpl implements PayService { public CzgResult jsPayOrder(@NonNull String clintIp, OrderPayParamDTO payParam) { OrderInfo orderInfo = orderInfoService.getById(payParam.getOrderId()); AssertUtil.isNull(orderInfo, "订单不存在"); - return jsPay(payParam.getShopId(), payParam.getPayType(), new CzgJsPayReq(orderInfo.getOrderNo(), orderInfo.getPayAmount().multiply(MONEY_RATE).longValue(), + String payOrderNO = orderInfo.getPlatformType() + IdUtil.getSnowflakeNextId(); + initOrderPayment(new OrderPayment(payParam.getShopId(), payParam.getOrderId(), "order", payOrderNO, "", orderInfo.getOrderAmount())); + return jsPay(payParam.getShopId(), payParam.getPayType(), new CzgJsPayReq(payOrderNO, orderInfo.getOrderAmount().multiply(MONEY_RATE).longValue(), "点餐支付", payParam.getOpenId(), clintIp, payParam.getReturnUrl(), payParam.getBuyerRemark(), payJsonExtParam)); } @@ -63,7 +72,9 @@ public class PayServiceImpl implements PayService { public CzgResult ltPayOrder(@NonNull String clintIp, OrderPayParamDTO payParam) { OrderInfo orderInfo = orderInfoService.getById(payParam.getOrderId()); AssertUtil.isNull(orderInfo, "订单不存在"); - return ltPay(payParam.getShopId(), payParam.getPayType(), new CzgLtPayReq(orderInfo.getOrderNo(), orderInfo.getPayAmount().multiply(MONEY_RATE).longValue(), + String payOrderNO = orderInfo.getPlatformType() + IdUtil.getSnowflakeNextId(); + initOrderPayment(new OrderPayment(payParam.getShopId(), payParam.getOrderId(), "order", payOrderNO, "", orderInfo.getOrderAmount())); + return ltPay(payParam.getShopId(), payParam.getPayType(), new CzgLtPayReq(payOrderNO, orderInfo.getOrderAmount().multiply(MONEY_RATE).longValue(), "点餐支付", payParam.getOpenId(), clintIp, payParam.getReturnUrl(), payParam.getBuyerRemark(), payJsonExtParam)); } @@ -71,7 +82,9 @@ public class PayServiceImpl implements PayService { public CzgResult scanPayOrder(@NonNull String clintIp, OrderPayParamDTO payParam) { OrderInfo orderInfo = orderInfoService.getById(payParam.getOrderId()); AssertUtil.isNull(orderInfo, "订单不存在"); - return scanPay(payParam.getShopId(), new CzgScanPayReq(orderInfo.getOrderNo(), orderInfo.getPayAmount().multiply(MONEY_RATE).longValue(), + String payOrderNO = orderInfo.getPlatformType() + IdUtil.getSnowflakeNextId(); + initOrderPayment(new OrderPayment(payParam.getShopId(), payParam.getOrderId(), "order", payOrderNO, "", orderInfo.getOrderAmount())); + return scanPay(payParam.getShopId(), new CzgScanPayReq(payOrderNO, orderInfo.getOrderAmount().multiply(MONEY_RATE).longValue(), "点餐支付", clintIp, payParam.getReturnUrl(), payParam.getBuyerRemark(), payJsonExtParam)); } @@ -79,7 +92,9 @@ public class PayServiceImpl implements PayService { public CzgResult microPayOrder(OrderPayParamDTO payParam) { OrderInfo orderInfo = orderInfoService.getById(payParam.getOrderId()); AssertUtil.isNull(orderInfo, "订单不存在"); - return microPay(payParam.getShopId(), new CzgMicroPayReq(orderInfo.getOrderNo(), orderInfo.getPayAmount().multiply(MONEY_RATE).longValue(), + String payOrderNO = orderInfo.getPlatformType() + IdUtil.getSnowflakeNextId(); + initOrderPayment(new OrderPayment(payParam.getShopId(), payParam.getOrderId(), "order", payOrderNO, payParam.getAuthCode(), orderInfo.getOrderAmount())); + return microPay(payParam.getShopId(), new CzgMicroPayReq(payOrderNO, orderInfo.getOrderAmount().multiply(MONEY_RATE).longValue(), "点餐支付", payParam.getAuthCode(), payParam.getBuyerRemark(), payJsonExtParam)); } @@ -104,14 +119,9 @@ public class PayServiceImpl implements PayService { } - @Override - public CzgPayNotifyDTO getPayNotifyData(String dataJsonStr) { - return czgPayService.getPayNotifyData(dataJsonStr); - } - @Override - public CzgRefundNotifyDTO getRefundNotifyData(String dataJsonStr) { - return czgPayService.getRefundNotifyData(dataJsonStr); + private void initOrderPayment(OrderPayment payment) { + paymentService.save(payment); } diff --git a/cash-service/order-service/src/main/resources/mapper/OrderPaymentMapper.xml b/cash-service/order-service/src/main/resources/mapper/OrderPaymentMapper.xml new file mode 100644 index 000000000..22ae9e3ab --- /dev/null +++ b/cash-service/order-service/src/main/resources/mapper/OrderPaymentMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/cash-service/pay-service/src/main/java/com/czg/service/CzgPayService.java b/cash-service/pay-service/src/main/java/com/czg/service/CzgPayService.java index 42d9a92f6..551042d98 100644 --- a/cash-service/pay-service/src/main/java/com/czg/service/CzgPayService.java +++ b/cash-service/pay-service/src/main/java/com/czg/service/CzgPayService.java @@ -84,18 +84,4 @@ public interface CzgPayService { String mchRefundNo, String refundOrderId); - /** - * 支付回调数据处理 - * - * @param dataJsonStr 带解析数据 - */ - CzgPayNotifyDTO getPayNotifyData(String dataJsonStr); - - /** - * 退款回调数据处理 - * - * @param dataJsonStr 带解析数据 - */ - CzgRefundNotifyDTO getRefundNotifyData(String dataJsonStr); - } diff --git a/cash-service/pay-service/src/main/java/com/czg/service/Impl/CzgPayServiceImpl.java b/cash-service/pay-service/src/main/java/com/czg/service/Impl/CzgPayServiceImpl.java index 36c08a2fe..cf226ae1c 100644 --- a/cash-service/pay-service/src/main/java/com/czg/service/Impl/CzgPayServiceImpl.java +++ b/cash-service/pay-service/src/main/java/com/czg/service/Impl/CzgPayServiceImpl.java @@ -60,17 +60,7 @@ public class CzgPayServiceImpl implements CzgPayService { @Override public CzgResult queryRefundOrder(@NonNull String appId, @NonNull String appSecret, String mchRefundNo, String refundOrderId) { - return CzgPayUtils.queryRefundOrder(sysParamsService.getSysParamValue(SysParamCodeEnum.PAY_CZG_DOMAIN.getCode()), appId, appSecret, mchRefundNo,refundOrderId); - } - - @Override - public CzgPayNotifyDTO getPayNotifyData(String dataJsonStr) { - return CzgPayUtils.getCzg(dataJsonStr,CzgPayNotifyDTO.class); - } - - @Override - public CzgRefundNotifyDTO getRefundNotifyData(String dataJsonStr) { - return CzgPayUtils.getCzg(dataJsonStr,CzgRefundNotifyDTO.class); + return CzgPayUtils.queryRefundOrder(sysParamsService.getSysParamValue(SysParamCodeEnum.PAY_CZG_DOMAIN.getCode()), appId, appSecret, mchRefundNo, refundOrderId); } }