Browse Source

合同变更开发

anderx 6 years ago
parent
commit
2eef3ed2e8

+ 2 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -17,6 +17,8 @@ public class AFTConstants {
 
 	public static final String	APPROVAL_DECISION					= "99999";				// 特批决策者
 	
+	public static final String	CED									= "999998";				// 总裁
+		
 	public static final String  TECH_ADMIN                          = "99998";				// 技术管理员
 
 	public static final String	AREAADMIN							= "";					// 地区管理员

+ 2 - 0
src/main/java/com/goafanti/common/dao/TOrderDunMapper.java

@@ -107,4 +107,6 @@ public interface TOrderDunMapper {
 	List<OrderDunTaskBo> getTaskAllOrderDun();
 
 	int checkOrderDun(@Param("dunSubject")Integer dunSubject, @Param("orderNo")String orderNo);
+
+	List<TOrderDun> selectByOrderNo(String orderNo);
 }

+ 104 - 0
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -422,5 +422,109 @@
   select count(*) from new_order_change
 	where status != 4 and order_no= #{orderNo}
   </select>
+  <select id="selectOrderChangeList" resultType="com.goafanti.order.bo.NewOderCahngeListBo">
+  	select a.order_no orderNo, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes,c.nickname,b.order_type orderType, 
+  date_format(b.create_time,'%Y-%m-%d %H:%i:%S')establishTimes, b.order_status orderStatus,b.total_amount totalAmount,
+  b.settlement_amount settlementAmount,(b.total_amount-b.settlement_amount) arrears,d.name salesmanName,e.name depName,
+  a.process_state processState from new_order_change a left join t_order_new b on a.order_no=b.order_no 
+  left join user c on b.buyer_id=c.id left join admin d on b.salesman_id=d.id left join department e on b.order_dep=e.id 
+	<if test="processState==2 or processState==3 "> 
+	left join t_order_task f on a.order_no=f.order_no
+	</if> 
+	where 1=1
+	<if test="processState==0">
+	and b.salesman_id= #{aid}
+	</if>
+	<if test="processState==1">
+	and b.order_dep in
+  	<foreach close=")" collection="deps" item="deps" open="(" separator=",">
+	 #{deps.id}
+  	</foreach>
+	</if>
+	<if test="processState==2 or processState==3 ">
+	and(f.task_receiver=#{aid} or f.task_allocator=#{aid})
+	</if>
+	<if test="processState==5">
+	and b.finance_id =#{aid}
+	</if>
+	<if test="userName !=null">
+	and c.nickname like concat('%',#{userName},'%')
+	</if>
+	<if test="timeType == 0 and startTime !=null and endTime !=null">
+	and a.create_time between #{startTime} and #{endTime}
+	</if>
+	<if test="timeType == 1 and startTime !=null and endTime !=null">
+	and b.create_time between #{startTime} and #{endTime}
+	</if>
+	<if test="depId !=null">
+	and b.order_dep = #{depId}
+	</if>
+	<if test="salesmanName !=null">
+	and d.name like concat('%',#{salesmanName},'%')
+	</if>
+	<if test="complete ==0">
+	 and a.process_state &gt;= #{processState}
+	</if>
+	<if test="complete ==1 and processState != 5">
+	 and a.process_state = #{processState}
+	</if>
+	<if test="complete ==1 and processState == 5">
+	 and a.process_state in(#{processState},9)  and a.status !=4
+	</if>
+	<if test="complete ==2">
+	 and a.process_state &gt; #{processState}
+	</if>
+	order by a.create_time 
+	<if test="page_sql != null">
+			${page_sql}
+	</if>
+  </select>
   
+  <select id="selectOrderChangeCount" resultType="java.lang.Integer">
+  select count(*) from new_order_change a left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id 
+  left join admin d on b.salesman_id=d.id left join department e on b.order_dep=e.id
+	<if test="processState==2 or processState==3 "> 
+	left join t_order_task f on a.order_no=f.order_no
+	</if> 
+	where 1=1
+	<if test="processState==0">
+	and b.salesman_id= #{aid}
+	</if>
+	<if test="processState==1">
+	and b.order_dep in
+  	<foreach close=")" collection="deps" item="deps" open="(" separator=",">
+	 #{deps.id}
+  	</foreach>
+	</if>
+	<if test="processState==2 or processState==3 ">
+	and(f.task_receiver=#{aid} or f.task_allocator=#{aid})
+	</if>
+	<if test="processState==5">
+	and b.finance_id =#{aid}
+	</if>
+	<if test="userName !=null">
+	and c.nickname like concat('%',#{userName},'%')
+	</if>
+	<if test="timeType == 0 and startTime !=null and endTime !=null">
+	and a.create_time between #{startTime} and #{endTime}
+	</if>
+	<if test="timeType == 1 and startTime !=null and endTime !=null">
+	and b.create_time between #{startTime} and #{endTime}
+	</if>
+	<if test="depId !=null">
+	and b.order_dep = #{depId}
+	</if>
+	<if test="salesmanName !=null">
+	and d.name like concat('%',#{salesmanName},'%')
+	</if>
+	<if test="complete ==0">
+	 and a.process_state &gt;= #{processState}
+	</if>
+	<if test="complete ==1">
+	 and a.process_state = #{processState}
+	</if>
+	<if test="complete ==2">
+	 and a.process_state &gt; #{processState}
+	</if>
+	</select>
 </mapper>

+ 2 - 1
src/main/java/com/goafanti/common/mapper/OrderChangeLogMapper.xml

@@ -317,8 +317,9 @@
   </update>
   <select id="selectOrderChangeLogList" resultType="com.goafanti.order.bo.OrderChangeLogBo">
   select a.id,a.change_id changeId,a.order_no orderNo,a.status,a.remarks,a.auditor,a.create_time createTime,
-		date_format(a.create_time,'%Y-%m-%d %H:%I:%S')createTimes ,b.name aname
+		date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes ,b.name aname
 		from order_change_log a left join admin b on a.auditor=b.id
 		where a.change_id= #{changeId}
+		order by a.create_time
   </select>
 </mapper>

+ 7 - 0
src/main/java/com/goafanti/common/mapper/TOrderDunMapper.xml

@@ -369,6 +369,13 @@
   	select id,dun_subject as dunSubject,money,order_no as orderNo,dun_status as dunStatus from t_order_dun 
     where order_no= #{orderNo,jdbcType=VARCHAR} order by dun_subject 
   </select>
+  
+  <select id="selectByOrderNo" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_order_dun
+    where order_no= #{orderNo,jdbcType=VARCHAR} order by dun_subject 
+  </select>
   <select id="getOrderDunData" resultType="com.goafanti.order.bo.TOrderNewBo">
 select a.id,a.order_no as orderNo,date_format(b.sign_time,'%Y-%m-%d') as signDate,
     c.nickname as userName,b.order_status as orderStatus,b.total_amount as totalAmount,

+ 90 - 0
src/main/java/com/goafanti/order/bo/NewOderCahngeListBo.java

@@ -0,0 +1,90 @@
+package com.goafanti.order.bo;
+
+public class NewOderCahngeListBo {
+	private String orderNo;
+	private String createTimes;
+	private String nickname;
+	private Integer orderType;
+	private String establishTimes;
+	private Integer orderStatus;
+	private String totalAmount;
+	private String settlementAmount;
+	private String arrears;
+	private String salesmanName;
+	private String depName;
+	private Integer processState;
+	public String getCreateTimes() {
+		return createTimes;
+	}
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
+	public String getNickname() {
+		return nickname;
+	}
+	public void setNickname(String nickname) {
+		this.nickname = nickname;
+	}
+	public Integer getOrderType() {
+		return orderType;
+	}
+	public void setOrderType(Integer orderType) {
+		this.orderType = orderType;
+	}
+	public String getEstablishTimes() {
+		return establishTimes;
+	}
+	public void setEstablishTimes(String establishTimes) {
+		this.establishTimes = establishTimes;
+	}
+	public Integer getOrderStatus() {
+		return orderStatus;
+	}
+	public void setOrderStatus(Integer orderStatus) {
+		this.orderStatus = orderStatus;
+	}
+	public String getTotalAmount() {
+		return totalAmount;
+	}
+	public void setTotalAmount(String totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+	public String getSettlementAmount() {
+		return settlementAmount;
+	}
+	public void setSettlementAmount(String settlementAmount) {
+		this.settlementAmount = settlementAmount;
+	}
+	public String getArrears() {
+		return arrears;
+	}
+	public void setArrears(String arrears) {
+		this.arrears = arrears;
+	}
+	public String getSalesmanName() {
+		return salesmanName;
+	}
+	public void setSalesmanName(String salesmanName) {
+		this.salesmanName = salesmanName;
+	}
+	public String getDepName() {
+		return depName;
+	}
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public Integer getProcessState() {
+		return processState;
+	}
+	public void setProcessState(Integer processState) {
+		this.processState = processState;
+	}
+	
+	
+}

+ 3 - 1
src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java

@@ -1,5 +1,7 @@
 package com.goafanti.order.bo;
 
+import com.goafanti.common.utils.StringUtils;
+
 public class TOrderTaskDetailBo {
 	private String id;
 	private String taskName;
@@ -80,7 +82,7 @@ public class TOrderTaskDetailBo {
 		return outsourcePrice;
 	}
 	public void setOutsourcePrice(String outsourcePrice) {
-		this.outsourcePrice = outsourcePrice;
+		if(StringUtils.isNotBlank(outsourcePrice))this.outsourcePrice = outsourcePrice;
 	}
 	public Integer getLocationProvince() {
 		return locationProvince;

+ 1 - 1
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -151,7 +151,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 		if(i>0){
 			res.setData("新增收款记录成功!");
 		}else if(i == -3){
-			res.getError().add(buildError("", "该订单的任务还没有分配给咨询师不能收完全款!"));
+			res.getError().add(buildError("", "订单变更锁定中"));
 		}else if(i == -2){
 			res.getError().add(buildError("", "订单编号错误!"));
 		}else{

+ 14 - 2
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -14,6 +14,7 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.order.bo.NewOrderChangeBo;
+import com.goafanti.order.bo.OrderChangeBo;
 import com.goafanti.order.service.OrderChangeService;
 
 @RestController
@@ -58,7 +59,7 @@ public class OrderChangeApiController extends CertifyApiController {
 	 *   变更审核
 	 */
 	@RequestMapping(value = "/orderChangeAudit", method = RequestMethod.POST)
-	public Result orderChangeAudit(String orderNo,String remarks,Integer status){
+	public Result orderChangeAudit(String orderNo,String remarks,Integer status,Integer processState){
 		Result res = new Result();
 		if(null==orderNo){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "订单编号", "订单编号"));
@@ -72,7 +73,7 @@ public class OrderChangeApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "审核批示", "审核批示"));
 			return res;
 		}
-		res.setData(orderChangeService.pushOrderChangeAudit( orderNo, remarks, status));
+		res.setData(orderChangeService.pushOrderChangeAudit( orderNo, remarks, status, processState));
 		return res;
 	}
 	/**
@@ -98,4 +99,15 @@ public class OrderChangeApiController extends CertifyApiController {
 		res.setData(handleFile(res, "/order_change_file/", false, req, sign));
 		return res;
 	}
+	/**
+	 *  变更列表
+	 */
+	@RequestMapping(value ="/orderChangeList",method = RequestMethod.GET)
+	public Result orderChangeList(String userName,Integer  processState,Integer timeType,String startTime,String endTime,
+			String depId,String salesmanName,Integer complete,Integer pageSize, Integer pageNo) {
+		Result res =new Result();
+		res.data(orderChangeService.selectOrderChangeList( userName,  processState, timeType, startTime, endTime,
+				depId, salesmanName, complete,pageSize,  pageNo));
+		return res;
+	}
 }

+ 6 - 1
src/main/java/com/goafanti/order/service/OrderChangeService.java

@@ -2,6 +2,7 @@ package com.goafanti.order.service;
 
 import java.util.List;
 
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
 
@@ -11,10 +12,14 @@ public interface OrderChangeService {
 
 	NewOrderChangeBo orderChangeDetails(String orderNo);
 
-	int pushOrderChangeAudit(String orderNo, String remarks, Integer status);
+	int pushOrderChangeAudit(String orderNo, String remarks, Integer status,Integer processState);
 
 	boolean checkOderNo(String orderNo);
 
 	List<OrderChangeLogBo> selectOrderChangeLogList(String changeId);
 
+	Pagination<NewOrderChangeBo> selectOrderChangeList(String userName,Integer  processState,Integer timeType,String startTime,String endTime,
+			String depId,String salesmanName,Integer complete,Integer pageSize, Integer pageNo);
+
+
 }

+ 3 - 0
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -30,6 +30,7 @@ import com.goafanti.common.dao.TOrderRefundMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.OrderLogProcess;
+import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.TOrderBack;
 import com.goafanti.common.model.TOrderBillNew;
@@ -201,9 +202,11 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		BigDecimal bill = billNewMapper.getAmountByOid(billNew.getOrderNo());
 		//获得的单个订单金额数据(首付金额和总金额)
 		TOrderNew o = tOrderNewMapper.selectByPrimaryKey(billNew.getOrderNo());
+		
 		if(null == o){
 			return -2;
 		}
+		if(o.getDeleteSign()==3)return -3;
 		BigDecimal bd = bill.add(billNew.getTransactionAmount().abs());
 		//奖金信息
 		TOrderBonus bonus = new TOrderBonus();

+ 54 - 12
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -1,26 +1,36 @@
 package com.goafanti.order.service.impl;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.common.bo.Error;
 import com.goafanti.common.dao.NewOrderChangeMapper;
 import com.goafanti.common.dao.OrderChangeLogMapper;
 import com.goafanti.common.dao.TOrderDunMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
+import com.goafanti.common.error.BusinessException;
+import com.goafanti.common.model.NewOrderChange;
 import com.goafanti.common.model.OrderChangeLog;
 import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderNew;
+import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.NewOrderChangeBo;
+import com.goafanti.order.bo.OrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.service.OrderChangeService;
+import com.goafanti.order.service.OrderService;
 @Service
 public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper> implements OrderChangeService {
 	@Autowired
@@ -34,6 +44,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Autowired
 	private TOrderTaskMapper	tOrderTaskMapper;
 	@Autowired
+	private OrderService	orderService;
+	@Autowired
 	private JDBCIdGenerator	idGenerator;
 	
 	
@@ -43,7 +55,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		TOrderNew ton=new TOrderNew();
 		ton.setOrderNo(t.getOrderNo());
 		ton.setDeleteSign(2);//将订单置为锁定
-		t.setProcessState(2);//设置营销管理员来审核
+		t.setProcessState(1);//设置营销管理员来审核
 		tOrderNewMapper.updateByPrimaryKeySelective(ton);
 		newOrderChangeMapper.insertSelective(t);
 		NewOrderChangeBo ncb=newOrderChangeMapper.selectByorderNo(t.getOrderNo());
@@ -62,27 +74,35 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		return nb;
 	}
 	@Override
-	public int pushOrderChangeAudit(String orderNo, String remarks, Integer status) {
+	public int pushOrderChangeAudit(String orderNo, String remarks, Integer status,Integer processState) {
 		NewOrderChangeBo nb=newOrderChangeMapper.selectByorderNo(orderNo);
+		if (processState==null||(nb.getProcessState()!=9&&processState !=nb.getProcessState()) ) {
+			throw new BusinessException(new Error( "变更流程与您所操作流程不匹配","变更流程与您所操作流程不匹配"));
+		}
+		if (nb.getStatus()==4) {
+			throw new BusinessException(new Error( "变更流程已通过审核","变更流程已通过审核"));
+		}
 		//2通过 3驳回
 		if (status==2) {
 			//变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送
 			if(nb.getType()==0){
 				if (nb.getChangeAmount().compareTo(new BigDecimal("0.2"))<0) {//小于则总裁通过,大于则董事长
-					if(nb.getProcessState()==7) {changgeAdopt(nb);}//项目变更通过
+					if(nb.getProcessState()==7) {//项目变更通过
+						changgeAdopt(nb);}else {nb.setProcessState(nb.getProcessState()+1);}
 				}else {
-					if(nb.getProcessState()==8) {changgeAdopt(nb);}//项目变更通过
+					if(nb.getProcessState()==8) {//项目变更通过
+						changgeAdopt(nb);}else {nb.setProcessState(nb.getProcessState()+1);}
 				}
 				
-				nb.setProcessState(nb.getProcessState()+1);
+				
 			}else {
-				if(nb.getProcessState()==5) {changgeAdopt(nb);}//项目变更通过
-				//流程状态 1营销员 2营销管理员 3技术员 4技术经理 5技术总监 5财务专员 6财务总监 7总裁 8董事长
-				if (nb.getProcessState()==2)nb.setProcessState(7);
-				if (nb.getProcessState()==7)nb.setProcessState(5);
+				if(nb.getProcessState()==9) {changgeAdopt(nb);}//项目变更通过
+				//流程状态 0营销员 1营销管理员 2技术员 3技术经理 4技术总监 5财务专员(退单) 6财务总监 7总裁 8董事长 9 财务专员(非退单)
+				if (nb.getProcessState()==1) nb.setProcessState(7);
+				else if (nb.getProcessState()==7)nb.setProcessState(9);
 			}
 		}else {
-			nb.setProcessState(1);
+			nb.setProcessState(0);
 		}
 		OrderChangeLog ocl=new OrderChangeLog();
 		ocl.setAuditor(TokenManager.getAdminId());
@@ -96,7 +116,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 	private void changgeAdopt(NewOrderChangeBo nb) {
 		TOrderNew t1=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
-		List<TOrderDun> td1=tOrderDunMapper.selectByOrderNoDunSubject(nb.getOrderNo());
+		List<TOrderDun> td1=tOrderDunMapper.selectByOrderNo(nb.getOrderNo());
 		List<TOrderTaskBo> tt1=tOrderTaskMapper.selectOrderTask(nb.getOrderNo());
 		String newOrderNo=idGenerator.generateId().toString();
 		t1.setOrderNo(newOrderNo);
@@ -107,10 +127,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			tOrderTaskMapper.insertSelective(tOrderTaskBo);
 		}
 		for (TOrderDun tOrderDun : td1) {
-			tOrderDun.setId(null);
+			tOrderDun.setId(UUID.randomUUID().toString());
 			tOrderDun.setOrderNo(newOrderNo);
 			tOrderDunMapper.insertSelective(tOrderDun);
 		}
+		nb.setStatus(4);
 		//将订单恢复正常
 		TOrderNew orderNew =new TOrderNew();
 		orderNew.setOrderNo(nb.getOrderNo());
@@ -131,6 +152,27 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	public List<OrderChangeLogBo> selectOrderChangeLogList(String changeId) {
 		return orderChangeLogMapper.selectOrderChangeLogList(changeId);
 	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<NewOrderChangeBo> selectOrderChangeList(String userName,Integer  processState,Integer timeType,String startTime,String endTime,
+			String depId,String salesmanName,Integer complete,Integer pageSize, Integer pageNo) {
+		Map<String, Object> parameter=new HashMap<String, Object>();
+		if(pageSize==null||pageSize<0)pageSize=10;
+		if(pageNo==null||pageNo<0)pageNo=1;
+		parameter.put("processState", processState==null?0:processState);
+		parameter.put("complete", complete==null?0:complete);
+		if (StringUtils.isNotBlank(userName)) parameter.put("userName", userName);
+		if (null!=processState) parameter.put("processState", processState);
+		if (null!=timeType) parameter.put("timeType", timeType);
+		if (StringUtils.isNotBlank(startTime)) parameter.put("startTime", startTime);
+		if (StringUtils.isNotBlank(endTime)) parameter.put("endTime", endTime+" 23:59:59");
+		if (StringUtils.isNotBlank(depId)) parameter.put("depid", depId);
+		if (StringUtils.isNotBlank(salesmanName)) parameter.put("salesmanName", salesmanName);
+		parameter.put("aid", TokenManager.getAdminId());
+		parameter.put("deps", orderService.selectMyDeps());
+		Pagination<NewOrderChangeBo> data = (Pagination<NewOrderChangeBo>)findPage("selectOrderChangeList", "selectOrderChangeCount", parameter, pageNo, pageSize);
+		return data;
+	}
 	
 
 }

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

@@ -209,6 +209,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public int updateServiceOrder(TOrderNew t, Integer isSubmit) {
 		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		if(t2.getDeleteSign()==3)throw new BusinessException(new Error( "订单变更锁定中","订单变更锁定中"));
 		//判断手机号码是否存在
 		if (StringUtils.isNotBlank(t.getContacts())&&StringUtils.isNotBlank(t.getContactMobile())&&
 				organizationContactBookMapper.checkContacts(t2.getBuyerId(), t2.getContactMobile(),TokenManager.getAdminId()==null?"1":TokenManager.getAdminId() )>0) {

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

@@ -181,7 +181,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		task.setArrivalMoney(t.getArrivalMoney());
 		task.setSetUpAmount(t.getSetUpAmount());
 		task.setOutsourceName(t.getOutsourceName());
-		task.setOutsourcePrice(new BigDecimal(t.getOutsourcePrice()));
+		if(StringUtils.isNotBlank(t.getOutsourcePrice()))task.setOutsourcePrice(new BigDecimal(t.getOutsourcePrice()));
 		TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
 		//根据修改的修改订单法人与联系人
 		if(StringUtils.isNotEmpty(t.getContacts()))tn.setContacts(t.getContacts());

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

@@ -65,7 +65,7 @@ avatar.host=//sb.jishutao.com
 
 #连测试
 #avatar.host=//static.jishutao.com
-#static.host=//static.jishutao.com/1.1.14
+#static.host=//static.jishutao.com/1.1.15
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload