Browse Source

修改后付款状态修改BUG处理

anderx 6 years ago
parent
commit
785279fc75

+ 9 - 6
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -249,12 +249,15 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		// 1 大于
 		//liquidation_status 清算状态 0-首付待付请,1-尾款待付清,2-已付请,3-部分退款,4-全部退款
 		//settlement_amount 已付  total_amount 总价格   first_amount首付
-		if(t2.getSettlementAmount().compareTo(t2.getTotalAmount()) == 0){//如果已付等于总价
-			t.setLiquidationStatus(LiquidationNewState.ALREADY_PAY.getCode());
-		}else if(t2.getSettlementAmount().compareTo(t2.getFirstAmount()) >= 0){//如果大于等于首付
-			t.setLiquidationStatus(LiquidationNewState.WAIT_PAY_LAST_BALANCE.getCode());
-		} else if(t2.getSettlementAmount().compareTo(t2.getFirstAmount()) <= 0){//如果大于等于首付
-			t.setLiquidationStatus(LiquidationNewState.WAIT_PAY_FIRST_BALANCE.getCode());
+		if(t2.getLiquidationStatus()!=LiquidationNewState.FULL_REFUND.getCode()) {
+			if(t2.getSettlementAmount().compareTo(t.getTotalAmount()) == 0){//如果已付等于总价
+				t.setLiquidationStatus(LiquidationNewState.ALREADY_PAY.getCode());
+			}else if(t2.getSettlementAmount().compareTo(t.getFirstAmount()) >= 0){//如果大于等于首付
+				t.setLiquidationStatus(LiquidationNewState.WAIT_PAY_LAST_BALANCE.getCode());
+			} else if(t2.getSettlementAmount().compareTo(t.getFirstAmount()) < 0){//如果小于首付
+				t.setLiquidationStatus(LiquidationNewState.WAIT_PAY_FIRST_BALANCE.getCode());
+			}
+			
 		}
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}