Browse Source

修改订单状态

wanghui 8 years ago
parent
commit
5ccd6e29e1

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

@@ -389,12 +389,14 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					active.setConfirmIntention(false);
 					active.setRefuseIntention(false);
 				}
-				if (tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()) {
+				if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_CONFIRM.getCode()
+						&&tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()) {
 					active.setPayForFirst(true); //支付首付
 				} else {
 					active.setPayForFirst(false); //支付首付
 				}
-				if (tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()) {
+				if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_CONFIRM.getCode()
+						&& tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()) {
 					active.setPayForLast(true); //支付尾款
 				} else {
 					active.setPayForLast(false); //支付尾款