Browse Source

update

Signed-off-by: anderx <anderx@qq.com>
anderx 5 years ago
parent
commit
4e79bf4298

File diff suppressed because it is too large
+ 917 - 918
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java


+ 1 - 1
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -118,6 +118,6 @@ public interface TOrderTaskMapper {
 
 	int insertSelectiveGetId(TOrderTask tn);
 
-	List<Integer> getLockId(@Param("orderNo")String orderNo, @Param("aid")String aid, @Param("uid")String uid);
+	List<String> getLockId(@Param("orderNo")String orderNo, @Param("aid")String aid, @Param("uid")String uid);
 
 }

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

@@ -130,7 +130,7 @@ public interface UserLockReleaseMapper {
 
 	int selectByUidGetCount(@Param("aid")String aid, @Param("uid")String uid);
 
-	void updateReleaseList( @Param("list")List<Integer> list);
+	void updateReleaseList( @Param("list")List<String> list);
 
 	void updateReleaseUser(String orderNo);
 

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

@@ -1798,7 +1798,7 @@ select
   <update id="updateByOutsourceToOrderNo">
   	update t_order_task set outsource= #{type} where order_no= #{orderNo}
   </update>
-  <select id="getLockId" resultType="java.lang.Integer">
+  <select id="getLockId" resultType="java.lang.String">
      select id from user_lock_release a left join (select commodity_id  from t_order_task 
    where order_no = #{orderNo} GROUP by commodity_id ) 
    b on a.business_project_id =b.commodity_id 

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

@@ -501,7 +501,7 @@
   </update>
   <select id="selectByUidGetCount" resultType="java.lang.Integer">
   select count(*) from user_lock_release 
-  	where `type` =1 and aid = #{aid} and uid= #{uid} 
+  	where `type` =1 and status=0 and aid = #{aid} and uid= #{uid} 
   </select>
   <update id="updateReleaseUser">
   update t_order_new a ,user b ,user_business  c

+ 1 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1453,7 +1453,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	@Override
 	public List<LockingReleaseBo> selectLockedProject(String uid) {
-		return userMapper.selectLockedProject(uid,null,null,1,null);
+		return userMapper.selectLockedProject(uid,null,null,1,0);
 	}
 
 	@Override

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

@@ -37,14 +37,12 @@ import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.dao.TChangeDunMapper;
 import com.goafanti.common.dao.TChangeTaskMapper;
 import com.goafanti.common.dao.TOrderBillNewMapper;
-import com.goafanti.common.dao.TOrderDunMapper;
 import com.goafanti.common.dao.TOrderInvoiceMapper;
 import com.goafanti.common.dao.TOrderLogMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.dao.TTaskMidMapper;
 import com.goafanti.common.dao.UserLockReleaseMapper;
-import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.OrderChangeLog;
@@ -53,11 +51,9 @@ import com.goafanti.common.model.OrderRefundInvoice;
 import com.goafanti.common.model.TChangeDun;
 import com.goafanti.common.model.TChangeTask;
 import com.goafanti.common.model.TOrderBillNew;
-import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.TTaskMid;
-import com.goafanti.common.model.UserLockRelease;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.NewOrderChange;
 import com.goafanti.common.model.NewOrderDun;
@@ -90,7 +86,6 @@ import com.goafanti.order.service.NewOrderDunService;
 import com.goafanti.order.service.OrderChangeService;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderService;
-import com.goafanti.report.bo.userDataListBo;
 import com.goafanti.techproject.enums.TaskState;
 
 @Service
@@ -102,8 +97,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Autowired
 	private TOrderNewMapper			tOrderNewMapper;
 	@Autowired
-	private TOrderDunMapper			tOrderDunMapper;
-	@Autowired
 	private TOrderLogMapper 		tOrderLogMapper;  
 	@Autowired
 	private TOrderTaskMapper	tOrderTaskMapper;
@@ -671,8 +664,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			pushTaskAndDun(nob.getId(),nob.getOrderNo());
 		}else if(nob.getType()==OrderChangeType.TDTK.getCode()) {
 			//先将业务锁关闭
-			List<Integer> list=tOrderTaskMapper.getLockId(nb.getOrderNo(),o.getSalesmanId(),o.getBuyerId());
-			
+			List<String> list=tOrderTaskMapper.getLockId(nb.getOrderNo(),o.getSalesmanId(),o.getBuyerId());
 			userLockReleaseMapper.updateReleaseList(list);
 			int i=userLockReleaseMapper.selectByUidGetCount(o.getSalesmanId(),o.getBuyerId());
 			if (i<1) {