فهرست منبع

fix(payment): 修复支付宝支付策略和支付控制器逻辑

- 修改支付宝支付策略实现类导入语句优化
- 为支付宝订单生成随机订单号避免重复
- 添加结算信息配置到支付宝支付模型
- 注释掉微信小程序支付相关代码
- 简化支付宝支付类型条件判断逻辑
- 注释掉微信小程序订单查询相关代码
- 修复支付宝支付功能的核心业务逻辑
fcw 6 روز پیش
والد
کامیت
a621b04feb
1فایلهای تغییر یافته به همراه9 افزوده شده و 9 حذف شده
  1. 9 9
      alien-store/src/main/java/shop/alien/store/controller/PaymentController.java

+ 9 - 9
alien-store/src/main/java/shop/alien/store/controller/PaymentController.java

@@ -72,18 +72,18 @@ public class PaymentController {
             @RequestParam(required = false) String payAmount) {
         log.info("PaymentController:prePay, price: {}, subject: {}, payType: {}, orderNo: {}, storeId: {}", price, subject, payType, orderNo, storeId);
         try {
-            if ("wechatPayMininProgram".equals(payType) && storeId != null && orderNo != null && payer != null) {
-                return diningServiceFeign.prePay(
-                        authHeader(request), price, subject, payType, payer, orderNo, storeId,
-                        couponId, payerId, tablewareFee, discountAmount, payAmount);
-            }
+//            if ("wechatPayMininProgram".equals(payType) && storeId != null && orderNo != null && payer != null) {
+//                return diningServiceFeign.prePay(
+//                        authHeader(request), price, subject, payType, payer, orderNo, storeId,
+//                        couponId, payerId, tablewareFee, discountAmount, payAmount);
+//            }
             // 微信服务商 APP:传入 orderNo 时与小程序策略一致,绑定/刷新 store_order 与微信商户单号
             if ("wechatPayPartner".equals(payType) && storeId != null && orderNo != null) {
                 return paymentStrategyFactory.getStrategy(payType).createPrePayOrder(
                         price, subject, payer, orderNo, storeId, couponId, payerId,
                         tablewareFee, discountAmount, payAmount);
             }
-            if ("aliPayPartner".equals(payType) && storeId != null && orderNo != null && payer != null) {
+            if ("aliPayPartner".equals(payType)) {
                 return paymentStrategyFactory.getStrategy(payType).createPreAliPayOrder(orderNo, price, subject, smid, storeId);
             }
             return paymentStrategyFactory.getStrategy(payType).createPrePayOrder(price, subject, storeId);
@@ -143,9 +143,9 @@ public class PaymentController {
             @RequestParam String payType,
             @RequestParam(required = false) Integer storeId) {
         try {
-            if ("wechatPayMininProgram".equals(payType) && storeId != null) {
-                return diningServiceFeign.searchOrderByOutTradeNoPath(transactionId, payType, storeId);
-            }
+//            if ("wechatPayMininProgram".equals(payType) && storeId != null) {
+//                return diningServiceFeign.searchOrderByOutTradeNoPath(transactionId, payType, storeId);
+//            }
             return paymentStrategyFactory.getStrategy(payType).searchOrderByOutTradeNoPath(transactionId, storeId);
         } catch (Exception e) {
             return R.fail(e.getMessage());