Bladeren bron

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

anderx 5 jaren geleden
bovenliggende
commit
83b9b86733

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

@@ -135,4 +135,6 @@ public interface UserLockReleaseMapper {
 
 	void updateReleaseUser(String orderNo);
 
+	void updateByAidAndUid(@Param("aid")String aid, @Param("uid")String uid);
+
 }

+ 6 - 0
src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml

@@ -513,4 +513,10 @@
 	where a.order_no = #{orderNo} and a.buyer_id =b.id  
 	and a.buyer_id =c.uid and a.salesman_id =c.aid and c.follow_situation =5
   </update>
+  
+  <update id="updateByAidAndUid">
+  	update user_lock_release 
+	set status =2,release_time =now()
+	where aid= #{aid} and uid= #{uid} and `type` =0
+  </update>
 </mapper>

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

@@ -177,9 +177,12 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			//设置催款触发
 			TOrderNew b=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
 			if(b.getApproval()==0)orderNewService.pushOrderDun(t.getOrderNo());
+			//未锁定客户就锁定客户
 			if (userMapper.checkLock(tn.getBuyerId())<1) {
+				userLockReleaseMapper.updateByAidAndUid(tn.getSalesmanId(),tn.getBuyerId());
 				userMapper.updateShareType(tn.getBuyerId(),tn.getSalesmanId());
 			}
+			//未锁定业务就锁定业务
 			if (userLockReleaseMapper.checkLock(tn.getSalesmanId(),tn.getBuyerId(),t.getCommodityId())<1) {
 				UserLockRelease ulr=new UserLockRelease();
 				ulr.setId(UUID.randomUUID().toString());
@@ -201,6 +204,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				ub.setUpdateTime(date);
 				ub.setRemarks("派单自动锁定客户");
 				ub.setBusinessProjectId(t.getCommodityId());
+				userLockReleaseMapper.updateByAidAndUid(tn.getSalesmanId(),tn.getBuyerId());
 				userBusinessMapper.insertSelective(ub);
 		}else if (specially==0) {
 			addOrderLog(t.getOrderNo(), OrderLogProcess.XMPD.getCode(),remarks);