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

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

anderx 1 год назад
Родитель
Сommit
f15c5a1a75

+ 11 - 1
src/main/java/com/goafanti/business/bo/UserRestrictProjectBo.java

@@ -3,12 +3,22 @@ package com.goafanti.business.bo;
 public class UserRestrictProjectBo {
     private String uid;
     /**
-     * 0 自己的客户 1不是自己但是限定项目客户 2 不是自己并且没有限定项目客户 3 公共客户 4业务员
+     * 0 自己的客户 1非客户有限定 营销员  2 非客户无限定 3 公共客户 4业务员 5非客户有限定 非营销员
+     * 只1的情况下需要提示
      */
     private Integer type;
 
     private String adminName;
     private String userName;
+    private Integer adminSalesman;
+
+    public Integer getAdminSalesman() {
+        return adminSalesman;
+    }
+
+    public void setAdminSalesman(Integer adminSalesman) {
+        this.adminSalesman = adminSalesman;
+    }
 
     public String getUserName() {
         return userName;

+ 7 - 3
src/main/java/com/goafanti/business/service/impl/RestrictProjectServiceImpl.java

@@ -199,7 +199,7 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
         log.setPid(in.getPid());
         if (i == 0){
             log.setAid(in.getAid());
-            log.setType(15);
+            log.setType(21);
         } else if (i == 1) {
             log.setAid(in.getAid());
             log.setType(16);
@@ -222,6 +222,7 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
             for (String s : split) {
                 UserRestrictProjectBo bo = new UserRestrictProjectBo();
                 bo.setUid(s);
+                bo.setAdminSalesman(0);
                 User user = userMapper.selectByPrimaryKey(s);
                 bo.setUserName(user.getNickname());
                 if (!flag){
@@ -235,8 +236,11 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
                             List<RestrictProject> restrictProjects = restrictProjectMapper.selectListByParam(new InputRestrictProject(s, aid));
                             if (!restrictProjects.isEmpty()){
                                 // 有限定项目
-                                bo.setType(1);
-
+                                if(TokenManager.hasRole(AFTConstants.SALESMAN)){
+                                    bo.setType(1);
+                                }else {
+                                    bo.setType(5);
+                                }
                             }else{
                                 //没有限定
                                 bo.setType(2);

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

@@ -223,7 +223,7 @@
 		from notice n 
 		LEFT JOIN organization_identity oi on n.uid = oi.uid
 		LEFT JOIN admin a on a.id = n.pid 
-    where n.readed = 0 and n.notice_type in(54,55,56)
+    where n.readed = 0 and n.notice_type in(54,55,56,72)
     <if test="aid != null">
     	and n.aid = #{aid}
     </if>

+ 3 - 0
src/main/java/com/goafanti/common/mapper/RestrictProjectMapper.xml

@@ -149,6 +149,9 @@
         <include refid="RestrictProjectSql"/>
         )x
         order by x.days
+        <if test="page_sql != null">
+            ${page_sql}
+        </if>
     </select>
     <sql id="RestrictProjectSql">
         <if test="aid != null">

+ 2 - 2
src/main/java/com/goafanti/common/model/UserTransferLog.java

@@ -153,8 +153,8 @@ public class UserTransferLog implements Serializable {
 
 	/**
 	 * 类型 0录入 1 领取 2 转交私有客户 3转交业务 4 未跟进丢失(30) 5未签单丢失(270天)6释放  7转交签单客户 8渠道录入 9渠道客户总监分配
-	 * 10 渠道客户经理分配 11渠道释放 12回收 13离职客户转交 14离职签单业务转交 15限定项目新增 16限项目移除 17限定项目转交 18限定项目私有释放
-	 * 19 限定项目签单释放 20限时项目签单
+	 * 10 渠道客户经理分配 11渠道释放 12回收 13离职客户转交 14离职签单业务转交 15领取为私有渠道 16限项目移除 17限定项目转交 18限定项目私有释放
+	 * 19 限定项目签单释放 20限时项目签单 21限定项目新增
 	 */
 	public void setType(Integer type) {
 		this.type = type;

+ 2 - 2
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -65,9 +65,9 @@ public class ReleaseUserTask {
 	 * 客户释放
 	 *
 	 */
-	@Scheduled(cron = "0 22 14  * * ?")
+//	@Scheduled(cron = "0 22 14  * * ?")
 //	@RequestMapping("/open/test")
-//	@Scheduled(cron = "0 0 1  * * ?")
+	@Scheduled(cron = "0 0 1  * * ?")
 	public void startTask() {
 		try {
 			List<User> userList = userService.selectUserByRoleName("营销员", "营销经理");

+ 5 - 9
src/main/java/com/goafanti/core/websocket/SystemWebSocketHandler.java

@@ -1,18 +1,13 @@
 package com.goafanti.core.websocket;
 
+import com.goafanti.common.utils.LoggerUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.web.socket.*;
+
 import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.springframework.stereotype.Service;
-import org.springframework.web.socket.CloseStatus;
-import org.springframework.web.socket.TextMessage;
-import org.springframework.web.socket.WebSocketHandler;
-import org.springframework.web.socket.WebSocketMessage;
-import org.springframework.web.socket.WebSocketSession;
-
-import com.goafanti.common.utils.LoggerUtils;
-
 @Service
 public class SystemWebSocketHandler implements WebSocketHandler {
 	
@@ -86,6 +81,7 @@ public class SystemWebSocketHandler implements WebSocketHandler {
 			try {
 				if (user.isOpen()) {
 					user.sendMessage(message);
+					LoggerUtils.debug(getClass(), "用户" + userId + "websocket通知消息成功");
 				}
 			} catch (IOException e) {
 				LoggerUtils.error(getClass(), "用户" + userId + "websocket通知异常", e);

+ 15 - 9
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -315,17 +315,23 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			ulr.setLockTime(date);
 			userLockReleaseMapper.insertSelective(ulr);
 		}
-			UserBusiness ub=new UserBusiness();
-			ub.setId(UUID.randomUUID().toString());
-			ub.setUid(tn.getBuyerId());
-			ub.setAid(tn.getSalesmanId());
-			ub.setFollowSituation(5);
-			ub.setCustomerStatus(4);
+		int i = userBusinessMapper.judgeBusiness(tn.getBuyerId(), t.getCommodityId(), TokenManager.getAdminId());
+		UserBusiness ub=new UserBusiness();
+		ub.setId(UUID.randomUUID().toString());
+		ub.setUid(tn.getBuyerId());
+		ub.setAid(tn.getSalesmanId());
+		ub.setFollowSituation(5);
+		ub.setCustomerStatus(4);
+		ub.setUpdateTime(date);
+		ub.setRemarks("派单自动锁定客户");
+		ub.setBusinessProjectId(t.getCommodityId());
+		if (i>0){
+			userBusinessMapper.updateByPrimaryKeySelective(ub);
+		}else {
 			ub.setCreateTime(date);
-			ub.setUpdateTime(date);
-			ub.setRemarks("派单自动锁定客户");
-			ub.setBusinessProjectId(t.getCommodityId());
 			userBusinessMapper.insertSelective(ub);
+		}
+
 			//如果是渠道客户更新渠道表
 			UserChannel uc=new UserChannel();
 			uc.setUid(tn.getBuyerId());

+ 15 - 10
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -230,30 +230,28 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
                         if (!u.getAid().equals(my.getId())) {
 							List<RestrictProject> list = restrictProjectMapper.selectListByParam(new InputRestrictProject(u.getId(), my.getId()));
 							StringBuilder str2 = new StringBuilder();
+							Admin admin = adminMapper.selectByPrimaryKey(u.getAid());
 							if (!list.isEmpty()){
 								String start = DateUtils.formatDate(in.getReleaseStart(), AFTConstants.MMDDHHMM);
 								String end = DateUtils.formatDate(in.getReleaseEnd(), AFTConstants.MMDDHHMM);
 								str2.append("限定项目所属人营销员").append(my.getName()).append("于")
 										.append(start).append("至").append(end).append("公出你的企业[").append(u.getNickname()).append("]请悉知!");
+								sendEmailAndNoticeAndSoucket(u.getAid(), 3, str2.toString());
 							}else {
-                                str2.append(my.getName()).append("(需审核),准备公出您的企业")
-                                        .append("[").append(u.getNickname()).append("]。");
-                                Admin admin = adminMapper.selectByPrimaryKey(u.getAid());
+								str2.append(my.getName()).append("(需审核),准备公出您的企业")
+										.append("[").append(u.getNickname()).append("]。");
 								addPublicExamine(in.getId(), admin);
-								pushNoticeAndSoucketAndEmail(my, in, date, admin, str, map);
 								if (in.getPublicType() == null || in.getPublicType() == 0) in.setPublicType(1);
+								//审核通知
+								pushNoticeAndSoucketAndEmail(my, in, date, admin, str, map);
+								status.set(0);
 							}
-							sendEmailAndNoticeAndSoucket(u.getAid(), 3, str2.toString());
-							status.set(0);
                         }
                     }
                 }else {
 					users.forEach(u->{
 						if (!u.getAid().equals(my.getId())){
-							StringBuffer str2=new StringBuffer();
-							str2=str2.append(my.getName()).append("计划公出您的企业").append(u.getNickname())
-									.append(",").append(formatDate).append("【小程序端广播提示】");
-							sendNoticeAndSoucket(u.getAid(),3,str2.toString());
+							addNoticeAndSoucket(my, u, formatDate);
 						}
 					});
 
@@ -276,6 +274,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		return map;
 	}
 
+	private void addNoticeAndSoucket(AdminListBo my, User u, String formatDate) {
+		StringBuffer str2=new StringBuffer();
+		str2=str2.append(my.getName()).append("计划公出您的企业").append(u.getNickname())
+				.append(",").append(formatDate).append("【小程序端广播提示】");
+		sendNoticeAndSoucket(u.getAid(),3,str2.toString());
+	}
+
 	private String getString(AdminListBo my, CheckOrderNoOut data) {
 		String amountName="";
 		String amountType="";

+ 5 - 5
src/main/resources/props/config_test.properties

@@ -1,5 +1,5 @@
 dev.name=test
-static.host=//uat.jishutao.com/1.3.16
+static.host=//static.jishutao.com/1.3.16
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://127.0.0.1:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
@@ -51,11 +51,11 @@ yxjl_max=100
 amb.maxLvl=6
 
 
-portal.host=//uat.jishutao.com/portal/2.0.6
-avatar.host=//uat.jishutao.com
+portal.host=//static.jishutao.com/portal/2.0.6
+avatar.host=//static.jishutao.com
 
-rd.static.host=//uat.jishutao.com/RD/1.0.03
-avatar.upload.host=//uat.jishutao.com/upload
+rd.static.host=//static.jishutao.com/RD/1.0.03
+avatar.upload.host=//static.jishutao.com/upload
 
 wx.appId=wxff2f5720ed7d7f63
 wx.appSecret=081744369d42405be58fe37f892631f7