Merge remote-tracking branch 'origin/master'

pay/pay_config.go

@@ -21,3 +21,17 @@ func JudgePayChannel(mid, paySceneIdentifier string) (model.PayChannelMaster, er
 	}
 	return payChannelMaster, nil
 }
+
+//支付方式获取
+func JudgePayChannelPayType(channelId string) (model.PayChannel, error) {
+	var payChannel = model.PayChannel{}
+	res, err := db.Db.Where("id = ? and is_use=?", channelId, 1).Get(&payChannel)
+	if err != nil {
+		return payChannel, err
+	}
+	if !res {
+		return payChannel, errors.New("查询数据失败")
+	}
+
+	return payChannel, nil
+}