Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

consumer/src/main/java/cn/lili/event/impl/WechatMessageExecute.java

@@ -39,7 +39,6 @@ public class WechatMessageExecute implements OrderStatusChangeEvent, TradeEvent
     public void orderChange(OrderMessage orderMessage) {
 
         switch (orderMessage.getNewStatus()) {
-            case PAID:
             case UNDELIVERED:
             case DELIVERED:
             case STAY_PICKED_UP:

framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java

@@ -217,7 +217,7 @@ public class ConnectServiceImpl extends ServiceImpl<ConnectMapper, Connect> impl
                         connectQueryDTO.getUnionType())
                 .eq(CharSequenceUtil.isNotEmpty(connectQueryDTO.getUnionId()), Connect::getUnionId,
                         connectQueryDTO.getUnionId());
-        return this.getOne(queryWrapper);
+        return this.getOne(queryWrapper,false);
     }
 
     @Override

framework/src/main/java/cn/lili/modules/logistics/plugin/kdniao/KdniaoPlugin.java

@@ -200,8 +200,9 @@ public class KdniaoPlugin implements LogisticsPlugin {
             JSONObject obj = JSONObject.parseObject(result);
             log.info("电子面单响应：{}", result);
             if (!"100".equals(obj.getString("ResultCode"))) {
-                resultMap.put("Reason",obj.getString("Reason"));
+//                resultMap.put("Reason",obj.getString("Reason"));
-                return resultMap;
+                throw new ServiceException(obj.getString("Reason"));
+//                return resultMap;
             }
 
             JSONObject orderJson = JSONObject.parseObject(obj.getString("Order"));

framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageUtil.java

@@ -9,7 +9,6 @@ import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.DateUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.connect.entity.Connect;
-import cn.lili.modules.connect.entity.enums.ConnectEnum;
 import cn.lili.modules.connect.entity.enums.SourceEnum;
 import cn.lili.modules.connect.service.ConnectService;
 import cn.lili.modules.member.entity.dto.ConnectQueryDTO;
@@ -79,16 +78,22 @@ public class WechatMessageUtil {
         if (order == null) {
             throw new ServiceException("订单" + sn + "不存在，发送微信公众号消息错误");
         }
+        if (ClientTypeEnum.H5.name().equals(order.getClientType())) {
             //获取微信消息
             LambdaQueryWrapper<WechatMessage> wechatMessageQueryWrapper = new LambdaQueryWrapper();
             wechatMessageQueryWrapper.eq(WechatMessage::getOrderStatus, order.getOrderStatus());
             WechatMessage wechatMessage = wechatMessageService.getOne(wechatMessageQueryWrapper);
+
             if (wechatMessage == null) {
+                log.error("未配置微信公众号消息");
                 return;
             }
 
             Connect connect = connectService.queryConnect(
-                ConnectQueryDTO.builder().userId(order.getMemberId()).unionType(ConnectEnum.WECHAT.name()).build()
+                    ConnectQueryDTO.builder()
+                            .userId(order.getMemberId())
+                            .unionType(SourceEnum.WECHAT_OFFIACCOUNT_OPEN_ID.name())
+                            .build()
             );
             if (connect == null) {
                 return;
@@ -122,6 +127,7 @@ public class WechatMessageUtil {
                 log.error("消息发送请求：" + map.get("data"));
             }
         }
+    }
 
     /**
      * 发送微信消息
@@ -135,6 +141,8 @@ public class WechatMessageUtil {
         if (order == null) {
             throw new ServiceException("订单" + sn + "不存在，发送订阅消息错误");
         }
+        if (ClientTypeEnum.WECHAT_MP.name().equals(order.getClientType())) {
+
             //获取微信消息
             LambdaQueryWrapper<WechatMPMessage> wechatMPMessageQueryWrapper = new LambdaQueryWrapper();
             wechatMPMessageQueryWrapper.eq(WechatMPMessage::getOrderStatus, order.getOrderStatus());
@@ -174,7 +182,7 @@ public class WechatMessageUtil {
                 log.error("微信消息发送错误", e);
             }
             JSONObject json = new JSONObject(content);
-        log.info("微信消息发送结果：" + content);
+            log.info("微信小程序消息发送结果：" + content);
             String errorMessage = json.getStr("errmsg");
             String errcode = json.getStr("errcode");
             //发送失败
@@ -184,6 +192,7 @@ public class WechatMessageUtil {
                 log.error("消息发送请求：" + map.get("data"));
             }
         }
+    }
 
     /**
      * 构造数据中所需的内容