liquanyu / talkonline

Download as
Browse Code »

Commit 0dbfeca993e7ddcf800f0fdffdc65aaea3a79017

Authored by zhangchao
1 parent 34f352e757
Exists in dev

#fix 优化服务推送逻辑 新增21天 28天推送

Showing 6 changed files with 38 additions and 16 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPushMessage.java View file @ 0dbfeca
... ... @@ -66,7 +66,7 @@
66 66 @TableField(value = "cid")
67 67 private int cid;
68 68 /**
69   - * 类型 0:上传推送 1:7日推送 2:14日推送
  69 + * 类型 0:上传推送 1:7日推送 2:14日推送 3：21日 4:28
70 70 */
71 71 @TableField(value = "type")
72 72 private int type;
talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsOrderMapper.java View file @ 0dbfeca
... ... @@ -27,6 +27,8 @@
27 27  
28 28 List<PushOrderResult> selectPushOrder(@Param("pId") Integer pid);
29 29  
30   - List<PushOrderResult> selectOrderTaskList(@Param("sevenStart")String sevenStart, @Param("sevenEnd")String sevenEnd, @Param("fourteenStart")String fourteenStart, @Param("fourteenEnd")String fourteenEnd);
  30 + List<PushOrderResult> selectOrderTaskList(@Param("sevenStart")String sevenStart, @Param("sevenEnd")String sevenEnd,
  31 + @Param("fourteenStart")String fourteenStart, @Param("fourteenEnd")String fourteenEnd,
  32 + @Param("twentyStart")String twentyStart, @Param("twentyEnd")String twentyEnd,@Param("twentyEightStart")String twentyEightStart, @Param("twentyEightEnd")String twentyEightEnd );
31 33 }
talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsOrderService.java View file @ 0dbfeca
... ... @@ -25,7 +25,8 @@
25 25  
26 26 List<OrderListResponse> queryOrderList(OrderRequest orderRequest);
27 27  
28   - List<PushOrderResult> selectOrderTaskList(String sevenStart, String sevenEnd, String fourteenStart, String fourteenEnd);
  28 + List<PushOrderResult> selectOrderTaskList(String sevenStart, String sevenEnd,
  29 + String fourteenStart, String fourteenEnd,String twentyStart, String twentyEnd, String twentyEightStart, String twentyEightEnd);
29 30  
30 31 List<PushOrderResult> selectPushOrder(Integer pId);
31 32  
talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsOrderServiceImpl.java View file @ 0dbfeca
... ... @@ -118,8 +118,9 @@
118 118 }
119 119  
120 120 @Override
121   - public List<PushOrderResult> selectOrderTaskList(String sevenStart, String sevenEnd, String fourteenStart, String fourteenEnd) {
122   - return lymsOrderMapper.selectOrderTaskList( sevenStart, sevenEnd, fourteenStart, fourteenEnd);
  121 + public List<PushOrderResult> selectOrderTaskList(String sevenStart, String sevenEnd, String fourteenStart, String fourteenEnd,
  122 + String twentyStart, String twentyEnd, String twentyEightStart, String twentyEightEnd) {
  123 + return lymsOrderMapper.selectOrderTaskList( sevenStart, sevenEnd, fourteenStart, fourteenEnd, twentyStart, twentyEnd, twentyEightStart, twentyEightEnd);
123 124 }
124 125  
125 126 @Override
talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/ServiceContentTask.java View file @ 0dbfeca
1 1 package com.lyms.talkonlineweb.task;
2 2  
3   -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 3 import com.lyms.oss.utils.DateUtils;
5 4 import com.lyms.talkonlineweb.domain.*;
6 5 import com.lyms.talkonlineweb.param.DataEntity;
7 6  
... ... @@ -8,13 +7,11 @@
8 7 import com.lyms.talkonlineweb.service.*;
9 8 import com.lyms.talkonlineweb.util.Constant;
10 9 import com.lyms.talkonlineweb.util.DateUtil;
11   -import com.lyms.talkonlineweb.util.StringUtil;
12 10 import com.lyms.talkonlineweb.util.WeiXinUtil;
13 11 import lombok.RequiredArgsConstructor;
14 12 import lombok.extern.slf4j.Slf4j;
15 13 import org.apache.commons.collections.CollectionUtils;
16 14 import org.springframework.beans.factory.annotation.Autowired;
17   -import org.springframework.beans.factory.annotation.ParameterResolutionDelegate;
18 15 import org.springframework.scheduling.annotation.Scheduled;
19 16 import org.springframework.stereotype.Component;
20 17  
21 18  
22 19  
... ... @@ -38,12 +35,19 @@
38 35 Date day=new Date();
39 36 String seven= DateUtils.format(DateUtils.addDateDays(day,-7));
40 37 String fourteen= DateUtils.format(DateUtils.addDateDays(day,-14));
  38 + String twenty=DateUtils.format(DateUtils.addDateDays(day,-21));
  39 + String twentyEight=DateUtils.format(DateUtils.addDateDays(day,-28));
41 40 String startStr=" 00:00:00";
42 41 String endStr=" 23:59:59";
43 42 List<PushOrderResult> orderList= lymsOrderService.selectOrderTaskList(
44   - seven+startStr,seven+endStr,fourteen+startStr,fourteen+endStr);
  43 + seven+startStr,seven+endStr,
  44 + fourteen+startStr,fourteen+endStr,
  45 + twenty+startStr,twenty+endStr,
  46 + twentyEight+startStr,twentyEight+endStr);
