bugfix

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

@@ -391,19 +391,19 @@ public class OrderClubServiceImpl implements OrderClubService {
                     name += "...";
                 }
 
-                String associateTitle = "订单已成功提交，等待付款！";
-                Double money = order.getPayTotalFee();
-                String orderno = orderClubMapper.getOrderNo(orderId);
-                String remarkText = "下单时间：" + order.getOrderTime() + "点击详情进行付款";
-                // 跳转到【小程序付款-选择支付方式页面】
-                String pagePath = "pages/user/order/order-details?type=share&orderId=" + orderId;
-                for (String openid : openidList) {
-                    // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接)
-                    weChatService.sendTemplateMsgs(accessToken, openid, associateTitle, name, orderno, money, remarkText, pagePath);
-                }
-            } catch (Exception e) {
-                log.error("【订单发货通知】获取微信公众号access_token异常！", e);
+            String associateTitle = "订单已成功提交，等待付款！";
+            Double money=order.getPayTotalFee();
+            String orderno = orderClubMapper.getOrderNo(orderId);
+            String remarkText = "下单时间：" + order.getOrderTime() +"点击详情进行付款";
+            // 跳转到【小程序付款-选择支付方式页面】
+            String pagePath = "pages/user/order/order-details?type=share&orderId="+orderId;
+            for (String openid : openidList) {
+                // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接)
+                weChatService.sendTemplateMsgs(accessToken, openid, associateTitle, name,orderno, money, remarkText, pagePath);
             }
+        } catch (Exception e) {
+            log.error("【订单发货通知】获取微信公众号access_token异常！", e);
+        }
         }
         order.setUpdateDate(curDateStr);
         order.setConfirmTime(curDateStr);
@@ -873,15 +873,15 @@ public class OrderClubServiceImpl implements OrderClubService {
      * @param orderId 订单Id
      */
     @Override
-    public ResponseJson<Map<String, Object>> getOrderShareInitProduct(Integer orderId) {
+    public ResponseJson<Map<String,Object>> getOrderShareInitProduct(Integer orderId) {
         List<OrderProductVo> orderProductList = orderCommonMapper.getOrderProductByOrderId(orderId);
         orderProductList.forEach(orderProduct -> orderProduct.setImage(ImageUtil.getImageUrl("product", orderProduct.getImage(), domain)));
         OrderVo order = orderCommonMapper.getOrderByOrderId(orderId);
         orderCommonService.setOrderStatus(order);
         HashMap<String, Object> result = new HashMap<>(2);
         orderCommonService.getDiscernReceiptAndSetOrder(order);
-        result.put("productList", orderProductList);
-        result.put("orderStatus", order.getStatus());
+        result.put("productList",orderProductList);
+        result.put("orderStatus",order.getStatus());
         //2021.12.14 去掉paybutton判断
 //        result.put("payButton", order.isPayButton());
         return ResponseJson.success(result);

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

@@ -229,7 +229,8 @@ 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) && !"6060".equals(orderClubMapper.getProductOrder(orderId))) {
+            List<Integer> productIds = orderClubMapper.getProductOrder(orderId);
+            if (0 == orderClubMapper.getsecondHandOrderFlag(orderId) && 0 == orderClubMapper.getrebateFlag(orderId) && (null != productIds && !productIds.contains(6060))) {
                 try {
                     String accessToken = weChatService.getAccessToken();
                     List<String> openidList = orderClubMapper.getOpenidListByPermission(orderClubMapper.FromUnionId(order.getOrderId()));
@@ -1125,7 +1126,8 @@ public class PayOrderServiceImpl implements PayOrderService {
             return ResponseJson.error(-2, "支付失败", "付款次数异常");
         } else if (dbPayCounter > paySuccessCounter) {
             if (1 == orderClubMapper.getReceiptStatus(orderId)) {
-                if (0 == orderClubMapper.getsecondHandOrderFlag(orderId) && 0 == orderClubMapper.getrebateFlag(orderId)) {
+                List<Integer> productIds = orderClubMapper.getProductOrder(orderId);
+                if (0 == orderClubMapper.getsecondHandOrderFlag(orderId) && 0 == orderClubMapper.getrebateFlag(orderId) && (null != productIds && !productIds.contains(6060))) {
                     try {
                         String accessToken = weChatService.getAccessToken();
                         String unionid = orderClubMapper.FromUnionId(orderId);

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

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