|
@@ -1179,10 +1179,10 @@ public class SubmitServiceImpl implements SubmitService {
|
|
//佣金和手续费比较,佣金>手续费则可以走当前支付渠道
|
|
//佣金和手续费比较,佣金>手续费则可以走当前支付渠道
|
|
//支持子订单佣金小于最小手续费时,也能进行线上支付,此时不限制支付方式(佣金大于最大手续费或小于最小手续费支持全渠道付款)
|
|
//支持子订单佣金小于最小手续费时,也能进行线上支付,此时不限制支付方式(佣金大于最大手续费或小于最小手续费支持全渠道付款)
|
|
String payWays = "";
|
|
String payWays = "";
|
|
- payWays += bro > WXCharge ? "1" : "";
|
|
|
|
- payWays += bro > AliCharge ? ",2" : "";
|
|
|
|
- payWays += bro > B2CCharge ? ",3" : "";
|
|
|
|
- payWays += bro > 10 ? ",4" : "";
|
|
|
|
|
|
+ payWays += bro >= WXCharge ? "1" : "";
|
|
|
|
+ payWays += bro >= AliCharge ? ",2" : "";
|
|
|
|
+ payWays += bro >= B2CCharge ? ",3" : "";
|
|
|
|
+ payWays += bro >= 10 ? ",4" : "";
|
|
//小于所有的情况下线下补手续费,开放所有渠道
|
|
//小于所有的情况下线下补手续费,开放所有渠道
|
|
if ("".equals(payWays)) {
|
|
if ("".equals(payWays)) {
|
|
payWays = "1,2,3,4";
|
|
payWays = "1,2,3,4";
|
|
@@ -1210,10 +1210,10 @@ public class SubmitServiceImpl implements SubmitService {
|
|
//佣金和手续费比较,佣金>手续费则可以走当前支付渠道
|
|
//佣金和手续费比较,佣金>手续费则可以走当前支付渠道
|
|
//支持子订单佣金小于最小手续费时,也能进行线上支付,此时不限制支付方式(佣金大于最大手续费或小于最小手续费支持全渠道付款)
|
|
//支持子订单佣金小于最小手续费时,也能进行线上支付,此时不限制支付方式(佣金大于最大手续费或小于最小手续费支持全渠道付款)
|
|
String payWays = "";
|
|
String payWays = "";
|
|
- payWays += bro > WXCharge ? "1" : "";
|
|
|
|
- payWays += bro > AliCharge ? ",2" : "";
|
|
|
|
- payWays += bro > B2CCharge ? ",3" : "";
|
|
|
|
- payWays += bro > 10 ? ",4" : "";
|
|
|
|
|
|
+ payWays += bro >= WXCharge ? "1" : "";
|
|
|
|
+ payWays += bro >= AliCharge ? ",2" : "";
|
|
|
|
+ payWays += bro >= B2CCharge ? ",3" : "";
|
|
|
|
+ payWays += bro >= 10 ? ",4" : "";
|
|
//小于所有的情况下线下补手续费,开放所有渠道
|
|
//小于所有的情况下线下补手续费,开放所有渠道
|
|
if ("".equals(payWays)) {
|
|
if ("".equals(payWays)) {
|
|
payWays = "1,2,3,4";
|
|
payWays = "1,2,3,4";
|