Merge branch 'feature/0416_pay' into develop-new

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/PaymentMerchantConfig.java

@@ -143,6 +143,10 @@ public class PaymentMerchantConfig implements Serializable {
     @TableField(value = "alipay_content_sign_key_")
     private String aliPayContentSignKey;
 
+    @ApiModelProperty("支付渠道，三方渠道设置有效 alipay,wxpay")
+    @TableField(value = "pay_channel_")
+    private String payChannel;
+
     @ApiModelProperty("启用标识")
     @TableField(value = "status_")
     private Boolean status;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserPaymentCoreServiceImpl.java

@@ -1099,6 +1099,9 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
                 throw new BizException("平台主账户信息不存在");
             }
             resp.setPaymentVendor(merchantConfig.getPaymentVendor());
+            if (StringUtils.isNotEmpty(merchantConfig.getPayChannel())) {
+                resp.setPaymentChannels(Arrays.asList(merchantConfig.getPayChannel().split(",")));
+            }
         }
         return resp;
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/PaymentMerchantConfigMapper.xml

@@ -22,6 +22,7 @@
         , t.alipay_app_id_ AS alipayAppId
         , t.alipay_private_key_ AS alipayPrivateKey
         , t.alipay_public_key_ AS alipayPublicKey
+        , t.pay_channel_ AS payChannel
         , t.create_time_ AS createTime
         , t.update_time_ AS updateTime
         </sql>