no message

src/main/java/com/gree/mall/miniapp/bean/user/CurrentCompanyWechat.java

@@ -1,9 +1,6 @@
 package com.gree.mall.miniapp.bean.user;
 
-import com.gree.mall.miniapp.plus.entity.AdminCompanyWechat;
-import com.gree.mall.miniapp.plus.entity.AdminCompanyWechatOther;
-import com.gree.mall.miniapp.plus.entity.AdminWebsit;
-import com.gree.mall.miniapp.plus.entity.User;
+import com.gree.mall.miniapp.plus.entity.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -28,5 +25,14 @@ public class CurrentCompanyWechat extends AdminCompanyWechat{
     @ApiModelProperty("师傅昵称")
     private User user;
 
+    @ApiModelProperty(value = "主logo")
+    private String minLogo1;
+
+    @ApiModelProperty(value = "通用logo")
+    private String minLogo2;
+
+    @ApiModelProperty(value = "头像logo")
+    private String minLogo3;
+
 
 }

src/main/java/com/gree/mall/miniapp/logic/common/CommonLogic.java

@@ -54,6 +54,8 @@ public class CommonLogic {
     @Autowired
     AdminCompanyWechatOtherService adminCompanyWechatOtherService;
     @Autowired
+    AdminCompanyWechatTemplateService adminCompanyWechatTemplateService;
+    @Autowired
     GoodsService goodsService;
     @Autowired
     OSSUtil ossUtil;
@@ -102,6 +104,10 @@ public class CommonLogic {
 //            throw new RemoteServiceException("非法请求，请联系管理员配置必要的参数:"+appid);
 //        }
 
+        AdminCompanyWechatTemplate adminCompanyWechatTemplate = adminCompanyWechatTemplateService.lambdaQuery()
+            .last("limit 1")
+            .one();
+
         User user = userService.getById(userId);
 
         CurrentCompanyWechat currentCompanyWechat = new CurrentCompanyWechat();
@@ -115,6 +121,9 @@ public class CommonLogic {
         currentCompanyWechat.setSubSecret(wechatSubSecret);
         currentCompanyWechat.setUserId(CommonUtils.getUserId(request));
         currentCompanyWechat.setUser(user);
+        currentCompanyWechat.setMinLogo1(adminCompanyWechatTemplate.getMinLogo1());
+        currentCompanyWechat.setMinLogo2(adminCompanyWechatTemplate.getMinLogo2());
+        currentCompanyWechat.setMinLogo3(adminCompanyWechatTemplate.getMinLogo3());
 
 
         if (user != null && !StringUtil.isEmpty(user.getWebsitId())) {