Merge branch 'feature-02-28' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/out/WelcomeApiService.java

@@ -52,11 +52,12 @@ public interface WelcomeApiService {
      * desc: 获取欢迎语详情
      *
      * @param welcomeId 欢迎语id
+     * @param enterpriseId 企业id
      * @return : {@link ServiceResponse< WelcomeDetailDTO>}
      * @author : YongEn
      * @date : 2022/2/11
      */
-    ServiceResponse<WelcomeDetailDTO> getWelcome(String welcomeId);
+    ServiceResponse<WelcomeDetailDTO> getWelcome(String welcomeId, String enterpriseId);
 
     /**
      * desc: 保存加好友配置

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/WelcomeService.java

@@ -46,12 +46,13 @@ public interface WelcomeService {
     /**
      * desc: 获取欢迎语详情
      *
-     * @param welcomeId 欢迎语id
+     * @param welcomeId    欢迎语id
+     * @param enterpriseId 企业id
      * @return : {@link WelcomeDetailBO}
      * @author : YongEn
      * @date : 2022/2/8
      */
-    WelcomeDetailBO getWelcome(String welcomeId);
+    WelcomeDetailBO getWelcome(String welcomeId, String enterpriseId);
 
     /**
      * desc: 保存加好友配置

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeServiceImpl.java

@@ -222,7 +222,7 @@ public class WelcomeServiceImpl implements WelcomeService {
     }
 
     @Override
-    public WelcomeDetailBO getWelcome(String welcomeId) {
+    public WelcomeDetailBO getWelcome(String welcomeId, String enterpriseId) {
         TabWelcome welcome = welcomeMapper.selectByPrimaryKey(welcomeId);
         if (Objects.isNull(welcome)) {
             throw new RuntimeException("欢迎语数据不存在");
@@ -240,7 +240,7 @@ public class WelcomeServiceImpl implements WelcomeService {
                 convertWelcomeMedia(welcomeMediaMapper.listByWelcomeId(welcome.getWelcomeId()))
         );
         // 为媒体列表添加小程序
-        assemblyMiniProgram(welcome, welcomeDetail);
+        assemblyMiniProgram(welcome, welcomeDetail, enterpriseId);
 
         // 适用部门列表
         TabHaobanWelcomeSuitRang deptRangQuery = new TabHaobanWelcomeSuitRang();
@@ -263,24 +263,35 @@ public class WelcomeServiceImpl implements WelcomeService {
         return welcomeDetail;
     }
 
-    private void assemblyMiniProgram(TabWelcome welcome, WelcomeDetailBO welcomeDetail) {
+    private void assemblyMiniProgram(TabWelcome welcome, WelcomeDetailBO welcomeDetail, String enterpriseId) {
         TabHaobanFriendSetting friendSetting = friendSettingMapper.getByWxEnterpriseId(welcome.getWxEnterpriseId());
-        if (Objects.isNull(friendSetting) || FriendSettingTypeEnum.TEXT_AND_MINI_PROGRAM.getCode().equals(friendSetting.getFriendSettingType())) {
-            WelcomeMediaBO welcomeMediaBO = new WelcomeMediaBO();
-            List<TabMiniprogramSetting> tabMiniprogramSettings = miniprogramSettingMapper.listMiniprogramSetting(welcome.getWxEnterpriseId());
-            if (CollectionUtils.isNotEmpty(tabMiniprogramSettings)) {
-                TabMiniprogramSetting setting = tabMiniprogramSettings.get(0);
-                welcomeMediaBO.setWxEnterpriseId(welcome.getWxEnterpriseId());
-                welcomeMediaBO.setMediaTitle(setting.getTitle());
-                welcomeMediaBO.setMediaType(WelcomeMediaTypeEnum.PROGRAM.getCode());
-                welcomeMediaBO.setMiniProgramName(setting.getMiniprogramName());
-                welcomeMediaBO.setMediaUrl(setting.getImageUrl());
-                if (CollectionUtils.isEmpty(welcomeDetail.getWelcomeMediaList())) {
-                    welcomeDetail.setWelcomeMediaList(new ArrayList<>());
-                }
-                welcomeDetail.getWelcomeMediaList().add(welcomeMediaBO);
+        if (Objects.nonNull(friendSetting) && !FriendSettingTypeEnum.TEXT_AND_MINI_PROGRAM.getCode().equals(friendSetting.getFriendSettingType())) {
+            return;
+        }
+        TabMiniprogramSetting matchMiniProgram = null;
+        if (StringUtils.isNotEmpty(enterpriseId)) {
+             matchMiniProgram = miniprogramSettingMapper.getMiniprogramSetting(welcome.getWxEnterpriseId(), enterpriseId);
+        }
+        if (Objects.isNull(matchMiniProgram)) {
+            List<TabMiniprogramSetting> miniProgramSettings = miniprogramSettingMapper.listMiniprogramSetting(welcome.getWxEnterpriseId());
+            if (CollectionUtils.isNotEmpty(miniProgramSettings)) {
+                matchMiniProgram = miniProgramSettings.get(0);
             }
         }
+        if (Objects.isNull(matchMiniProgram)) {
+            logger.info("无小程序配置, {}", welcome.getWxEnterpriseId());
+            return;
+        }
+        WelcomeMediaBO welcomeMediaBO = new WelcomeMediaBO();
+        welcomeMediaBO.setWxEnterpriseId(welcome.getWxEnterpriseId());
+        welcomeMediaBO.setMediaTitle(matchMiniProgram.getTitle());
+        welcomeMediaBO.setMediaType(WelcomeMediaTypeEnum.PROGRAM.getCode());
+        welcomeMediaBO.setMiniProgramName(matchMiniProgram.getMiniprogramName());
+        welcomeMediaBO.setMediaUrl(matchMiniProgram.getImageUrl());
+        if (CollectionUtils.isEmpty(welcomeDetail.getWelcomeMediaList())) {
+            welcomeDetail.setWelcomeMediaList(new ArrayList<>());
+        }
+        welcomeDetail.getWelcomeMediaList().add(welcomeMediaBO);
     }
 
     @Override

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WelcomeApiServiceImpl.java

@@ -87,8 +87,8 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
     }
 
     @Override
-    public ServiceResponse<WelcomeDetailDTO> getWelcome(String welcomeId) {
-        WelcomeDetailBO welcome = welcomeService.getWelcome(welcomeId);
+    public ServiceResponse<WelcomeDetailDTO> getWelcome(String welcomeId, String enterpriseId) {
+        WelcomeDetailBO welcome = welcomeService.getWelcome(welcomeId, enterpriseId);
         // 数据转换
         WelcomeDetailDTO dto = new WelcomeDetailDTO();
         dto.setWelcomeId(welcome.getWelcomeId());

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WelcomeController.java

@@ -102,11 +102,12 @@ public class WelcomeController extends WebBaseController {
      * @date : 2022/2/11
      */
     @RequestMapping(value = "/get", method = RequestMethod.GET)
-    public RestResponse<WelcomeDetailDTO> getWelcome(@RequestParam("welcomeId") String welcomeId) {
+    public RestResponse<WelcomeDetailDTO> getWelcome(@RequestParam("welcomeId") String welcomeId,
+                                                     @RequestParam("enterpriseId") String enterpriseId) {
         if (StringUtils.isEmpty(welcomeId)) {
             RestResponse.failure(Constant.STRING_1, "欢迎语id为空");
         }
-        ServiceResponse<WelcomeDetailDTO> response = welcomeApiService.getWelcome(welcomeId);
+        ServiceResponse<WelcomeDetailDTO> response = welcomeApiService.getWelcome(welcomeId, enterpriseId);
         return RestResponse.successResult(response.getResult());
     }