Merge branch 'developer' into developerB

src/main/java/com/caimei365/tools/service/impl/CmBehaviorRecordServiceImpl.java

@@ -41,9 +41,10 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
             if (ipSavePo.getParams().contains("userId") || ipSavePo.getParams().contains("productId")) {
                 String[] split = ipSavePo.getParams().split("&");
                 for (String s : split) {
+                    String str = s.trim();
                     // 页面路径
-                    if (s.contains("pagePath") && s.contains("=")) {
-                        String[] split1 = s.split("=");
+                    if (str.startsWith("pagePath") && str.contains("=")) {
+                        String[] split1 = str.split("=");
                         if (split1.length > 1) {
                             String value = split1[1];
                             String trim = value.trim();
@@ -66,8 +67,10 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
                         }
                     }
                     // 页面类型
-                    if (s.contains("pageType") && s.contains("=")) {
-                        String[] split1 = s.split("=");
+                    if (str.startsWith("pageType") && str.contains("=")) {
+                        String[] split1 = str.split("=");
+                        // 赋默认值
+                        cmBehaviorRecordPo.setPageType(0);
                         if (split1.length > 1) {
                             String value = split1[1];
                             String trim = value.trim();
@@ -79,8 +82,8 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
                         }
                     }
                     // 页面标签
-                    if (s.contains("pageLabel") && s.contains("=")) {
-                        String[] split1 = s.split("=");
+                    if (str.startsWith("pageLabel") && str.contains("=")) {
+                        String[] split1 = str.split("=");
                         cmBehaviorRecordPo.setPageLabel("");
                         if (split1.length > 1) {
                             String value = split1[1];
@@ -102,8 +105,8 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
                         }
                     }
                     // 商品ID
-                    if (s.contains("productId") && s.contains("=")) {
-                        String[] split1 = s.split("=");
+                    if (str.startsWith("productId") && str.contains("=")) {
+                        String[] split1 = str.split("=");
                         if (split1.length > 1) {
                             String value = split1[1];
                             String trim = value.trim();
@@ -113,8 +116,8 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
                         }
                     }
                     // 访问时长
-                    if (s.contains("accessDuration") && s.contains("=")) {
-                        String[] split1 = s.split("=");
+                    if (str.startsWith("accessDuration") && str.contains("=")) {
+                        String[] split1 = str.split("=");
                         if (split1.length > 1) {
                             String value = split1[1];
                             String trim = value.trim();

src/main/java/com/caimei365/tools/task/ShopMessTask.java

@@ -271,6 +271,12 @@ public class ShopMessTask {
 
 //    @Scheduled(cron = "0 0 15 * * ?")
     private void Timeth() {
+        /**
+         * 优惠券离失效日只剩3天还没领取，在当天，下午3点推送
+         *
+         * 【采美365】您有100元优惠券尚未领取，优惠券将于3日后失效，快戳采美网站链接www.caimei365.com/M2Tr98CG
+         * 或微信搜索“采美采购商城”小程序登录采美平台领取使用吧。关注公众号“采美网”获取更多优惠和精彩资讯。
+         */
         log.info("----------------------------优惠券三天后过期---------------------------------");
         List<CmCouponPo> coupons = messageCenterMapper.findOutTimeCoupons(3);
         log.info("优惠券三天过期的有-------------------》" + coupons.toString());

src/main/java/com/caimei365/tools/utils/SmsUtil.java

@@ -82,9 +82,6 @@ public class SmsUtil {
         try {
             List<String> list = new ArrayList<>();
             list.add("15917362709");
-            list.add("15814011616");
-            list.add("13100721916");
-            list.add("15113936829");
             list.add("15827317748");
             list.add("18476937515");
             list.add("18229303772");

src/main/resources/mapper/OrderClubMapper.xml

@@ -18,7 +18,7 @@
     </select>
 
     <select id="oredrStatus" resultType="com.caimei365.tools.model.po.OrderVo">
-        SELECT * FROM cm_order WHERE `status`=0
+        SELECT orderTime,clubID,orderID FROM cm_order WHERE `status`=0
     </select>
 
     <select id="cmorderconfig" resultType="java.lang.Integer">