群发bug修复

linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerController.java

@@ -91,20 +91,26 @@ public class WeCustomerController extends BaseController
         List<WeCustomerList> list = weCustomerService.findWeCustomerList(weCustomerList);
         if(CollectionUtil.isNotEmpty(list)){
             list.stream().forEach(k->{
-                WeFlowerCustomerRel customerRel = weFlowerCustomerRelService.getOne(new LambdaQueryWrapper<WeFlowerCustomerRel>()
+                List<WeFlowerCustomerRel> relList = weFlowerCustomerRelService.list(new LambdaQueryWrapper<WeFlowerCustomerRel>()
                         .eq(WeFlowerCustomerRel::getUserId, k.getFirstUserId())
                         .eq(WeFlowerCustomerRel::getExternalUserid, k.getExternalUserid()));
-                if(customerRel !=null){
-                    customerRel.setWeFlowerCustomerTagRels(
-                            weFlowerCustomerTagRelService.list(new LambdaQueryWrapper<WeFlowerCustomerTagRel>()
-                                    .eq(WeFlowerCustomerTagRel::getUserId,k.getFirstUserId())
-                                    .eq(WeFlowerCustomerTagRel::getExternalUserid,k.getExternalUserid()))
-                    );
+                if(CollectionUtil.isNotEmpty(relList)){
+                    WeFlowerCustomerRel customerRel = relList.stream().findFirst().get();
+
+                    if(customerRel !=null){
+                        customerRel.setWeFlowerCustomerTagRels(
+                                weFlowerCustomerTagRelService.list(new LambdaQueryWrapper<WeFlowerCustomerTagRel>()
+                                        .eq(WeFlowerCustomerTagRel::getUserId,k.getFirstUserId())
+                                        .eq(WeFlowerCustomerTagRel::getExternalUserid,k.getExternalUserid()))
+                        );
+                    }
+
+                    k.setWeFlowerCustomerRels(ListUtil.toList(
+                            customerRel
+                    ));
+
                 }
 
-                k.setWeFlowerCustomerRels(ListUtil.toList(
-                        customerRel
-                ));
             });
 
         }

linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerMessagePushClient.java

@@ -24,7 +24,7 @@ public interface WeCustomerMessagePushClient {
      */
     @Deprecated
     @Request(url = "/externalcontact/add_msg_template", type = "POST")
-    SendMessageResultDto sendCustomerMessageToUser(@Body WeCustomerMessagePushDto customerMessagePushDto);
+    SendMessageResultDto sendCustomerMessageToUser(@JSONBody WeCustomerMessagePushDto customerMessagePushDto);
 
 
 

linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WePosterServiceImpl.java

@@ -29,6 +29,7 @@ import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.net.URL;
 import java.util.List;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -114,7 +115,7 @@ public class WePosterServiceImpl extends ServiceImpl<WePosterMapper, WePoster> i
     }
 
     /**
-     * 生成海报图片地址
+     * 生成海报图片地址(合成图片+文字)
      *
      * @param poster
      * @return
@@ -125,6 +126,7 @@ public class WePosterServiceImpl extends ServiceImpl<WePosterMapper, WePoster> i
             poster.setSampleImgPath(poster.getBackgroundImgPath());
             return poster.getBackgroundImgPath();
         }
+
         Set<String> existFontId = new HashSet<>();
 
 
@@ -158,7 +160,15 @@ public class WePosterServiceImpl extends ServiceImpl<WePosterMapper, WePoster> i
 
         Map<String, BufferedImage> bufferedImageMap = fileCallableMap.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, stringFileCallableEntry -> {
             try {
-                return ImageUtils.copyBufferedImage(ImageIO.read(new ByteArrayInputStream(Objects.requireNonNull(NetFileUtils.getByteArrayOutputStream(stringFileCallableEntry.getValue(), false)).toByteArray())),
+
+
+
+                ByteArrayOutputStream byteArrayOutputStream = NetFileUtils.getByteArrayOutputStream(stringFileCallableEntry.getValue(), false);
+
+
+
+
+                return ImageUtils.copyBufferedImage(ImageIO.read(new ByteArrayInputStream(Objects.requireNonNull(byteArrayOutputStream).toByteArray())),
                         BufferedImage.TYPE_INT_ARGB);
             } catch (IOException e) {
                 e.printStackTrace();