bugfix-修改订单线上支付

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

@@ -170,7 +170,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 newOrder.setHasActProduct("0");
             }
             if (StringUtils.isEmpty(newOrder.getOnlinePayFlag())) {
-                newOrder.setOnlinePayFlag("1");
+                newOrder.setOnlinePayFlag("0");
             }
             if (!StringUtils.equals("1", newOrder.getConfirmFlag())) {
                 newOrder.setConfirmFlag("0");

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

@@ -441,11 +441,12 @@ public class CmPayShopController extends BaseController {
         shopOrder.setShouldPayShopAmount(shouldPayShopAmount);
         newShopOrderService.modifyPayShopAmount(shopOrder, orderProducts);
 
-        if(shopOrder.getShopReceiptStatus()==1){
+        /*if(shopOrder.getShopReceiptStatus()==1){
             System.out.println(shopOrder.getShopReceiptStatus());
             logger.info("未付款子订单进了成本修改"+shopOrder.getShouldPayShopAmount()+"-----"+shopOrder.getShopOtherFee());
             double mum= newShopOrder.getProductAmount();
-            mum-= shopOrder.getShopOtherFee()+shopOrder.getShouldPayShopAmount();   //因为成本上升,子订单佣金下降。当成本上升到子订单佣金不大于线上支付最大手续费时不能进行线上支付所以减了第三方
+            mum-= shopOrder.getShopOtherFee()+shopOrder.getShouldPayShopAmount();
+            //因为成本上升,子订单佣金下降。当成本上升到子订单佣金不大于线上支付最大手续费时不能进行线上支付所以减了第三方
             System.out.println(">>>>>>>>子订单佣金"+mum+"----"+shopOrder.getBrokerage());
             double fee=0.0;
             if(shopOrder.getShopOtherFee()>=1000.01){
@@ -463,7 +464,7 @@ public class CmPayShopController extends BaseController {
             if(mum>fee){
                 newOrderDao.updateOnlinePayFlag(0,shopOrder.getOrderID());
             }
-        }
+        }*/
 
         return "redirect:" + Global.getAdminPath() + "/shopOrder/payOrderList";
     }