anderx лет назад: 4
Родитель
Сommit
1d497c72b8

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

@@ -139,4 +139,11 @@ public interface UserLockReleaseMapper {
 
 	List<userDaysBo> selectChannelUserDays(Integer z);
 
+	List<String> selectByids(List<String> uids);
+
+	void insertChannelList(@Param("list")List<String> list, @Param("aid")String aid);
+
+	void updateChannelList(@Param("list")List<String> list, @Param("aid")String aid);
+
+
 }

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

@@ -521,4 +521,28 @@
 	set status =2,release_time =now()
 	where aid= #{aid} and uid= #{uid} and `type` =0
   </update>
+  <select id="selectByids" resultType="java.lang.String">
+  select uid from user_lock_release
+  where uid in(
+   <foreach item="item" collection="list" separator="," index="">
+       	#{item}
+     </foreach>
+  )
+  </select>
+  <insert id="insertChannelList">
+      INSERT INTO aft.user_lock_release
+(id, `type`, uid, aid, status, lock_time)
+VALUES
+  <foreach item="item" collection="list" separator="," index="">
+      (uuid(), 0, #{item}, #{aid},  0, now())
+     </foreach>
+  </insert>
+  <update id="updateChannelList">
+  update user_lock_release set status =2 ,release_time =now()
+	where aid= #{aid} and uid in (
+	 <foreach item="item" collection="list" separator="," index="">
+       	#{item}
+     </foreach>
+	)
+  </update>
 </mapper>

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

@@ -424,7 +424,7 @@
 	left join district_glossory dg2 on d.location_city = dg2.id 
 	left join district_glossory dg3 on d.location_area = dg3.id
 	left join user_mid um on um.aid=a.aid and um.uid=a.id
-	where a.type= 1 and a.share_type=0  and a.source in(1,2,3)
+	where a.type= 1 and a.share_type=0  and a.source in(1,2,3) and a.channel=0
 		<if test="power ==0">
 			and a.aid = #{aid,jdbcType=VARCHAR}
 		</if>
@@ -473,7 +473,7 @@
 			from user a left join admin b on  a.aid=b.id 
 			left join organization_identity d on a.id = d.uid left join district_glossory dg1 on d.location_province = dg1.id
 			left join district_glossory dg2 on d.location_city = dg2.id left join district_glossory dg3 on d.location_area = dg3.id
-			where a.type= 1 and a.share_type=0  and a.source in(1,2,3)
+			where a.type= 1 and a.share_type=0  and a.source in(1,2,3) and a.channel=0
 		<if test="power ==0">
 			and a.aid = #{aid,jdbcType=VARCHAR}
 		</if>
@@ -2154,9 +2154,10 @@ inner join(
   </update>
   
   <update id="updateReleaseUserChannel">
-	update user a ,user_channel b set a.share_type=1,a.channel=0,
-	b.status=6,a.transfer_time =now()
-	where a.id=b.uid and a.id in(
+	update user a ,user_channel b,user_lock_release c set a.share_type=1,a.channel=0,
+	b.status=6,a.transfer_time =now(),c.release_time =now(),c.status =2
+	where a.id=b.uid and a.id=c.uid  and a.aid=c.aid  and c.status =0 and c.`type` =0 
+	and a.id in(
 	<foreach item="item" collection="list" separator="," index="">
      #{item.uid}
      </foreach>

Разница между файлами не показана из-за своего большого размера
+ 780 - 628
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java


+ 0 - 2
src/main/java/com/goafanti/order/controller/OutsourceOrgApiController.java

@@ -141,8 +141,6 @@ public class OutsourceOrgApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "第三方信息","第三方信息"));
 			return res;
 		}
-		
-		
 		return res.data(orderNewService.pushOutsourceProjectAudit(o));
 	}
 	/**