fix:会员支付传参调整:支付终端、支付方式;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberOrderParam.java

@@ -21,20 +21,22 @@ public class AdamMemberOrderParam implements Serializable {
     private BigDecimal pricePaid;
     @ApiModelProperty(position = 14, required = true, value = "会员价格ID")
     private String memberPriceId;
-    @ApiModelProperty(position = 15, required = true, value = "支付方式", allowableValues = "ALIPAY,WEPAY,WAPALIPAY,WAPWEPAY,JSWEPAY,APPLETWEPAY,APPIAP")
-    private String payChannel;
-    @ApiModelProperty(position = 16, required = false, value = "苹果支付使用")
+    @ApiModelProperty(position = 15, required = true, value = "支付终端", allowableValues = "app,wap,js,applet")
+    private String deviceFrom;
+    @ApiModelProperty(position = 16, required = true, value = "支付方式", allowableValues = "alipay,wepay")
+    private String payType;
+    @ApiModelProperty(position = 17, required = false, value = "苹果支付使用")
     private String productId;
-    @ApiModelProperty(position = 17, required = false, value = "姓名", example = "王武")
+    @ApiModelProperty(position = 18, required = false, value = "姓名", example = "王武")
     private String name;
-    @ApiModelProperty(position = 18, required = false, value = "身份证件号", example = "111111111111111111")
+    @ApiModelProperty(position = 19, required = false, value = "身份证件号", example = "111111111111111111")
     private String idCard;
-    @ApiModelProperty(position = 19, required = false, value = "微信支付使用")
-    private String authCode;
     @ApiModelProperty(position = 20, required = false, value = "微信支付使用")
+    private String authCode;
+    @ApiModelProperty(position = 21, required = false, value = "微信支付使用")
     private String openId;
-    @ApiModelProperty(position = 21, required = true, value = "未支付/取消支付跳转URL")
+    @ApiModelProperty(position = 22, required = true, value = "未支付/取消支付跳转URL")
     private String showUrl;
-    @ApiModelProperty(position = 22, required = true, value = "支付成功跳转URL")
+    @ApiModelProperty(position = 23, required = true, value = "支付成功跳转URL")
     private String returnUrl;
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -145,7 +145,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         orderVo.setCreatedAt(createdAt);
         orderVo.setMemberName(adamMemberVo.getName());
         orderVo.setMode(param.getMode());
-        orderVo.setPayChannel(param.getPayChannel());
+        orderVo.setPayChannel(param.getPayType());
         orderVo.setState(AdamMemberConst.STATUS_UNPAID);
         orderVo.setUid(CurrentUtil.getCurrentUid());
         orderVo.setPrice(param.getPrice());
@@ -193,7 +193,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
 //                break;
 //        }
         payParam.add("detail", buyType == 0 ? "正在现场 - 购买会员" : "正在现场 - 购买会员码");
-        Map payResult = this.callPayServer(param.getPayChannel(), payParam);
+        Map payResult = this.callPayServer(param.getDeviceFrom(), param.getPayType(), payParam);
 
         AdamMemberOrderResult result = AdamMemberOrderResult.getNew();
         result.setOrderNo(orderVo.getOrderNo());
@@ -325,28 +325,9 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
      * @param payParam 支付参数
      * @return Map
      */
-    private Map callPayServer(String payType, LinkedMultiValueMap<String, String> payParam) {
-        String url = env.getProperty("liquidnet.url-pay.pay");
-        switch (payType) {
-            case "APPALIPAY":
-                url += "/app/alipay";
-                break;
-            case "APPWEPAY":
-                url += "/app/wepay";
-                break;
-            case "WAPALIPAY":
-                url += "/wap/alipay";
-                break;
-            case "WAPWEPAY":
-                url += "/wap/wepay";
-                break;
-            case "JSWEPAY":
-                url += "/js/wepay";
-                break;
-            case "APPLETWEPAY":
-                url += "/applet/wepay";
-                break;
-        }
+    private Map callPayServer(String deviceFrom, String payType, LinkedMultiValueMap<String, String> payParam) {
+        String url = env.getProperty("liquidnet.url-pay.pay") + "/" + deviceFrom + "/" + payType;
+        log.info("HttpUtil.resquest.url:{},param:{}", url, JsonUtils.toJson(payParam));
         String json = HttpUtil.post(url, payParam);
         log.info("HttpUtil.response.body:{}", json);
         return JsonUtils.fromJson(json, Map.class);