45 47 if (CollectionUtils.isNotEmpty(orderList)){
46 48 String fourteenTime=fourteen+endStr;
  49 + String twentyOneTime=twenty+endStr;
  50 + String sevenTime=seven+endStr;
47 51 List<LymsPushMessage> list=new ArrayList<>();
48 52 orderList.stream().forEach(order -> {
49 53 LymsPushMessage lymsPushMessage=new LymsPushMessage();
... ... @@ -57,7 +61,7 @@
57 61 lymsPushMessage.setTitle("通知：您有一条服务内容推送消息，请点击此处及时查看。");
58 62 lymsPushMessage.setName(order.getPname());
59 63 lymsPushMessage.setPushTime(new Date());
60   - lymsPushMessage.setType(checkTime(fourteenTime,order.getService_start_time()));
  64 + lymsPushMessage.setType(checkTime(fourteenTime,twentyOneTime,sevenTime,order.getService_start_time()));
61 65 //推送微信公众号
62 66 Map<String,Object> map=new HashMap<>();
63 67 map.put("keyword1",new DataEntity(order.getPname(),"#173177"));
64 68  
... ... @@ -85,12 +89,21 @@
85 89 log.info("serviceContent end");
86 90 }
87 91  
88   - private int checkTime(String time,Date date){
89   - Date endTime= DateUtils.parse(time,DateUtil.YYYY_MM_DD_HH_MM_SS);
90   - if (endTime.compareTo(date)<0){
  92 + private int checkTime(String fourteenTime,String twentyTime,String sevenTime,Date date){
  93 + Date fourteen= DateUtils.parse(fourteenTime,DateUtil.YYYY_MM_DD_HH_MM_SS);
  94 + Date twenty= DateUtils.parse(twentyTime,DateUtil.YYYY_MM_DD_HH_MM_SS);
  95 + Date seven= DateUtils.parse(sevenTime,DateUtil.YYYY_MM_DD_HH_MM_SS);
  96 + //0:上传推送 1:7日推送 2:14日推送 3：21日 4:28
  97 + if (seven.compareTo(date)>=0){
91 98 return 1;
92   - }
93   - return 2;
  99 + }
  100 + if (fourteen.compareTo(date)>=0){
  101 + return 2;
  102 + }
  103 + if (twenty.compareTo(date)>=0){
  104 + return 3;
  105 + }
  106 + return 4;
94 107 }
95 108 }
talkonlineweb/src/main/resources/mapper/LymsOrderMapper.xml View file @ 0dbfeca
... ... @@ -83,7 +83,12 @@
83 83 <![CDATA[o.service_start_time >= #{sevenStart}
84 84 AND o.service_start_time <= #{sevenEnd})
85 85 or (o.service_start_time >= #{fourteenStart}
86   - AND o.service_start_time <= #{fourteenEnd}))]]>
  86 + AND o.service_start_time <= #{fourteenEnd})
  87 + or (o.service_start_time >= #{twentyStart}
  88 + AND o.service_start_time <= #{twentyEnd})
  89 + or (o.service_start_time >= #{twentyEightStart}
  90 + AND o.service_start_time <= #{twentyEightEnd})
  91 + )]]>
87 92 and `status`=1
88 93 </select>
89 94 <select id="selectPushOrder" resultType="com.lyms.talkonlineweb.result.PushOrderResult">