bugfix

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -693,7 +693,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                             }
                             //有优惠金额，最高手续费=支付金额*0.65%>10取0.65，不大于取10（合利宝最高0.65%）
                             double realPay = shopOrder.getRealPay();
-                            double charge = MathUtil.mul(realPay, 0.0065, 2).doubleValue() > 10 ? MathUtil.mul(realPay, 0.0065, 2).doubleValue() : 10;
+//                            double charge = MathUtil.mul(realPay, 0.0065, 2).doubleValue() > 10 ? MathUtil.mul(realPay, 0.0065, 2).doubleValue() : 10;
                             //佣金>最高手续费可以线上，否则线下
                             double bro = MathUtil.sub(realPay, shopOrder.getShouldPayShopAmount()).doubleValue();
                             if (bro < 0) {
@@ -705,10 +705,10 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                                 //佣金和手续费比较,佣金>手续费则可以走当前支付渠道
                                 //支持子订单佣金小于最小手续费时，也能进行线上支付，此时不限制支付方式(佣金大于最大手续费或小于最小手续费支持全渠道付款)
                                 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)) {
                                     payWays = "1,2,3,4";
@@ -736,10 +736,10 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                                 //佣金和手续费比较,佣金>手续费则可以走当前支付渠道
                                 //支持子订单佣金小于最小手续费时，也能进行线上支付，此时不限制支付方式(佣金大于最大手续费或小于最小手续费支持全渠道付款)
                                 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)) {
                                     payWays = "1,2,3,4";

src/main/java/com/caimei/modules/order/web/CmPayShopController.java

@@ -628,7 +628,7 @@ public class CmPayShopController extends BaseController {
             flag = 1;
         } else {
             Integer val = newOrderDao.getSplitTime(shopOrderId);
-            if (val < 0) {
+            if (val <= 0) {
                 flag = 1;
             }
         }