Merge remote-tracking branch 'origin/developer' into developerD

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

@@ -1586,26 +1586,24 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         order.getNewShopOrders().get(0).setStatus(1);//已确认
 
 
-        //修改订单状态（余额抵扣）
-        if (order.getPayableAmount() != null) {
-            if (order.getPayableAmount() == 0 && order.getBalancePayFee() != null && order.getBalancePayFee() > 0) {
-                order.setStatus(NewOrderStatus.YISHOU_DAIFA.getCode());
-                order.setReceiptStatus("3");
-            } else if (order.getPayableAmount() != 0 && order.getBalancePayFee() != null && order.getBalancePayFee() > 0) {
-                order.setStatus(NewOrderStatus.BUSHOU_DAIFA.getCode());
-                order.setReceiptStatus("2");
-            }
-        }
+//        //修改订单状态（余额抵扣）
+//        if (order.getPayableAmount() != null) {
+//            if (order.getPayableAmount() == 0 && order.getBalancePayFee() != null && order.getBalancePayFee() > 0) {
+//                order.setStatus(NewOrderStatus.YISHOU_DAIFA.getCode());
+//                order.setReceiptStatus("3");
+//            } else if (order.getPayableAmount() != 0 && order.getBalancePayFee() != null && order.getBalancePayFee() > 0) {
+//                order.setStatus(NewOrderStatus.BUSHOU_DAIFA.getCode());
+//                order.setReceiptStatus("2");
+//            }
+//        }
 
         //        order.getBalancePayFee()
         Double balancePayFee = order.getNewShopOrders().get(0).getAccountAmount();
         //修改子订单状态（余额抵扣）
-        if (order.getNewShopOrders().get(0).getRealPay() != null) {
+        if (order.getNewShopOrders().get(0).getUseBalanceFlag() !=null&&order.getNewShopOrders().get(0).getUseBalanceFlag() == 1) {
             if ( balancePayFee != null && balancePayFee ==order.getNewShopOrders().get(0).getRealPay()) {
-                order.getNewShopOrders().get(0).setStatus(Integer.valueOf(NewOrderStatus.YISHOU_DAIFA.getCode()));
                 order.getNewShopOrders().get(0).setReceiptStatus("3");
             } else if ( balancePayFee != null && balancePayFee <order.getNewShopOrders().get(0).getRealPay()) {
-                order.getNewShopOrders().get(0).setStatus(Integer.valueOf(NewOrderStatus.BUSHOU_DAIFA.getCode()));
                 order.getNewShopOrders().get(0).setReceiptStatus("2");
           }
         }