瀏覽代碼

Merge branch 'test' of jishutao/kede-server into prod

anderx 6 年之前
父節點
當前提交
c3f08ae654

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

@@ -249,10 +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());
+		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);
 	}

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -60,7 +60,7 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com/1.1.15
+static.host=//sb.jishutao.com/1.1.16
 avatar.host=//sb.jishutao.com
 
 #连测试

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.jishutao.com/1.1.14
+static.host=//static.jishutao.com/1.1.16
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload