feat : 接口对接调试修改

game-module/game-common/src/main/java/com/zanxiang/common/enums/PayWayEnum.java

@@ -1,11 +1,16 @@
 package com.zanxiang.common.enums;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 /**
  * 支付方式枚举
  *
  * @author xufeng
  * @date 2022/6/9 10:41
  */
+@Getter
+@AllArgsConstructor
 public enum PayWayEnum {
 
     /**
@@ -24,45 +29,18 @@ public enum PayWayEnum {
     MIPAY("MiPay", "米大师支付", 3);
 
     /**
-     * 支付类前缀
+     * 支付方式
      */
     private final String code;
-    
-    private final String name;
-    private final Integer num;
-
-    PayWayEnum(String code, String name, Integer num) {
-        this.code = code;
-        this.name = name;
-        this.num = num;
-    }
-
-    public String getName() {
-        return name;
-    }
 
-    public String getCode() {
-        return code;
-    }
-
-    public Integer getNum() {
-        return num;
-    }
+    /**
+     * 支付名称
+     */
+    private final String name;
 
     /**
-     * 通过num获取pay code
-     *
-     * @param num
-     * @return code
+     * 序号
      */
-    public static String getCodeByNum(Integer num) {
-        PayWayEnum[] values = PayWayEnum.values();
-        for (PayWayEnum value : values) {
-            if (value.getNum().equals(num)) {
-                return value.getCode();
-            }
-        }
-        return "";
-    }
+    private final Integer num;
 
 }

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/mapper/OrderCompleteCreateMapper.java

@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Select;
 public interface OrderCompleteCreateMapper extends BaseMapper<OrderComplete> {
 
     @Select("<script> " +
-            "SELECT o.*,o.id as orderId,o.amount as orderAmount,u.username AS agentAccount,u.create_time AS regTime,ux.reg_game_id AS regGameId,ux.reg_from AS regFrom,gur.regional_name AS regionalName,gur.role_id AS gameRoleId,gur.role_level AS gameLevel,gur.role_name AS gameRole,gur.role_vip_level AS gameVip,g.`name` AS gameName,gc1.`name` AS gameCategory,g2.`name` AS regGameName,gc2.`name` AS regGameCategory,gpw.pay_way_id AS payWayId,pw.pay_name AS payWayName,pm.merchant_name AS merchantName,pm.merchant_no AS merchantNo FROM h_order o LEFT JOIN h_user u ON o.user_id=u.id LEFT JOIN h_user_ext ux ON u.id=ux.user_id LEFT JOIN h_game_user_role gur ON gur.role_id=o.role_id LEFT JOIN h_game g ON g.id=o.game_id LEFT JOIN h_game_category gc1 ON gc1.id=g.category LEFT JOIN h_game g2 ON g2.id=ux.reg_game_id=g2.id LEFT JOIN h_game_category gc2 ON gc2.id=g2.category LEFT JOIN h_game_pay_way gpw ON gpw.id=o.game_payway_id LEFT JOIN h_pay_way pw ON gpw.pay_way_id=pw.id LEFT JOIN h_pay_merchant pm ON pm.id=gpw.pay_merchant_id " +
+            "SELECT o.*,o.id as orderId,o.amount as orderAmount,u.username AS agentAccount,u.create_time AS regTime,ux.reg_game_id AS regGameId,ux.reg_from AS regFrom,gur.regional_name AS regionalName,gur.role_id AS gameRoleId,gur.role_level AS gameLevel,gur.role_name AS gameRole,gur.role_vip_level AS gameVip,g.`name` AS gameName,gc1.`name` AS gameCategory,g2.`name` AS regGameName,gc2.`name` AS regGameCategory,gpw.pay_way_id AS payWayId,pw.pay_name AS payWayName,pm.merchant_name AS merchantName,pm.merchant_no AS merchantNo FROM t_order o LEFT JOIN t_user u ON o.user_id=u.id LEFT JOIN t_user_ext ux ON u.id=ux.user_id LEFT JOIN t_game_user_role gur ON gur.role_id=o.role_id LEFT JOIN t_game g ON g.id=o.game_id LEFT JOIN t_game_category gc1 ON gc1.id=g.category LEFT JOIN t_game g2 ON g2.id=ux.reg_game_id=g2.id LEFT JOIN t_game_category gc2 ON gc2.id=g2.category LEFT JOIN t_game_pay_way gpw ON gpw.id=o.game_payway_id LEFT JOIN t_pay_way pw ON gpw.pay_way_id=pw.id LEFT JOIN t_pay_merchant pm ON pm.id=gpw.pay_merchant_id " +
             "WHERE o.id=#{orderId};" +
             " </script>")
     OrderComplete info(@Param("orderId") String orderId);

game-module/game-sdk/src/main/java/com/zanxiang/sdk/enums/PayTypeEnum.java

@@ -24,12 +24,12 @@ public enum PayTypeEnum {
     /**
      * 微信支付
      */
-    WX_PAY(2, "WxPay", MiPayService.class),
+    WX_PAY(2, "WxPay", WxPayService.class),
 
     /**
      * 米大师支付
      */
-    MI_PAY(3, "MiPay", WxPayService.class);
+    MI_PAY(3, "MiPay", MiPayService.class);
 
     /**
      * 支付方式

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

@@ -207,6 +207,7 @@ public class AliPayService extends PayBaseService {
                     Matcher mobileClientMatcher = mobileClientParam.matcher(aliPayContentBody);
                     //todo : 这里存在一个写死的appId, 应该是沙箱环境的appId, 上线的时候要切换
                     String deepLinkAndroid = "alipays://platformapi/startApp?appId=20000125&orderSuffix=";
+//                    String deepLinkAndroid = "alipays://platformapi/startApp?appId=2021000120620173&orderSuffix=";
                     String deepLinkIos = "alipay://alipayclient/?";
                     if (mobileClientMatcher.find()) {
                         String pageData = mobileClientMatcher.group() + "}";

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

@@ -10,6 +10,7 @@ import com.zanxiang.sdk.constant.WxPayConstants;
 import com.zanxiang.sdk.domain.bo.ProductPayAttachParamBO;
 import com.zanxiang.sdk.domain.bo.ProductPayParamBO;
 import com.zanxiang.sdk.domain.bo.WxPayConfigBO;
+import com.zanxiang.sdk.util.HttpUtil;
 import com.zanxiang.sdk.util.WxPayUtil;
 import com.zanxiang.sdk.util.XmlUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -248,7 +249,7 @@ public class WxPayService extends PayBaseService {
             String sign = WxPayUtil.generateSignature(paramData, config.getApiKey());
             paramData.put("sign", sign);
             // 下单, 获取结果
-            String result = restTemplate.postForObject(WxPayConstants.UNIFIED_ORDER_URL, XmlUtil.mapToXml(paramData), String.class);
+            String result = HttpUtil.postData(WxPayConstants.UNIFIED_ORDER_URL, XmlUtil.mapToXml(paramData));
             Map<String, String> successMap = XmlUtil.xmlToMap(result);
             // 返回状态码
             String returnCode = successMap.get("return_code");