微信消息推送改了订金订单判断

src/main/java/com/caimei365/order/components/WeChatService.java

@@ -355,7 +355,7 @@ public class WeChatService {
         JSONObject first = new JSONObject();
         first.put("value", title);
         JSONObject keyword1 = new JSONObject();
-        keyword1.put("value", name+"...");
+        keyword1.put("value", name);
         JSONObject keyword2 = new JSONObject();
         keyword2.put("value", orderno);
         JSONObject keyword3 = new JSONObject();

src/main/java/com/caimei365/order/mapper/OrderClubMapper.java

@@ -240,11 +240,11 @@ public interface OrderClubMapper {
     /**
      * 根据用户id获取用户openid列表(微信公众号openid,下单)
      */
-    List<String> getOpenidListByPermission(Integer userid,String unionid);
+    List<String> getOpenidListByPermission(String unionid);
 
     String getOpenidunionId(Integer userid);
      //查询是否是订金订单6060是订金订单其他不是
-    String getProductOrder(Integer orderid);
+    List<Integer> getProductOrder(Integer orderid);
     /*
      *根据orderId查询商品名称
      */

src/main/java/com/caimei365/order/mapper/PayOrderMapper.java

@@ -95,7 +95,7 @@ public interface PayOrderMapper {
     /**
      * 根据用户id获取用户openid列表(微信公众号openid,下单)
      */
-    List<String> getOpenidListByPermission(Integer userid,String unionid);
+    List<String> getOpenidListByPermission(String unionid);
 
     /**
      * 保存分账详情

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

@@ -377,17 +377,23 @@ public class OrderClubServiceImpl implements OrderClubService {
 log.info("********************下单微信公众号消息推送***************************");
         if (0==order.getSecondHandOrderFlag() && 0==order.getRebateFlag() && !"6060".equals(orderClubMapper.getProductOrder(order.getOrderId()))) {
             log.info("*******"+order.getSecondHandOrderFlag()+"**********"+order.getRebateFlag());
+            log.info("*******获取公众名"+orderClubMapper.getOrderIds(orderId).toString());
+            String name="0";
         try {
             String accessToken = weChatService.getAccessToken();
-            List<String> openidList = orderClubMapper.getOpenidListByPermission(order.getUserId(),submitService.unionId);
+            List<String> openidList = orderClubMapper.getOpenidListByPermission(submitService.unionId);
             openidList.removeIf(Objects::isNull);
-            String name= StringUtils.strip(orderClubMapper.getOrderIds(orderId).toString().substring(0,11), "[]");
+            String i=orderClubMapper.getOrderIds(orderId).toString();
+            if(i.length()<10){
+                 name= StringUtils.strip(i, "[]");
+            }else { name= StringUtils.strip(i.substring(0,11), "[]"); name+="...";}
+
             String associateTitle = "订单已成功提交，等待付款！";
             Double money=order.getPayTotalFee();
             String orderno = orderClubMapper.getOrderNo(orderId);
             String remarkText = "下单时间：" + order.getOrderTime() +"点击详情进行付款";
             // 跳转到【小程序付款-选择支付方式页面】
-            String pagePath = "pages/user/order/order-payment?type=payfirm&orderId="+orderId;
+            String pagePath = "pages/user/order/order-details?orderId="+orderId;
             for (String openid : openidList) {
                 // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接)
                 weChatService.sendTemplateMsgs(accessToken, openid, associateTitle, name,orderno, money, remarkText, pagePath);

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

@@ -258,7 +258,7 @@ public class PayOrderServiceImpl implements PayOrderService {
                     try {
                         log.info("unionid>>>>>"+weChatService.unionid);
                         String accessToken = weChatService.getAccessToken();
-                        List<String> openidList = payOrderMapper.getOpenidListByPermission(userid,orderClubMapper.getOpenidunionId(userid));
+                        List<String> openidList = payOrderMapper.getOpenidListByPermission(orderClubMapper.getOpenidunionId(userid));
                         openidList.removeIf(Objects::isNull);
                         String name = StringUtils.strip(orderClubMapper.getOrderIds(orderId).toString().substring(0,11), "[]");
                         String associateTitle = "订单支付成功！";
@@ -864,7 +864,7 @@ public class PayOrderServiceImpl implements PayOrderService {
                     try {
                         String accessToken = weChatService.getAccessToken();
                         log.info(">>>>>>>>>>>>>>>>>"+userid+">>>>>>>>>>>>>>"+orderClubMapper.getOpenidunionId(userid));
-                        List<String> openidList = payOrderMapper.getOpenidListByPermission(userid,orderClubMapper.getOpenidunionId(userid));
+                        List<String> openidList = payOrderMapper.getOpenidListByPermission(orderClubMapper.getOpenidunionId(userid));
                         openidList.removeIf(Objects::isNull);
                         String name = StringUtils.strip(orderClubMapper.getOrderIds(orderId).toString().substring(0,11), "[]");
                         String associateTitle = "订单支付成功！";

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

@@ -1696,7 +1696,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                             SubmitServiceImpl s=new SubmitServiceImpl();
                             try {
                                 String accessToken = weChatService.getAccessToken();
-                                List<String> openidList = orderClubMapper.getOpenidListByPermission(order.getUserId(),s.unionId);
+                                List<String> openidList = orderClubMapper.getOpenidListByPermission(s.unionId);
                                 openidList.removeIf(Objects::isNull);
                                 String name= StringUtils.strip(orderClubMapper.getOrderIds(order.getOrderId()).toString().substring(0,11), "[]");
                                 String associateTitle = "订单支付成功！";

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

@@ -1487,20 +1487,26 @@ public class SubmitServiceImpl implements SubmitService {
         }
 
         log.info("**********************微信模板消息推送*****************************");
-        if (0==mainOrder.getSecondHandOrderFlag() && 0==mainOrder.getRebateFlag() && !"6060".equals(orderClubMapper.getProductOrder(mainOrder.getOrderId())) ) {
-            log.info("*******"+mainOrder.getSecondHandOrderFlag()+"**********"+mainOrder.getRebateFlag());
+        List<Integer> productIds = orderClubMapper.getProductOrder(mainOrder.getOrderId());
+        if (0==mainOrder.getSecondHandOrderFlag() && 0==mainOrder.getRebateFlag() && (null != productIds && !productIds.contains(6060)) ) {
+            log.info("*******获取公众名"+orderClubMapper.getOrderIds(mainOrder.getOrderId()).toString());
+            String name="0";
             try {
                 String accessToken = weChatService.getAccessToken();
-                List<String> openidList = orderClubMapper.getOpenidListByPermission(mainOrder.getUserId(),unionId);
+                List<String> openidList = orderClubMapper.getOpenidListByPermission(unionId);
                 openidList.removeIf(Objects::isNull);
-                String name = StringUtils.strip(orderClubMapper.getOrderIds(mainOrder.getOrderId()).toString().substring(0,11),"[]");
+                String i=orderClubMapper.getOrderIds(mainOrder.getOrderId()).toString();
+                if(i.length()<10){
+                     name= StringUtils.strip(i, "[]");
+                }else { name= StringUtils.strip(i.substring(0,11), "[]"); name+="...";}
+
                 log.info("订单商品>>>>>"+name+""+mainOrder.getOrderId());
                 String associateTitle = "订单已成功提交，等待付款！";
                 Double money=mainOrder.getPayTotalFee();
                 String orderno = mainOrder.getOrderNo();
                 String remarkText = "下单时间：" + mainOrder.getOrderTime() +"点击详情进行付款";
                 // 跳转到【小程序付款-选择支付方式页面】
-                String pagePath = "pages/user/order/order-payment?type=payfirm&orderId="+mainOrder.getOrderId();
+                String pagePath = "pages/user/order/order-details?orderId="+mainOrder.getOrderId();
                 for (String openid : openidList) {
                     // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接
                     log.error("获取openid>>>>>"+openidList);

src/main/resources/mapper/OrderClubMapper.xml

@@ -497,9 +497,7 @@
         AND scr.delFlag = '0' AND osc.expiredTime > NOW()
     </select>
     <select id="getOpenidListByPermission" resultType="java.lang.String">
-        SELECT DISTINCT cm.crmopenid FROM  `cm_mall_operation_user` cm
-        LEFT JOIN `user` u ON u.userID = cm.userID
-        WHERE u.userID=#{userid} AND cm.unionId= #{unionid}
+        SELECT openid FROM `wechat_user` WHERE unionId= #{unionid}
     </select>
 
     <select id="getOpenidunionId" resultType="java.lang.String">
@@ -508,7 +506,7 @@
         WHERE u.userID=#{userid}
     </select>
 
-    <select id="getProductOrder" resultType="java.lang.String">
+    <select id="getProductOrder" resultType="java.lang.Integer">
         SELECT productID FROM `cm_order_product` WHERE orderId=#{orderid}
     </select>
 

src/main/resources/mapper/PayOrderMapper.xml

@@ -220,9 +220,7 @@
     </select>
 
     <select id="getOpenidListByPermission" resultType="java.lang.String">
-        SELECT DISTINCT cm.crmopenid FROM  `cm_mall_operation_user` cm
-        LEFT JOIN `user` u ON u.userID = cm.userID
-        WHERE u.userID=#{userid} AND cm.unionId= #{unionid}
+        SELECT openid FROM `wechat_user` WHERE unionId= #{unionid}
     </select>
 
     <select id="getSplitAccountList" resultType="com.caimei365.order.model.po.SplitAccountPo">