bugfix

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

@@ -331,7 +331,7 @@ public class OrderClubServiceImpl implements OrderClubService {
         if (MathUtil.compare(order.getCouponAmount(), 0) > 0) {
             // 确认订单时才真正使用优惠券
             CouponOrderRecordPo couponOrderRecord = orderClubMapper.getOrderCouponRecord(orderId);
-            CouponVo coupon = orderClubMapper.getClubCouponById(couponOrderRecord.getClubCouponId(),orderClubMapper.findUserId(orderId));
+            CouponVo coupon = orderClubMapper.getClubCouponById(couponOrderRecord.getClubCouponId(), orderClubMapper.findUserId(orderId));
             if (coupon == null) {
                 return ResponseJson.error("订单内优惠券已被使用", null);
             } else {
@@ -374,34 +374,36 @@ public class OrderClubServiceImpl implements OrderClubService {
             order.setStatus(31);
             order.setReceiptStatus(3);
         }
-log.info("********************下单微信公众号消息推送***************************");
-        if (0==order.getSecondHandOrderFlag() && 0==order.getRebateFlag() && !"6060".equals(orderClubMapper.getProductOrder(order.getOrderId())) && order.getOrderType()!=0) {
-            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(orderClubMapper.FromUnionId(order.getOrderId()));
-            openidList.removeIf(Objects::isNull);
-            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-details?type=share&orderId="+orderId;
-            for (String openid : openidList) {
-                // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接)
-                weChatService.sendTemplateMsgs(accessToken, openid, associateTitle, name,orderno, money, remarkText, pagePath);
+        log.info("********************下单微信公众号消息推送***************************");
+        if (0 == order.getSecondHandOrderFlag() && 0 == order.getRebateFlag() && !orderClubMapper.getProductOrder(order.getOrderId()).contains(6060) && order.getOrderType() != 0) {
+            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(orderClubMapper.FromUnionId(order.getOrderId()));
+                openidList.removeIf(Objects::isNull);
+                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-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);
             }
-        } catch (Exception e) {
-            log.error("【订单发货通知】获取微信公众号access_token异常！", e);
-        }
         }
         order.setUpdateDate(curDateStr);
         order.setConfirmTime(curDateStr);
@@ -871,15 +873,15 @@ log.info("********************下单微信公众号消息推送*****************
      * @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);