Просмотр исходного кода

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

gitadmin лет назад: 7
Родитель
Сommit
81cda19c9f

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

@@ -366,7 +366,7 @@
 	left join 
 	left join 
 		(select uid,aid,max(create_time) as last_follow_time from user_follow where aid = #{aid} group by uid)t1
 		(select uid,aid,max(create_time) as last_follow_time from user_follow where aid = #{aid} group by uid)t1
 	on t0.uid = t1.uid 
 	on t0.uid = t1.uid 
-	where datediff(now(),if(t1.t0.lock_time < t1.last_follow_time,t1.last_follow_time,t1.t0.lock_time))>30 or datediff(now(),t0.lock_time)>270
+	where datediff(now(),if(t0.lock_time < t1.last_follow_time,t1.last_follow_time,t1.t0.lock_time))>30 or datediff(now(),t0.lock_time)>270
   </select>
   </select>
   
   
   <select id="selectWaitReleaseBusiness"  resultType="com.goafanti.customer.bo.LockingReleaseBo">
   <select id="selectWaitReleaseBusiness"  resultType="com.goafanti.customer.bo.LockingReleaseBo">
@@ -381,7 +381,7 @@
 	left join 
 	left join 
 		(select uid,aid,max(create_time) as last_follow_time from user_follow where aid = #{aid} group by uid)t1
 		(select uid,aid,max(create_time) as last_follow_time from user_follow where aid = #{aid} group by uid)t1
 	on t0.uid = t1.uid 
 	on t0.uid = t1.uid 
-	where datediff(t1.last_follow_time,lock_time)>360 or datediff(now(),t0.lock_time)>900
+	where datediff(t1.last_follow_time,lock_time)>270 or datediff(now(),t0.lock_time)>270
   </select>
   </select>
   
   
   <update id="updateReleaseLock" parameterType="java.lang.String">
   <update id="updateReleaseLock" parameterType="java.lang.String">

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

@@ -512,7 +512,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 						}
 						}
 						if(!isBusinessOwner) throw new BusinessException(new Error(ErrorConstants.BUSINESS_ALREADY_LOCKED,businessName,""));
 						if(!isBusinessOwner) throw new BusinessException(new Error(ErrorConstants.BUSINESS_ALREADY_LOCKED,businessName,""));
 					}else{ 
 					}else{ 
-						if(!isUserOwner) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_LOCKED,businessName,""));
+						if(isUserOwner) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_LOCKED,businessName,""));
 					}
 					}