Browse Source

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

anderx 1 year ago
parent
commit
c784c99f2e

+ 4 - 1
src/main/java/com/goafanti/business/service/impl/RestrictProjectServiceImpl.java

@@ -78,7 +78,10 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
         User user = userMapper.selectByPrimaryKey(in.getUid());
         BusinessProject businessProject = businessProjectMapper.selectByPrimaryKey(in.getPid());
         String str =String.format("客户:%s,已被营销员%s领取了【限定项目:%s】",user.getNickname(),TokenManager.getAdminToken().getName(),businessProject.getBname());
-        asyncUtils.addNoticAndEmail(new Notice(user.getAid(), NoticeStatus.RECEIVE_RESTRICT_PROJECT.getCode(),str));
+        //如果客户是当事人的不提示消息
+        if (user.getAid()!=null&&!user.getAid().equals(aid)){
+            asyncUtils.addNoticAndEmail(new Notice(user.getAid(), NoticeStatus.RECEIVE_RESTRICT_PROJECT.getCode(),str));
+        }
         return 1;
     }
 

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

@@ -1111,13 +1111,13 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
       and a.process_status = 3
     </if>
     <if test="distribution == 1">
-      and a.process_status = 6
+      and a.process_status = 5
     </if>
     <if test="distribution == 2">
-      and a.process_status = 7
+      and a.process_status = 6
     </if>
     <if test="distribution == 3">
-      and a.process_status = 8
+      and a.process_status = 7
     </if>
     <if test="name != null">
       and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')

+ 8 - 0
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -186,6 +186,14 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				log.setType(20);
 				log.setRemarks("签单触发锁定限时项目");
 				userTransferLogMapper.insertSelective(log);
+			} else {
+				RestrictProject newRP=new RestrictProject();
+				newRP.setUid(tn.getBuyerId());
+				newRP.setAid(TokenManager.getAdminId());
+				newRP.setPid(t.getCommodityId());
+				newRP.setLockTime(date);
+				newRP.setType(2);
+				restrictProjectMapper.insertSelective(newRP);
 			}
 		}else if(type==1) {
 			t.setManagerId(taskReceiverId);