Browse Source

客户释放BUG修复

anderx 7 years ago
parent
commit
1d55f55d38

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

@@ -92,7 +92,7 @@ public interface UserLockReleaseMapper {
 
 	List<LockingReleaseBo> selectWaitReleaseBusiness(String aid);
 
-	void updateReleaseLock(@Param("releaseTime")Date releaseTime);
+	void updateReleaseLock(@Param("time")String time);
 
 	void updatePendingReleaseLock(@Param("lockIds")String lockIds);
 

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

@@ -229,7 +229,7 @@ public interface UserMapper {
 	
 	List<User> selectUserByRoleName(@Param("roleName1")String roleName1,@Param("roleName2")String roleName2);
 	
-	void updateReleaseLock();
+	void updateReleaseLock(String time);
 
 	marketingESBo marketingStatistics(@Param("id")String id, @Param("dailyStart")String dailyStart, @Param("dailyEnd")String dailyEnd);
 

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

@@ -385,7 +385,7 @@
   </select>
   
   <update id="updateReleaseLock" parameterType="java.lang.String">
-  		update user_lock_release set status = 2,release_time =  #{releaseTime} where status=1
+  		update user_lock_release set status = 2,release_time =  #{time} where status=1
   </update>
   
   <update id="updatePendingReleaseLock" parameterType="java.lang.String">

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

@@ -1634,8 +1634,8 @@
 			where b.status != 1 and b.identify_name like concat('%',#{name},'%')
     </select>
     
-    <update id="updateReleaseLock" parameterType="com.goafanti.customer.bo.LockingReleaseBo">
-    	update user a,user_lock_release b set a.share_type = 1 where b.status=1 and a.id=b.uid 
+    <update id="updateReleaseLock" parameterType="java.lang.String">
+    	update user a,user_lock_release b set a.share_type = 1,release_time =  #{time} where b.status=1 and a.id=b.uid 
     </update>
     
     <select id="marketingStatistics" parameterType="java.lang.String" resultType="com.goafanti.report.bo.marketingESBo">

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

@@ -15,6 +15,7 @@ import java.util.UUID;
 import javax.annotation.Resource;
 
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -1292,8 +1293,10 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 	 */
 	@Override
 	public void updateReleaseLock(Date releaseTime){
-		userMapper.updateReleaseLock();
-		userLockReleaseMapper.updateReleaseLock(releaseTime);
+		 SimpleDateFormat formatter=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 
+		 String time=formatter.format(releaseTime); 
+		userMapper.updateReleaseLock(time);
+		userLockReleaseMapper.updateReleaseLock(time);
 		
 	}
 

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

@@ -1062,6 +1062,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		boolean isBusinessOwner = false;
 		String businessName = "";
 		for(TOrderDetail td : list){
+			//业务锁定
 			lockedList = userMapper.selectLockedProject(tOrder.getBuyerId(), null,td.getCommodityId(), 1, UserLockReleaseStatus.LOCKED.getCode());
 			businessName = businessProjectMapper.selectByPrimaryKey(td.getCommodityId()).getBname();
 			if(lockedList.size() > 0){