dpo设置

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

@@ -56,7 +56,7 @@ public class DpoPayController extends Controller {
         this.orderRepository = orderRepository;
     }
 
-    @GetMapping("/notify")
+    @GetMapping("/notify/web")
     public void payNotifyWeb(HttpServletRequest request, HttpServletResponse response) throws IOException {
 //        Result result = new Result();
 //        try {
@@ -94,6 +94,41 @@ public class DpoPayController extends Controller {
 //        }
     }
 
+    @GetMapping("/notify")
+    public Result 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());
+                return new Result(config.getSuccessUrl());
+            }
+        }
+
+//        } catch (Exception e) {
+//            return new Result<>(result,ResultCodeEnum.SERVICE_ERROR.getCode(), "Pay for failure");
+//            //logger.error("DPO支付回调发生异常--->>>" + e.toString());
+//        }
+        return new Result(config.getFailedUrl());
+    }
 
     @Transactional
     public boolean verifyPay(String transToken, String orderId) {
@@ -177,8 +212,8 @@ public class DpoPayController extends Controller {
                         bonus.setOrderId(orderId);
                         bonus.setAmount(tbCfOrder.getItemsPrice());
 
-                        System.out.println("佣金-----》》》订单号："+orderId+"=user="+tbCfOrder.getUserId()+"=price="+tbCfOrder.getItemsPrice());
-                        saveNetworkMarketing(bonus,tbCfOrder.getUserId());
+                        System.out.println("佣金-----》》》订单号：" + orderId + "=user=" + tbCfOrder.getUserId() + "=price=" + tbCfOrder.getItemsPrice());
+                        saveNetworkMarketing(bonus, tbCfOrder.getUserId());
                     }
 
                 }
@@ -301,8 +336,11 @@ public class DpoPayController extends Controller {
         tranMap.put("CompanyRefUnique", 0);
 //        logger.info("getOrderSource---------->>>>>>>>>>>>" + order.getOrderSource());
         //回调地址
-        tranMap.put("RedirectURL", config.getNotifyUrl());
-
+        if (order.getOrderSource() != null && "1".equals(order.getOrderSource().toString())) {
+            tranMap.put("RedirectURL", config.getNotifyUrl());
+        } else {
+            tranMap.put("RedirectURL", config.getNotifyUrl() + "/web");
+        }
         System.out.println("回调地址:" + tranMap.get("RedirectURL"));
         //取消地址
         tranMap.put("BackURL", config.getBackUrl());
@@ -322,12 +360,12 @@ public class DpoPayController extends Controller {
     }
 
 
-    public Result saveNetworkMarketing(Bonus bonus,String userId) {
+    public Result saveNetworkMarketing(Bonus bonus, String userId) {
 
         TbCfUserInfo info = user.user();
 
 //        Optional<String> userIdOptional = userId;
-        System.out.println("userId=="+userId);
+        System.out.println("userId==" + userId);
         String orderId = bonus.getOrderId();
 
         if (orderId == null)

src/main/java/com/example/afrishop_v3/security/WebSecurityConfig.java

@@ -66,7 +66,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
                 .authorizeRequests().antMatchers("/api/auth/**", "/search/image/**", "/itemStation/**", "/startPage/**",
                 "/goodsType/**", "/home/**", "/spider/**", "/store/**", "/shopify/**", "/community/**", "/version/**",
-                "/flutterwave/notify/**", "/dpo/notify/**", "/advertisement/**", "/website/**","/paypal/**","/discover/bonus/**").permitAll()
+                "/flutterwave/notify/**", "/dpo/notify/**", "/advertisement/**", "/website/**","/paypal/**","/discover/bonus/**","/problem/**").permitAll()
                 .antMatchers("/api/test/**").permitAll()
                 .anyRequest().authenticated();