fix 订单状态

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -507,7 +507,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         //订单0元
         if (payPrice.compareTo(BigDecimal.ZERO) == 0) {
             //完全收费
-            add.setOrderStatus(Order.PAY_FULL);
+            add.setOrderStatus(Order.ORDER_STATUS_PAY);
             add.setStatus(1);
         }
 
@@ -646,7 +646,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         }
 
         add.setOrderSn(out_trade_no);
-        if(Validator.isNotEmpty(bo.getOrderFrom())){
+        if(Validator.isNotEmpty(bo.getOrderFrom())&&bo.getOrderFrom()==6){
             add.setOrderFrom(bo.getOrderFrom());
         }else{
             add.setOrderFrom(Order.FROM_INPUT);