Merge remote-tracking branch 'origin/developer' into developerA

src/main/java/com/caimei365/order/service/impl/ReceiptServiceImpl.java

@@ -2050,6 +2050,12 @@ public class ReceiptServiceImpl implements ReceiptService {
             }
             BigDecimal otherFee = MathUtil.add(order.getDiscountFee(), MathUtil.add(shopOrder.getShopOtherFee(), shopOrder.getShopPostFee()));
             brokerage = MathUtil.sub(brokerage, otherFee);
+            // 佣金计算机构运费
+            if (order.getPostageFlag() == 1) {
+                if (order.getPostage() > 0) {
+                    brokerage = MathUtil.add(brokerage , order.getPostage());
+                }
+            }
             shopOrder.setBrokerage(brokerage.doubleValue());
         } else {
             double associateAmount = receiptMapper.countAllPayAssociateAmount(order.getOrderId());

src/main/java/com/caimei365/order/service/impl/RemoteCallServiceImpl.java

@@ -75,6 +75,7 @@ public class RemoteCallServiceImpl implements RemoteCallService {
             List<String> list = new ArrayList<>();
             list.add("15917362709");
             list.add("15814011616");
+            list.add("15827317748");
             list.add("13100721916");
             list.add("15113936829");
             list.add("18175515644");
@@ -182,15 +183,16 @@ public class RemoteCallServiceImpl implements RemoteCallService {
 
     @Override
     public void getOldUser() {
-        //17年之前的所有用户
+        //近两年新增、活跃、忠诚、沉默用户，不活跃用户带医用户
         List<PushMessageUserVo> pushUsers = messagePushMapper.findOldUser();
         //https://www.caimei365.com/product/hot.html指向新品橱窗
-        String url = "https://www.caimei365.com/page-370.html";
+        String url = "https://zp.caimei365.com/12/ross/activity/challenge";
         List<String> list = new ArrayList<String>();
-        list.add("15917362709");
+//        list.add("15917362709");
         list.add("15827317748");
-        list.add("18476937515");
-        list.add("18605868824");
+//        list.add("18476937515");
+//        list.add("18605868824");
+//        list.add("18670511721");
         list.forEach(l -> {
             PushMessageUserVo pushMessageUserVo = new PushMessageUserVo();
             pushMessageUserVo.setMobile(l);
@@ -203,8 +205,7 @@ public class RemoteCallServiceImpl implements RemoteCallService {
             p.setMarkId(23);
             messagePushMapper.insertNewLink(p);
 
-            String content = "双11最后一天，错过再等一年！禾雅堂颜层水光仪仅1.6万、瑞漾医用耗材买十送一、买十送二，猛戳https://www.caimei365.com/t/" +
-                    link + "，退订回T";
+            String content = "[西班牙ROSS]尊贵的ROSS会员，ROSS抖音任务挑战赛已经开始啦！发视频Win网红探店，快来参与吧，更多惊喜戳 https://www.caimei365.com/t/" +link + " ，退订回T。【采美网提供技术支持】";
             getSendSms(3,23, p.getMobile(), content);
             log.info("userId-------------------->" + p.getUserId() + "发送手机号------------------------>" + p.getMobile() + "短信-------------->" + content);
         });

src/main/resources/mapper/MessagePushMapper.xml

@@ -20,14 +20,51 @@
         WHERE shortLink = #{shortLink}
     </select>
     <select id="findOldUser" resultType="com.caimei365.order.model.vo.PushMessageUserVo">
-        SELECT c.userID, c.clubID, c.contractMobile AS mobile
-        FROM club c
-        LEFT JOIN cm_short_link csl ON c.clubId=csl.clubid
-        WHERE c.ADDTIME <![CDATA[ < ]]> '2017-01-01 00:00:00'
-        AND c.clubId > 1037
-        AND c.contractMobile IS NOT NULL
-        AND c.contractMobile NOT LIKE '%-%'
-        AND c.status !=94
-        AND csl.viewTime IS NULL
+        #         SELECT * FROM (
+#                           SELECT
+#                               DISTINCT a.clubID AS clubID,
+#                                        u.userID AS userID,
+#                                        a.contractMobile AS mobile
+#                           FROM club a
+#                                    LEFT JOIN USER u ON u.userID = a.userID
+#                                    LEFT JOIN cm_svip_user csu ON csu.userId = u.userID
+#                                    LEFT JOIN serviceprovider sp ON sp.serviceProviderID = a.spID
+#                                    LEFT JOIN town b ON b.townID=a.townID
+#                                    LEFT JOIN city c ON c.cityID=b.cityID
+#                                    LEFT JOIN province d ON d.provinceID=c.provinceID
+#                                    LEFT JOIN cm_organ_value_system covs ON a.userID = covs.userID
+#                           WHERE
+#                               covs.stage = 0 AND covs.delType = 1 AND a.status = 90
+#                             AND  (covs.activeState = '新增用户' OR covs.activeState = '活跃用户' OR covs.activeState = '忠诚用户' OR covs.activeState = '沉默用户')
+#                             AND u.registerTime BETWEEN '2021-01-01'  AND '2022-12-01'
+#                             AND (u.userOrganizeID IN(0,1) OR u.clubStatus != 92)
+#                           UNION
+#                           SELECT
+#                               DISTINCT a.clubID AS clubID,
+#                                        u.userID AS userID,
+#                                        a.contractMobile AS contractMobile
+#                           FROM club a
+#                                    LEFT JOIN USER u ON u.userID = a.userID
+#                                    LEFT JOIN cm_svip_user csu ON csu.userId = u.userID
+#                                    LEFT JOIN serviceprovider sp ON sp.serviceProviderID = a.spID
+#                                    LEFT JOIN town b ON b.townID=a.townID
+#                                    LEFT JOIN city c ON c.cityID=b.cityID
+#                                    LEFT JOIN province d ON d.provinceID=c.provinceID
+#                                    LEFT JOIN cm_organ_value_system covs ON a.userID = covs.userID
+#                           WHERE
+#                               covs.stage = 0 AND covs.delType = 1 AND a.status = 90
+#                             AND a.userID IN ( SELECT userID FROM club WHERE userID IN (SELECT userID FROM cm_organ_value_system WHERE stage = 0 AND activeState LIKE '%不活跃用户%') AND NAME LIKE '%医%' )
+#                             AND u.registerTime BETWEEN '2021-01-01'  AND '2022-12-01'
+#                             AND (u.userOrganizeID IN(0,1) OR u.clubStatus != 92)
+#                       ) b WHERE clubID NOT IN (11640,11365,9412,8866)
+        SELECT cu.mobile,
+               cu.authId AS userId
+        FROM cm_brand_club_user cu
+                 LEFT JOIN cm_brand_auth a ON cu.authId = a.id
+        WHERE cu.authUserId = 12
+          AND cu.delFlag = 0
+          AND (a.id IS NULL || a.delFlag = 0)
+          AND cu.id NOT IN (51, 56, 57)
+        ORDER BY cu.addTime DESC
     </select>
-</mapper>
+</mapper>