update dpo

src/main/java/com/example/afrishop_v3/controllers/DpoPayController.java

@@ -48,7 +48,7 @@ public class DpoPayController extends Controller {
         this.config = config;
     }
 
-    @GetMapping("/notify/web")
+    @GetMapping("/notify")
     public void payNotifyWeb(HttpServletRequest request, HttpServletResponse response) throws IOException {
 //        Result result = new Result();
 //        try {
@@ -80,51 +80,50 @@ public class DpoPayController extends Controller {
             }
         }
 
-
 //        } catch (Exception e) {
 //            return new Result<>(result,ResultCodeEnum.SERVICE_ERROR.getCode(), "Pay for failure");
 //            //logger.error("DPO支付回调发生异常--->>>" + e.toString());
 //        }
     }
 
-    @GetMapping("/notify")
-    public void payNotify(HttpServletRequest request, HttpServletResponse response) throws IOException {
-//        Result result = new Result();
-//        try {
-        System.out.println("DPO支付回调");
-        //订单号
-        String orderId = request.getParameter("CompanyRef");
-        //交易ID
-        String transId = request.getParameter("TransID");
-        //交易令牌
-        String transToken = request.getParameter("TransactionToken");
-        System.err.println("transID:" + transId);
-        System.err.println("transToken:" + transToken);
-        //logger.info("DPO支付：" + "开始支付校验");
-        Optional<TbCfOrder> byId = repository.findById(orderId);
-        String orderSource = null;
-        if (byId.isPresent()) {
-            orderSource = byId.get().getOrderSource().toString();
-        }
-        if (!StringUtils.isBlank(orderId) && !StringUtils.isBlank(transToken)) {
-            boolean verifyPay = verifyPay(transToken, orderId);
-            if (verifyPay) {
-                //logger.info("DPO支付：" + "支付校验成功");
-//                result.setMessage("Pay for success");
-//                result.setCode(ResultCodeEnum.SUCCESS.getCode());
-                response.sendRedirect(config.getMobileSuccessUrl());
-            } else {
-                response.sendRedirect(config.getMobileSuccessUrl());
-
-            }
-        }
-
-
-//        } catch (Exception e) {
-//            return new Result<>(result,ResultCodeEnum.SERVICE_ERROR.getCode(), "Pay for failure");
-//            //logger.error("DPO支付回调发生异常--->>>" + e.toString());
+//    @GetMapping("/notify")
+//    public void payNotify(HttpServletRequest request, HttpServletResponse response) throws IOException {
+////        Result result = new Result();
+////        try {
+//        System.out.println("DPO支付回调");
+//        //订单号
+//        String orderId = request.getParameter("CompanyRef");
+//        //交易ID
+//        String transId = request.getParameter("TransID");
+//        //交易令牌
+//        String transToken = request.getParameter("TransactionToken");
+//        System.err.println("transID:" + transId);
+//        System.err.println("transToken:" + transToken);
+//        //logger.info("DPO支付：" + "开始支付校验");
+//        Optional<TbCfOrder> byId = repository.findById(orderId);
+//        String orderSource = null;
+//        if (byId.isPresent()) {
+//            orderSource = byId.get().getOrderSource().toString();
 //        }
-    }
+//        if (!StringUtils.isBlank(orderId) && !StringUtils.isBlank(transToken)) {
+//            boolean verifyPay = verifyPay(transToken, orderId);
+//            if (verifyPay) {
+//                //logger.info("DPO支付：" + "支付校验成功");
+////                result.setMessage("Pay for success");
+////                result.setCode(ResultCodeEnum.SUCCESS.getCode());
+//                response.sendRedirect(config.getMobileSuccessUrl());
+//            } else {
+//                response.sendRedirect(config.getMobileSuccessUrl());
+//
+//            }
+//        }
+//
+//
+////        } catch (Exception e) {
+////            return new Result<>(result,ResultCodeEnum.SERVICE_ERROR.getCode(), "Pay for failure");
+////            //logger.error("DPO支付回调发生异常--->>>" + e.toString());
+////        }
+//    }
 
     @Transactional
     public boolean verifyPay(String transToken, String orderId) {
@@ -310,11 +309,8 @@ public class DpoPayController extends Controller {
         tranMap.put("CompanyRefUnique", 0);
         logger.info("getOrderSource---------->>>>>>>>>>>>" + order.getOrderSource());
         //回调地址
-        if (order.getOrderSource() != null && "2".equals(order.getOrderSource().toString())) {
-            tranMap.put("RedirectURL", config.getNotifyUrl() + "/web");
-        } else {
-            tranMap.put("RedirectURL", config.getNotifyUrl());
-        }
+        tranMap.put("RedirectURL", config.getNotifyUrl());
+
         System.out.println("回调地址:" + tranMap.get("RedirectURL"));
         //取消地址
         tranMap.put("BackURL", config.getBackUrl());