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 new file mode 100644 index 000000000..7c32b75fd --- /dev/null +++ b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java @@ -0,0 +1,31 @@ +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 lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @author ww + * @description + */ +@Slf4j +@RequestMapping("notify") +public class NotifyController { + private static final String SUCCESS = "SUCCESS"; + +// @Resource +// private PayService payService; + + + @PostMapping("payCallBack") + public String notifyfstCallBack(CzgBaseRespParams respParams) { + CzgPayNotifyDTO czg = CzgPayUtils.getCzg(respParams, CzgPayNotifyDTO.class); + log.info("支付回调数据为"+ JSONObject.toJSONString(czg)); + return SUCCESS; + } + +} diff --git a/cash-api/order-server/src/main/java/com/czg/controller/PayController.java b/cash-api/order-server/src/main/java/com/czg/controller/PayController.java index 420ea5b33..ddfb5c340 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/PayController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/PayController.java @@ -29,7 +29,7 @@ public class PayController { * h5支付 */ @PostMapping("h5Pay") - CzgResult h5PayOrder(HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { + public CzgResult h5PayOrder(HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { return payService.h5PayOrder(ServletUtil.getClientIPByHeader(request), payParam); } @@ -40,7 +40,7 @@ public class PayController { * openId 必填 */ @PostMapping("jsPay") - CzgResult jsPayOrder(HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { + public CzgResult jsPayOrder(HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { return payService.jsPayOrder(ServletUtil.getClientIPByHeader(request), payParam); } @@ -50,7 +50,7 @@ public class PayController { * openId 必填 */ @PostMapping("ltPayOrder") - CzgResult ltPayOrder(HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { + public CzgResult ltPayOrder(HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { return payService.ltPayOrder(ServletUtil.getClientIPByHeader(request), payParam); } @@ -58,7 +58,7 @@ public class PayController { * 正扫 */ @PostMapping("scanPay") - CzgResult scanPayOrder(HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { + public CzgResult scanPayOrder(HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { return payService.scanPayOrder(ServletUtil.getClientIPByHeader(request), payParam); } @@ -67,7 +67,7 @@ public class PayController { * authCode 必填 扫描码 */ @PostMapping("microPay") - CzgResult microPayOrder(@Validated @RequestBody OrderPayParamDTO payParam) { + public CzgResult microPayOrder(@Validated @RequestBody OrderPayParamDTO payParam) { return payService.microPayOrder(payParam); } } diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/OrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java similarity index 96% rename from cash-api/order-server/src/main/java/com/czg/controller/admin/OrderController.java rename to cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java index 4b3768b8d..a324c5189 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/OrderController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("admin/order") -public class OrderController { +public class AdminOrderController { @Resource private OrderInfoService orderInfoService; diff --git a/cash-api/order-server/src/main/java/com/czg/controller/user/OrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java similarity index 95% rename from cash-api/order-server/src/main/java/com/czg/controller/user/OrderController.java rename to cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java index 68d16e760..997680bc4 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/user/OrderController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("/user/order") -public class OrderController { +public class UserOrderController { @Resource private OrderInfoService orderInfoService; 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 77581c9c7..61bc5e968 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,6 +155,23 @@ public class CzgPayUtils { } + public static T getCzg(CzgBaseRespParams respParams, Class clazz) { + AssertUtil.isNull(respParams, "超掌柜交易 回调数据为空"); +// CzgBaseRespParams respParams = JSONObject.parseObject(dataJsonStr, CzgBaseRespParams.class); + log.info("超掌柜交易请求响应,{}", respParams); + if (!"000000".equals(respParams.getCode())) { + log.error("超掌柜回调响应失败,{}", respParams); + return null; + } + if (StrUtil.isNotBlank(respParams.getSign())) { + if (validateSign(respParams.getSign(), respParams.getBizData())) { + log.error("超掌柜回调 验签失败,{}", respParams); + } + } + return JSONObject.parseObject(respParams.getBizData(), clazz); + + } + /** * 默认Post *