Browse Source

变更完成金额重新计算

anderx 3 years ago
parent
commit
9d4be4678a

+ 28 - 0
src/main/java/com/goafanti/common/utils/OrderUtils.java

@@ -0,0 +1,28 @@
+package com.goafanti.common.utils;
+
+import com.goafanti.common.model.TOrderNew;
+
+import java.math.BigDecimal;
+
+public class OrderUtils {
+
+
+    public static int getLiquidationStatus(TOrderNew t){
+        if (t.getSettlementAmount().compareTo(t.getFirstAmount())<0)return 0;
+        else if (t.getSettlementAmount().compareTo(t.getFirstAmount())>-1
+          &&t.getSettlementAmount().compareTo(t.getTotalAmount())<0)return 1;
+        else{
+            return 2;
+        }
+    }
+
+    public static int getLiquidationStatus(BigDecimal total,BigDecimal first,BigDecimal settlement){
+        TOrderNew t=new TOrderNew();
+        t.setTotalAmount(total);
+        t.setFirstAmount(first);
+        t.setSettlementAmount(settlement);
+        return getLiquidationStatus(t);
+    }
+
+
+}

+ 6 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.goafanti.admin.service.DepartmentService;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.model.*;
+import com.goafanti.common.utils.OrderUtils;
 import com.goafanti.order.service.*;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -108,6 +109,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	private OrderProjectService orderProjectService;
 
 
+
 	@Override
 	public int addOrderChange(NewOrderChangeBo t,String startRemarks) {
 		TOrderNew ton=new TOrderNew();
@@ -764,6 +766,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		userMidMapper.updateByUid(um);
 		//如果合同不是空,则修改合同
 		if (nob.getContractPictureUrl()!=null)o.setContractPictureUrl(nob.getContractPictureUrl());
+		//清算状态 0-首付待付请,1-尾款待付清,2-已付请,3-部分退款,4-全部退款
+		o.setLiquidationStatus(OrderUtils.getLiquidationStatus(o));
 		tOrderNewMapper.updateByPrimaryKeySelective(o);
 		tOrderMidMapper.updateCountProjectAndType(o.getOrderNo());
 		return o;
@@ -771,6 +775,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 
 
+
+
 	private void pushTaskAndDun(Integer id,TOrderNew o) {
 		List<TChangeTaskOut> listct=tChangeTaskMapper.selectByCid(id,3);
 		HashMap<Integer, Integer> map=changeAddOrderTask(listct,null);

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

@@ -50,7 +50,7 @@ yxy_max=100
 yxjl_max=100
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.45
+static.host=//static.jishutao.com/1.2.46
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.27
 #static.host=http://172.16.1.187/prod/1.2.25

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

@@ -47,7 +47,7 @@ yxzj_max=800
 yxy_max=100
 yxjl_max=100
 
-static.host=//static.jishutao.com/1.2.45
+static.host=//static.jishutao.com/1.2.46
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload