valhalla / fw-valhalla

Commit 655c423d590963a050a38a8cfeb6b13a89c9d1f3

Authored by 张志伟
1 parent 8d246937

:sparkles: 调整sdk参数

Inline Side-by-side
Showing 6 changed files with 27 additions and 4 deletions
fw-valhalla-dao/src/main/resources/mapper/CustomerMapper.xml
  View file @655c423
... ... @@ -144,12 +144,18 @@
144 144 left join follow_task t3 on t1.id=t3.customer_id and t3.state=1 and t3.type=2
145 145 left join follow_task t4 on t1.id=t4.customer_id and t4.state=1 and t4.type=4
146 146 where t1.yn = 1 and t1.group_id = #{condition.groupId}
147   - <if test="condition.shopList !=null">
  147 + <if test="condition.shopList !=null and condition.shopList.size() != 0">
148 148 and t1.shop_id in
149 149 <foreach collection="condition.shopList" item="id" index="index" open="(" close=")" separator=",">
150 150 #{id}
151 151 </foreach>
152 152 </if>
  153 + <if test="condition.excludeCustomerIds !=nul and condition.excludeCustomerIds.size() != 0">
  154 + and t1.id not in
  155 + <foreach collection="condition.excludeCustomerIds" item="id" index="index" open="(" close=")" separator=",">
  156 + #{id}
  157 + </foreach>
  158 + </if>
153 159 <if test="condition.followType !=null and condition.followType==2">
154 160 and t3.id is not null
155 161 </if>
... ...
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/CustomCustomerQuery.java
  View file @655c423
... ... @@ -32,4 +32,8 @@ public class CustomCustomerQuery {
32 32 private Integer followType;
33 33 private String frameNo;
34 34 private List<Long> shopList;
  35 + /**
  36 + * 排除用户集
  37 + */
  38 + private List<Long> excludeCustomerIds;
35 39 }
... ...
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/param/CustomerQueryReq.java
  View file @655c423
... ... @@ -68,6 +68,11 @@ public class CustomerQueryReq implements Serializable {
68 68 */
69 69 private List<Long> shopList;
70 70  
  71 + /**
  72 + * 排除用户集
  73 + */
  74 + private List<Long> excludeCustomerIds;
  75 +
71 76 public Integer getCustomerType() {
72 77 return customerType;
73 78 }
... ... @@ -147,4 +152,12 @@ public class CustomerQueryReq implements Serializable {
147 152 public void setGroupId(Long groupId) {
148 153 this.groupId = groupId;
149 154 }
  155 +
  156 + public List<Long> getExcludeCustomerIds() {
  157 + return excludeCustomerIds;
  158 + }
  159 +
  160 + public void setExcludeCustomerIds(List<Long> excludeCustomerIds) {
  161 + this.excludeCustomerIds = excludeCustomerIds;
  162 + }
150 163 }
... ...
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java
  View file @655c423
... ... @@ -416,7 +416,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
416 416 boolean succeed = followTaskService.updateById(followTask);
417 417 if (succeed) {
418 418 completeTodo(followTask.getId());
419   - followNoticeRecordService.removeByClueId(followTask.getId());
  419 + followNoticeRecordService.removeByClueId(followTask.getClueId());
420 420 CancelApproveEvent event = new CancelApproveEvent(followTask.getId(), ApproveTypeEnum.FOLLOW_DEFEAT);
421 421 eventPublisher.publishEvent(event);
422 422 }
... ...
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java
  View file @655c423
... ... @@ -421,7 +421,7 @@ public class IRFollowStrategy extends AbstractFollowStrategy {
421 421 boolean succeed = followTaskService.updateById(followTask);
422 422 if (succeed) {
423 423 completeTodo(followTask.getId());
424   - followNoticeRecordService.removeByClueId(followTask.getId());
  424 + followNoticeRecordService.removeByClueId(followTask.getClueId());
425 425 CancelApproveEvent event = new CancelApproveEvent(followTask.getId(), ApproveTypeEnum.FOLLOW_DEFEAT);
426 426 eventPublisher.publishEvent(event);
427 427 }
... ...
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/impl/FollowRecordServiceImpl.java
  View file @655c423
... ... @@ -85,7 +85,7 @@ public class FollowRecordServiceImpl extends ServiceImpl&lt;FollowRecordMapper, Fol
85 85 public boolean removeByTaskIds(List<Long> idList) {
86 86 return this.remove(Wrappers.<FollowRecord>lambdaQuery()
87 87 .in(FollowRecord::getTaskId, idList)
88   - .eq(FollowRecord::getOutTime, Boolean.FALSE)
  88 + .eq(FollowRecord::getAddTodo, Boolean.FALSE)
89 89 .isNull(FollowRecord::getFollowTime)
90 90 );
91 91 }
... ...