wangqifan 3 năm trước cách đây
mục cha
commit
fc272e6fe7

+ 14 - 3
src/main/java/com/izouma/nineth/web/OrderPayController.java

@@ -96,7 +96,8 @@ public class OrderPayController {
     public String payOrderWeixinPC(@RequestParam Long id, @RequestParam String code, Model model) throws WxPayException, EncoderException, WxErrorException {
         WxMpOAuth2AccessToken accessToken = wxMpService.oauth2getAccessToken(code);
         WxMpUser user = wxMpService.oauth2getUserInfo(accessToken, null);
-        WxPayMpOrderResult payParams = (WxPayMpOrderResult) orderService.payOrderWeixin(id, WxPayConstants.TradeType.JSAPI, user.getOpenId());
+        WxPayMpOrderResult payParams = (WxPayMpOrderResult) orderService
+                .payOrderWeixin(id, WxPayConstants.TradeType.JSAPI, user.getOpenId());
         model.addAttribute("payParams", JSON.toJSONString(payParams));
         return "PayOrderPC";
     }
@@ -117,6 +118,14 @@ public class OrderPayController {
         return orderPayService.payOrderQuick(id);
     }
 
+    @ApiOperation("衫德h5快捷")
+    @RequestMapping(value = "/payAuctionOrder", method = RequestMethod.GET, produces = "text/html")
+    @ResponseBody
+    public String payAuctionOrder(@RequestParam Long id, Model model) throws BaseAdaPayException {
+//        return (String) orderService.payAdapay(id, "alipay_wap", null);
+        return sandPayService.payAuctionOrder(id);
+    }
+
     @RequestMapping(value = "/gift/alipay_h5", method = RequestMethod.GET)
     @ResponseBody
     public String payGiftOrderAlipayH5(Long id, Model model) throws BaseAdaPayException {
@@ -162,7 +171,8 @@ public class OrderPayController {
     public String payGiftOrderWeixinPC(@RequestParam Long id, @RequestParam String code, Model model) throws WxPayException, EncoderException, WxErrorException {
         WxMpOAuth2AccessToken accessToken = wxMpService.oauth2getAccessToken(code);
         WxMpUser user = wxMpService.oauth2getUserInfo(accessToken, null);
-        WxPayMpOrderResult payParams = (WxPayMpOrderResult) giftOrderService.payOrderWeixin(id, WxPayConstants.TradeType.JSAPI, user.getOpenId());
+        WxPayMpOrderResult payParams = (WxPayMpOrderResult) giftOrderService
+                .payOrderWeixin(id, WxPayConstants.TradeType.JSAPI, user.getOpenId());
         model.addAttribute("payParams", JSON.toJSONString(payParams));
         return "PayOrderPC";
     }
@@ -213,7 +223,8 @@ public class OrderPayController {
     public String payMintOrderWeixinPC(@RequestParam Long id, @RequestParam String code, Model model) throws WxPayException, EncoderException, WxErrorException {
         WxMpOAuth2AccessToken accessToken = wxMpService.oauth2getAccessToken(code);
         WxMpUser user = wxMpService.oauth2getUserInfo(accessToken, null);
-        WxPayMpOrderResult payParams = (WxPayMpOrderResult) mintOrderService.payOrderWeixin(id, WxPayConstants.TradeType.JSAPI, user.getOpenId());
+        WxPayMpOrderResult payParams = (WxPayMpOrderResult) mintOrderService
+                .payOrderWeixin(id, WxPayConstants.TradeType.JSAPI, user.getOpenId());
         model.addAttribute("payParams", JSON.toJSONString(payParams));
         return "PayOrderPC";
     }

+ 11 - 6
src/main/java/com/izouma/nineth/web/SandPayController.java

@@ -7,6 +7,7 @@ import com.izouma.nineth.config.GeneralProperties;
 import com.izouma.nineth.enums.PayMethod;
 import com.izouma.nineth.event.OrderNotifyEvent;
 import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.service.AuctionOrderService;
 import com.izouma.nineth.service.GiftOrderService;
 import com.izouma.nineth.service.MintOrderService;
 import com.izouma.nineth.service.SandPayService;
@@ -29,13 +30,14 @@ import java.nio.charset.StandardCharsets;
 @AllArgsConstructor
 public class SandPayController {
 
-    private SandPayService     sandPayService;
-    private SnowflakeIdWorker  snowflakeIdWorker;
-    private GeneralProperties  generalProperties;
-    private RocketMQTemplate   rocketMQTemplate;
-    private GiftOrderService   giftOrderService;
-    private MintOrderService   mintOrderService;
+    private SandPayService    sandPayService;
+    private SnowflakeIdWorker snowflakeIdWorker;
+    private GeneralProperties generalProperties;
+    private RocketMQTemplate  rocketMQTemplate;
+    private GiftOrderService  giftOrderService;
+    private MintOrderService  mintOrderService;
     private UserBalanceService userBalanceService;
+    private AuctionOrderService auctionOrderService;
 
     @PostMapping("/notify")
     public Object notifyOrder(HttpServletRequest req, HttpServletResponse resp) {
@@ -78,6 +80,9 @@ public class SandPayController {
                             case "recharge":
                                 userBalanceService.recharge(id, PayMethod.SANDPAY, payOrderCode);
                                 break;
+                            case "auctionOrder":
+                                auctionOrderService.notify(id, PayMethod.SANDPAY, payOrderCode);
+                                break;
                         }
                     }
                     return "respCode=000000";