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

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

@@ -243,7 +243,8 @@ public interface OrderClubMapper {
     List<String> getOpenidListByPermission(Integer userid,String unionid);
 
     String getOpenidunionId(Integer userid);
-
+     //查询是否是订金订单6060是订金订单其他不是
+    String getProductOrder(Integer orderid);
     /*
      *根据orderId查询商品名称
      */

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

@@ -63,6 +63,8 @@ public class OrderClubServiceImpl implements OrderClubService {
     @Resource
     private WeChatService weChatService;
 
+    private SubmitServiceImpl submitService;
+
     /**
      * 获取各状态订单数量
      *
@@ -372,12 +374,12 @@ public class OrderClubServiceImpl implements OrderClubService {
             order.setStatus(31);
             order.setReceiptStatus(3);
         }
-
-        if (0==order.getSecondHandOrderFlag() && 0==order.getRebateFlag() ) {
-            SubmitServiceImpl s=new SubmitServiceImpl();
+log.info("********************下单微信公众号消息推送***************************");
+        if (0==order.getSecondHandOrderFlag() && 0==order.getRebateFlag() && !"6060".equals(orderClubMapper.getProductOrder(order.getOrderId()))) {
+            log.info("*******"+order.getSecondHandOrderFlag()+"**********"+order.getRebateFlag());
         try {
             String accessToken = weChatService.getAccessToken();
-            List<String> openidList = orderClubMapper.getOpenidListByPermission(order.getUserId(),s.unionId);
+            List<String> openidList = orderClubMapper.getOpenidListByPermission(order.getUserId(),submitService.unionId);
             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/PayOrderServiceImpl.java

@@ -253,7 +253,7 @@ public class PayOrderServiceImpl implements PayOrderService {
                 log.info("【订单支付,线上/线下余额抵扣】>>>>>>>>>>>>>>>>>>>>>>>>>>新增用户余额收支记录(insert[cm_user_balance_record])orderId：" + orderId);
                 log.info("************************订单支付完成消息推送*********************");
                 //判断是否是二手订单和返佣订单
-                if (0 == orderClubMapper.getsecondHandOrderFlag(orderId) && 0 == orderClubMapper.getrebateFlag(orderId)) {
+                if (0 == orderClubMapper.getsecondHandOrderFlag(orderId) && 0 == orderClubMapper.getrebateFlag(orderId) && !"6060".equals(orderClubMapper.getProductOrder(orderId))){
 
                     try {
                         log.info("unionid>>>>>"+weChatService.unionid);
@@ -858,9 +858,9 @@ public class PayOrderServiceImpl implements PayOrderService {
             //（收款买家）收款状态：1待收款、2部分收款、3已收款
             order.setReceiptStatus(3);
             log.info("【支付异步回调】>>>>>>>>>>>>>>订单(全部支付),修改订单状态：" + order.getStatus() + "，orderId：" + orderId);
-            log.info("************************订单支付完成消息推送*********************"+userid);
+            log.info("************************订单支付完成消息推送*********************");
             //判断是否是二手订单和返佣订单
-                if (0 == orderClubMapper.getsecondHandOrderFlag(orderId) && 0 == orderClubMapper.getrebateFlag(orderId)) {
+                if (0 == orderClubMapper.getsecondHandOrderFlag(orderId) && 0 == orderClubMapper.getrebateFlag(orderId) && !"6060".equals(orderClubMapper.getProductOrder(orderId))) {
                     try {
                         String accessToken = weChatService.getAccessToken();
                         log.info(">>>>>>>>>>>>>>>>>"+userid+">>>>>>>>>>>>>>"+orderClubMapper.getOpenidunionId(userid));

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

@@ -1690,8 +1690,9 @@ public class ReceiptServiceImpl implements ReceiptService {
                             }
                         }
                     }
+                    log.info("************************订单支付完成消息推送*********************");
                     if(3 == order.getReceiptStatus()) {
-                        if (0==order.getSecondHandOrderFlag() && 0==order.getRebateFlag() ) {
+                        if (0==order.getSecondHandOrderFlag() && 0==order.getRebateFlag() && !"6060".equals(orderClubMapper.getProductOrder(order.getOrderId())) ) {
                             SubmitServiceImpl s=new SubmitServiceImpl();
                             try {
                                 String accessToken = weChatService.getAccessToken();

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

@@ -372,31 +372,31 @@ public class ShipServiceImpl implements ShipService {
         /**
          * 发货后消息推送
          */
-        if (1 == orderClubMapper.getReceiptStatus(logisticsDto.getShopOrderId())) {
-            if (0 == orderClubMapper.getsecondHandOrderFlag(logisticsDto.getShopOrderId()) && 0 == orderClubMapper.getrebateFlag(logisticsDto.getShopOrderId())) {
-                SubmitServiceImpl s=new SubmitServiceImpl();
-                try {
-                    LogisticsInformationPo logisticsInformation = new LogisticsInformationPo();
-                    String accessToken = weChatService.getAccessToken();
-                    List<String> openidList = shipMapper.getOpenidListByPermission(shopOrder.getUserId(),s.unionId);
-                    openidList.removeIf(Objects::isNull);
-                    String company = logisticsInformation.getLogisticsCompanyName();
-                    String companyno = logisticsInformation.getNu();
-                    String associateTitle = "尊敬的采美客户，您购买的订单已经发货啦~";
-                    String time = logisticsBatch.getDeliveryTime().toString();
-                    String orderno = shopOrder.getOrderNo();
-                    String remarkText = "收到货后请记得确认收货哟~";
-                    // 跳转到【跳转到小程序订单详情页面】
-                    String pagePath = "pages/user/order/order-details?orderId=" + shipMapper.getorderID(logisticsDto.getShopOrderId());
-                    for (String openid : openidList) {
-                        // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接)
-                        weChatService.sendTemplateMsgy(accessToken, openid, associateTitle, orderno, time, company, companyno, remarkText, pagePath);
-                    }
-                } catch (Exception e) {
-                    log.error("【订单发货通知】获取微信公众号access_token异常！", e);
-                }
-            }
-        }
+//        if (1 == orderClubMapper.getReceiptStatus(logisticsDto.getShopOrderId())) {
+//            if (0 == orderClubMapper.getsecondHandOrderFlag(logisticsDto.getShopOrderId()) && 0 == orderClubMapper.getrebateFlag(logisticsDto.getShopOrderId())) {
+//                SubmitServiceImpl s=new SubmitServiceImpl();
+//                try {
+//                    LogisticsInformationPo logisticsInformation = new LogisticsInformationPo();
+//                    String accessToken = weChatService.getAccessToken();
+//                    List<String> openidList = shipMapper.getOpenidListByPermission(shopOrder.getUserId(),s.unionId);
+//                    openidList.removeIf(Objects::isNull);
+//                    String company = logisticsInformation.getLogisticsCompanyName();
+//                    String companyno = logisticsInformation.getNu();
+//                    String associateTitle = "尊敬的采美客户，您购买的订单已经发货啦~";
+//                    String time = logisticsBatch.getDeliveryTime().toString();
+//                    String orderno = shopOrder.getOrderNo();
+//                    String remarkText = "收到货后请记得确认收货哟~";
+//                    // 跳转到【跳转到小程序订单详情页面】
+//                    String pagePath = "pages/user/order/order-details?orderId=" + shipMapper.getorderID(logisticsDto.getShopOrderId());
+//                    for (String openid : openidList) {
+//                        // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接)
+//                        weChatService.sendTemplateMsgy(accessToken, openid, associateTitle, orderno, time, company, companyno, remarkText, pagePath);
+//                    }
+//                } catch (Exception e) {
+//                    log.error("【订单发货通知】获取微信公众号access_token异常！", e);
+//                }
+//            }
+//        }
                 return ResponseJson.success(logisticsBatch.getId());
 
     }

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

@@ -1487,7 +1487,8 @@ public class SubmitServiceImpl implements SubmitService {
         }
 
         log.info("**********************微信模板消息推送*****************************");
-        if (0==mainOrder.getSecondHandOrderFlag() && 0==mainOrder.getRebateFlag() ) {
+        if (0==mainOrder.getSecondHandOrderFlag() && 0==mainOrder.getRebateFlag() && !"6060".equals(orderClubMapper.getProductOrder(mainOrder.getOrderId())) ) {
+            log.info("*******"+mainOrder.getSecondHandOrderFlag()+"**********"+mainOrder.getRebateFlag());
             try {
                 String accessToken = weChatService.getAccessToken();
                 List<String> openidList = orderClubMapper.getOpenidListByPermission(mainOrder.getUserId(),unionId);

src/main/resources/mapper/OrderClubMapper.xml

@@ -508,6 +508,10 @@
         WHERE u.userID=#{userid}
     </select>
 
+    <select id="getProductOrder" resultType="java.lang.String">
+        SELECT productID FROM `cm_order_product` WHERE orderId=#{orderid}
+    </select>
+
     <select id="getOrderIds" resultType="java.lang.String">
         SELECT DISTINCT p.name FROM  product p
          LEFT JOIN cm_order_product cmp ON p.productID = cmp.productID