Browse Source

修改订单取消逻辑

wanghui 8 years ago
parent
commit
1c629f30ec

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -269,7 +269,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		}else if(orderAction == OrderAction.APPLY_FOR_CANCEL){ //取消订单
 			boolean flag = true;
 			if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_CONFIRM.getCode()
-					|| tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()){
+					&& tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()){
 				flag = false;
 			}
 			if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()