浏览代码

新增技术公出企业提醒,修改站内信分类

anderx 1 年之前
父节点
当前提交
63e1b7729d

+ 11 - 11
src/main/java/com/goafanti/common/enums/NoticeTypes.java

@@ -31,7 +31,7 @@ public enum NoticeTypes {
 	 */
 	public static Integer getType(Integer i) {
 		if (i == NoticeStatus.TASK_PATENT_ERROR.getCode() || i == NoticeStatus.TASK_PATENT_REMIND.getCode()) {
-			return 1;
+			return ZLTX.code;
 		} else if (i == NoticeStatus.ORDER_CHANGE_ADD.getCode() || i == NoticeStatus.ORDER_CHANGE_UDPATE.getCode()
 				|| i == NoticeStatus.ORDER_BACK.getCode() || i == NoticeStatus.ORDER_REFUND.getCode()
 				|| i == NoticeStatus.ORDER_REFUND_REFUSE.getCode() || i == NoticeStatus.ORDER_CHANGE_YES.getCode()
@@ -49,34 +49,34 @@ public enum NoticeTypes {
 				|| i == NoticeStatus.PROJECT_SOPT_NO.getCode()
 				|| i == NoticeStatus.PROJECT_RENEW_START.getCode() || i == NoticeStatus.PROJECT_RENEW_YES.getCode()
 				|| i == NoticeStatus.PROJECT_RENEW_NO.getCode() ) {
-			return 2;
+			return DDSH.code;
 		} else if (i == NoticeStatus.CUSTOMER_LOSE30.getCode() || i == NoticeStatus.CUSTOMER_LOSE270.getCode()
 				|| i == NoticeStatus.CUSTOMER_CHENNEL_LOSE.getCode() || i == NoticeStatus.CUSTOMER_CHENNEL_RECOVERY.getCode()
 				|| i == NoticeStatus.RESTRICT_PROJECT_LOSE30.getCode() || i == NoticeStatus.RESTRICT_PROJECT_LOSE270.getCode()
+		) {
+			return KHSF.code;
+		} else if (i == NoticeStatus.CUSTOMER_PRIVATE_REMINDER.getCode()|| i == NoticeStatus.CUSTOMER_LOSE_REMINDER.getCode()
 				|| i == NoticeStatus.RESTRICT_PROJECT_LOSE30_REMIND.getCode() || i == NoticeStatus.RESTRICT_PROJECT_LOSE270_REMIND.getCode()
 		) {
-			return 3;
-		} else if (i == NoticeStatus.CUSTOMER_PRIVATE_REMINDER.getCode()
-				|| i == NoticeStatus.CUSTOMER_LOSE_REMINDER.getCode()) {
-			return 4;
+			return XSGJ.code;
 		} else if (i == NoticeStatus.ORDER_DUN.getCode() || i == NoticeStatus.ORDER_ARREARS_DUN.getCode()
 				|| i == NoticeStatus.PAYMENT_DUN.getCode() || i == NoticeStatus.PAYMENT_NODE.getCode()
 				|| i == NoticeStatus.PAYMENT_NO.getCode() || i == NoticeStatus.PAYMENT_YES.getCode()
 				|| i == NoticeStatus.PAYMENT_COMPLETE.getCode()) {
-			return 5;
+			return CKFK.code;
 		} else if (i == NoticeStatus.ORDER_INVPICE_START.getCode() || i == NoticeStatus.ORDER_INVPICE_YES.getCode()
 				|| i == NoticeStatus.ORDER_INVPICE_NO.getCode() || i == NoticeStatus.ORDER_INVPICE_APPROVA_YES.getCode()
 				|| i == NoticeStatus.ORDER_INVPICE_APPROVA_NO.getCode()
 				|| i == NoticeStatus.ORDER_INVPICE_END.getCode()) {
-			return 6;
+			return DDKP.code;
 		}else if (i == NoticeStatus.MENBER_DUN.getCode()) {
-			return 7;
+			return HYCS.code;
 		}else if ( i== NoticeStatus.PUBLIC_OTHERS_USER.getCode() || i== NoticeStatus.PUBLIC_RELEASE_START.getCode()
 				|| i== NoticeStatus.PUBLIC_RELEASE_YES.getCode()|| i== NoticeStatus.PUBLIC_RELEASE_NO.getCode()
 				|| i== NoticeStatus.PUBLIC_CARBON_COPY.getCode()) {
-			return 8;
+			return GCXX.code;
 		}
-		return 0;
+		return ELSE.code;
 	}
 
 	private static final Map<Integer, NoticeTypes> status = new HashMap<Integer, NoticeTypes>();

+ 6 - 3
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -311,9 +311,12 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	 */
 	private void pushUser(TOrderTask t, TOrderNew tn, Date date) {
 		if (userMapper.checkLock(tn.getBuyerId())<1) {
-			//签单改成刷新客户跟进时间
-			userLockReleaseMapper.updateByAidAndUid(tn.getBuyerId());
-			userMapper.updateShareType(tn.getBuyerId(),tn.getSalesmanId());
+			User user = userMapper.selectByPrimaryKey(tn.getBuyerId());
+			if (user!=null&&user.getNewChannel()!=1){
+				//签单改成刷新客户跟进时间
+				userLockReleaseMapper.updateByAidAndUid(tn.getBuyerId());
+				userMapper.updateShareType(tn.getBuyerId(),tn.getSalesmanId());
+			}
 		}
 		//判定用户最后签单时间
 		pushSignTime(tn);

+ 6 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -259,6 +259,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					});
 
 				}
+			} else if (in.getType()==1) {
+				users.forEach(u->{
+					if (!u.getAid().equals(my.getId())){
+						addNoticeAndSoucket(my, u, formatDate);
+					}
+				});
 			}
 			if (status.get()==1){
 				pushNoticeAndSoucketAndEmail(my, in, date, a, str, map);

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -1,8 +1,8 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
-#static.host=//static.jishutao.com/1.3.17
-static.host=//172.16.1.187/1.3.17
+static.host=//static.jishutao.com/1.3.17
+#static.host=//172.16.1.187/1.3.17
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false