feat : 支付修改

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/OrderPayServiceImpl.java

@@ -13,6 +13,7 @@ import com.zanxiang.mybatis.entity.Order;
 import com.zanxiang.mybatis.entity.OrderPayParam;
 import com.zanxiang.mybatis.entity.PayMerchant;
 import com.zanxiang.sdk.domain.bo.ProductPayParamBO;
+import com.zanxiang.sdk.domain.dto.GamePayWayDTO;
 import com.zanxiang.sdk.domain.params.ProductPayParam;
 import com.zanxiang.sdk.domain.params.UserData;
 import com.zanxiang.sdk.domain.vo.PayParamVO;
@@ -113,8 +114,15 @@ public class OrderPayServiceImpl implements OrderPayService {
         //判断游戏类型
         if (Objects.equals(PayDeviceEnum.APPLET_PAY.getPayDeviceId(), product.getPayDevice())
                 || Objects.equals(PayDeviceEnum.CUSTOM_PAY.getPayDeviceId(), product.getPayDevice())) {
-            log.error("单独生成订单, 不下单");
-            return ResultMap.ok(product.getOrderId());
+            //查询支付配置
+            GamePayWayDTO gamePayWayDTO = gamePayWayService.getGamePayWay(userData.getGameId(), product.getPayWay(), product.getPayDevice());
+            //构造参数信息
+            Map<Object, Object> paramMap = new HashMap<>(3);
+            paramMap.put("appId", gamePayWayDTO.getAppId());
+            paramMap.put("path", "pages/gamePay/index");
+            paramMap.put("orderId", product.getOrderId());
+            log.error("下单参数返回, paramMap : {}", JsonUtil.toString(paramMap));
+            return ResultMap.ok(paramMap);
         }
         //创建支付参数
         ProductPayParamBO bo = new ProductPayParamBO();

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/pay/WxPayService.java

@@ -238,12 +238,8 @@ public class WxPayService extends PayBaseService {
                     .createTime(LocalDateTime.now())
                     .updateTime(LocalDateTime.now())
                     .build());
-            //返回
-            Map<Object, Object> resultMap = new HashMap<>(3);
-            resultMap.put("appId", config.getAppId());
-            resultMap.put("path", "pages/gamePay/index");
-            resultMap.put("orderId", product.getOutTradeNo());
-            return ResultMap.ok(resultMap);
+            //返回支付参数
+            return ResultMap.ok(payParamMap);
         } catch (Exception e) {
             log.error("微信小程序支付通信异常, 订单号：{}, e : {}", product.getOutTradeNo(), e.getMessage());
             return ResultMap.error();