Forráskód Böngészése

渠道列表修改

anderx 4 éve%!(EXTRA string=óta)
szülő
commit
a60e097d2b

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

@@ -2085,7 +2085,7 @@ inner join(
   <select id="selectChannelCustomerList" resultType="com.goafanti.user.bo.OutUserChannel">
    select a.id,a.uid,b.nickname userName,a.aid,a.status,date_format(a.distribution_time,'%Y-%m-%d %H:%i:%S')distributionTimes,
  	date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes ,c.contacts ,c.contact_mobile contactMobile,e.name channelName,
- 	b.society_tag societyTag ,d1.name province,d2.name city,f.name adminName ,b.guidance,a.recovery from user_channel a
+ 	b.society_tag societyTag ,d1.name province,d2.name city,f.name adminName ,b.guidance,a.recovery,a.remarks from user_channel a
     left join user b on a.uid=b.id  left join organization_identity c on a.uid =c.uid 
     left join district_glossory d1 on c.location_province =d1.id 
     left join district_glossory d2 on c.location_city =d2.id
@@ -2113,6 +2113,7 @@ inner join(
   <if test="startTime!=null and endTime !=null">
  	and a.create_time between #{startTime} and #{endTime}
  	</if>
+ 	order by a.status 
  	<if test="page_sql != null">
     		${page_sql}
    		 </if>

+ 12 - 1
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -1278,10 +1278,21 @@ public class AdminCustomerApiController extends BaseApiController{
 		return res;
 	}
 	
-	/** 渠道客户转交 **/
+	/**
+	 * 	渠道客户转交 
+	 * @param userIds 用户编号集
+	 * @param receiveId 接受者
+	 * @param remarks	备注
+	 * @param type	0 分配 1转交 2回退
+	 * @return
+	 */
 	@RequestMapping(value = "/channelCustomerDeliver", method = RequestMethod.POST)
 	public Result channelCustomerDeliver(String userIds ,String receiveId,String remarks,Integer type){
 		Result res = new Result();
+		if (StringUtils.isNotBlank(userIds)) {
+			res.getError().add(buildError("","用户编号不存在"));
+			return res;
+		}
 		String [] str=userIds.split(",");
 		List<String> uids=Arrays.asList(str);
 		if (type==1&&customerService.checkChannel(uids)) {