Commit ece17c12 by 墨竹

Merge remote-tracking branch 'origin/feature-0323' into feature-0323

parents 8785c994 0db89252
...@@ -99,4 +99,13 @@ public interface WelcomeApiService { ...@@ -99,4 +99,13 @@ public interface WelcomeApiService {
*/ */
ServiceResponse<Boolean> saveDefaultWelcome(String wxEnterpriseId); ServiceResponse<Boolean> saveDefaultWelcome(String wxEnterpriseId);
/**
* desc: 刷新欢迎语媒体
*
* @return : {@link ServiceResponse< Boolean>}
* @author : YongEn
* @date : 2022/3/11
*/
ServiceResponse<Boolean> flushWelcomeMedia();
} }
...@@ -24,6 +24,15 @@ public interface TabHaobanWelcomeMapper { ...@@ -24,6 +24,15 @@ public interface TabHaobanWelcomeMapper {
TabWelcome selectByWxEnterpriseId(String wxEnterpriseId); TabWelcome selectByWxEnterpriseId(String wxEnterpriseId);
/** /**
* desc: 查询所有欢迎语
*
* @return : {@link List< TabWelcome>}
* @author : YongEn
* @date : 2022/3/11
*/
List<TabWelcome> listAllWelcome();
/**
* desc: 根据微信企业id查询列表 * desc: 根据微信企业id查询列表
* *
* @param wxEnterpriseId 微信企业id * @param wxEnterpriseId 微信企业id
......
package com.gic.haoban.manage.service.service; package com.gic.haoban.manage.service.service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.service.pojo.bo.welcome.*; import com.gic.haoban.manage.service.pojo.bo.welcome.*;
import java.util.List; import java.util.List;
...@@ -105,4 +106,13 @@ public interface WelcomeService { ...@@ -105,4 +106,13 @@ public interface WelcomeService {
*/ */
Boolean existDefaultWelcome(String wxEnterpriseId); Boolean existDefaultWelcome(String wxEnterpriseId);
/**
* desc: 刷新欢迎语媒体
*
* @return : {@link ServiceResponse < Boolean>}
* @author : YongEn
* @date : 2022/3/11
*/
Boolean flushWelcomeMedia();
} }
...@@ -460,6 +460,49 @@ public class WelcomeServiceImpl implements WelcomeService { ...@@ -460,6 +460,49 @@ public class WelcomeServiceImpl implements WelcomeService {
return CollectionUtils.isNotEmpty(welcomeList); return CollectionUtils.isNotEmpty(welcomeList);
} }
@Override
public Boolean flushWelcomeMedia() {
// 列举所有加好友配置
TabHaobanFriendSetting query = new TabHaobanFriendSetting();
query.setDeleteFlag(0);
List<TabHaobanFriendSetting> friendSettingList = friendSettingMapper.queryAll(query);
if (CollectionUtils.isEmpty(friendSettingList)) {
return Boolean.TRUE;
}
Map<String, Integer> wxIdFriendTypeMap = friendSettingList.stream().collect(Collectors.toMap(
TabHaobanFriendSetting::getWxEnterpriseId,
TabHaobanFriendSetting::getFriendSettingType
));
// 查询所有欢迎语
List<TabWelcome> welcomeList = welcomeMapper.listAllWelcome();
if (CollectionUtils.isEmpty(welcomeList)) {
return Boolean.TRUE;
}
welcomeList.forEach(one -> {
Integer type = wxIdFriendTypeMap.get(one.getWxEnterpriseId());
// 构建欢迎语媒体
TabHaobanWelcomeMedia media = new TabHaobanWelcomeMedia();
media.setWelcomeMediaId(UniqueIdUtils.uniqueLong());
media.setWxEnterpriseId(one.getWxEnterpriseId());
media.setWelcomeId(one.getWelcomeId());
media.setMediaTitle("默认标题");
media.setMediaUrl("-1");
media.setMediaSize("0");
media.setMiniProgramId(null);
media.setCreateTime(new Date());
media.setDeleteFlag(0);
// 媒体类型 - 根据历史配置的加好友配置设置
if (Objects.isNull(type) || FriendSettingTypeEnum.TEXT_AND_MINI_PROGRAM.getCode().equals(type)) {
media.setMediaType(WelcomeMediaTypeEnum.PARAM_PROGRAM.getCode());
} else if (Objects.nonNull(type) && FriendSettingTypeEnum.TEXT_AND_QRCODE.getCode().equals(type)) {
media.setMediaType(WelcomeMediaTypeEnum.PARAM_QRCODE.getCode());
}
welcomeMediaMapper.insert(media);
});
return Boolean.TRUE;
}
private WelcomeDetailBO convertWelcomeToBo(TabWelcome welcome) { private WelcomeDetailBO convertWelcomeToBo(TabWelcome welcome) {
WelcomeDetailBO matchWelcome = new WelcomeDetailBO(); WelcomeDetailBO matchWelcome = new WelcomeDetailBO();
matchWelcome.setWelcomeId(welcome.getWelcomeId()); matchWelcome.setWelcomeId(welcome.getWelcomeId());
......
...@@ -136,4 +136,9 @@ public class WelcomeApiServiceImpl implements WelcomeApiService { ...@@ -136,4 +136,9 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
public ServiceResponse<Boolean> saveDefaultWelcome(String wxEnterpriseId) { public ServiceResponse<Boolean> saveDefaultWelcome(String wxEnterpriseId) {
return ServiceResponse.success(welcomeService.saveDefaultWelcome(wxEnterpriseId)); return ServiceResponse.success(welcomeService.saveDefaultWelcome(wxEnterpriseId));
} }
@Override
public ServiceResponse<Boolean> flushWelcomeMedia() {
return ServiceResponse.success(welcomeService.flushWelcomeMedia());
}
} }
...@@ -124,4 +124,10 @@ ...@@ -124,4 +124,10 @@
and status_flag = 1 and status_flag = 1
</select> </select>
<select id="listAllWelcome" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_welcome where status_flag = 1
</select>
</mapper> </mapper>
\ No newline at end of file
...@@ -178,4 +178,17 @@ public class WelcomeController extends WebBaseController { ...@@ -178,4 +178,17 @@ public class WelcomeController extends WebBaseController {
return RestResponse.successResult(response.getResult()); return RestResponse.successResult(response.getResult());
} }
/**
* desc: 刷新欢迎语媒体
*
* @return : {@link RestResponse< Boolean>}
* @author : YongEn
* @date : 2022/3/11
*/
@RequestMapping(value = "/flush-welcome-media", method = RequestMethod.GET)
public RestResponse<Boolean> flushWelcomeMedia() {
ServiceResponse<Boolean> response = welcomeApiService.flushWelcomeMedia();
return RestResponse.successResult(response.getResult());
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment