suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cc_20250723_Decoration

Browse Source 
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
This commit is contained in:
shuo.wang
2025-08-07 18:03:44 +08:00
parent aa1e6fdb22 3cec36c542
commit 3f33ed21cb
65 changed files with 3480 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
coolstore-partner-dao/src/main/java/com/cool/store/dao/MatterConfigDAO.java Normal file
View File

@@ -0,0 +1,54 @@
package com.cool.store.dao;
import com.cool.store.entity.MatterConfigDO;
import com.cool.store.mapper.MatterConfigMapper;
import com.cool.store.request.notice.MatterConfigQueryRequest;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2025/7/24 14:22
* @Version 1.0
*/
@Slf4j
@Repository
public class MatterConfigDAO {
@Resource
MatterConfigMapper matterConfigMapper;
public int insert(MatterConfigDO matterConfigDO){
return matterConfigMapper.insertSelective(matterConfigDO);
}
public int update(MatterConfigDO matterConfigDO){
return matterConfigMapper.updateByPrimaryKeySelective(matterConfigDO);
}
public MatterConfigDO getById(Long id){
return matterConfigMapper.selectByPrimaryKey(id);
}
public int updateForce(MatterConfigDO matterConfigDO){
return matterConfigMapper.updateForce(matterConfigDO);
}
public int batchDelete(List<Long> ids, String userId){
if (CollectionUtils.isEmpty(ids)){
return 0;
}
return matterConfigMapper.updateDeleteStatus(ids,userId);
}
public List<MatterConfigDO> ListByCondition(MatterConfigQueryRequest request){
return matterConfigMapper.ListByCondition(request);
}
}

76
coolstore-partner-dao/src/main/java/com/cool/store/dao/MessageTemplateDAO.java Normal file
View File

@@ -0,0 +1,76 @@
package com.cool.store.dao;
import com.cool.store.dto.notice.NoticeDTO;
import com.cool.store.entity.MessageTemplateDO;
import com.cool.store.mapper.MessageTemplateMapper;
import com.cool.store.request.notice.MessageTemplateQueryRequest;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2025/7/25 9:40
* @Version 1.0
*/
@Slf4j
@Repository
public class MessageTemplateDAO {
@Resource
private MessageTemplateMapper messageTemplateMapper;
public int insert(MessageTemplateDO messageTemplateDO) {
return messageTemplateMapper.insertSelective(messageTemplateDO);
}
public int update(MessageTemplateDO messageTemplateDO) {
return messageTemplateMapper.updateByPrimaryKeySelective(messageTemplateDO);
}
public MessageTemplateDO getById(Long id) {
return messageTemplateMapper.selectByPrimaryKey(id);
}
public List<MessageTemplateDO> getByIds(List<Long> ids) {
if (CollectionUtils.isEmpty(ids)){
return new ArrayList<>();
}
return messageTemplateMapper.selectByIds(ids);
}
public int updateDeleteStatusBatch(List<Long> ids,String userId) {
return messageTemplateMapper.updateDeleteStatusBatch(ids,userId);
}
public List<NoticeDTO> getMessageTemplateList(MessageTemplateQueryRequest request) {
return messageTemplateMapper.getMessageTemplateList(request);
}
public int batchUpdateStoreInfoAndUserInfo(List<Long> ids,
String storeInfo,
String userInfo,
String userId) {
if (CollectionUtils.isEmpty(ids)){
return 0;
}
return messageTemplateMapper.batchUpdateStoreInfoAndUserInfo(ids,storeInfo,userInfo,userId);
}
public int batchUpdatePublishStatus(List<Long> ids) {
if (CollectionUtils.isEmpty(ids)){
return 0;
}
return messageTemplateMapper.batchUpdatePublishStatus(ids);
}
}

90
coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreMessageDAO.java Normal file
View File

@@ -0,0 +1,90 @@
package com.cool.store.dao;
import cn.hutool.core.collection.CollUtil;
import com.cool.store.dto.notice.MessageTemplateCountDTO;
import com.cool.store.entity.StoreMessageDO;
import com.cool.store.mapper.StoreMessageMapper;
import com.cool.store.request.notice.StoreMessageRequest;
import com.cool.store.vo.notice.MessageDetailVO;
import com.cool.store.vo.notice.StoreMessageVO;
import io.swagger.models.auth.In;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2025/7/25 15:04
* @Version 1.0
*/
@Repository
public class StoreMessageDAO {
@Resource
StoreMessageMapper storeMessageMapper;
public StoreMessageDO getById(Long id){
return storeMessageMapper.selectByPrimaryKey(id);
}
public int update(StoreMessageDO storeMessageDO){
return storeMessageMapper.updateByPrimaryKey(storeMessageDO);
}
/**
* 批量新增
* @param list
* @return
*/
public int batchInsert(List<StoreMessageDO> list){
if (CollectionUtils.isEmpty(list)){
return 0;
}
return storeMessageMapper.insertBatch(list);
}
public List<MessageTemplateCountDTO> getMessageTemplateCountList(List<Long> templateIds){
if (CollUtil.isEmpty(templateIds)){
return new ArrayList<>();
}
return storeMessageMapper.getMessageTemplateCountList(templateIds);
}
public List<StoreMessageDO> getStoreMessageList(StoreMessageRequest request){
return storeMessageMapper.getStoreMessageList(request);
}
public Integer batchRevoke(List<Long> ids, String userId, String userName){
if (CollectionUtils.isEmpty(ids)){
return 0;
}
return storeMessageMapper.batchRevoke(ids,userId,userName);
}
public Integer revokeById(Long id, String userId, String userName){
if (id == null){
return 0;
}
return storeMessageMapper.revokeById(id,userId,userName);
}
public Integer queryStoreModuleCount(String storeId,String userId, Integer moduleCode){
if (storeId == null|| userId == null){
return 0;
}
return storeMessageMapper.queryStoreModuleCount(storeId,userId,moduleCode);
}
public List<StoreMessageVO> getStoreMessageListByCondition(String storeId, Integer moduleCode, Integer todayTask, Integer pendingFlag, String userId){
return storeMessageMapper.getStoreMessageListByCondition(storeId,moduleCode,todayTask,pendingFlag,userId);
}
public MessageDetailVO getMessageDetail(Long id){
return storeMessageMapper.getMessageDetail(id);
}
}

18
coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserGroupMappingMapper.java Normal file
View File

@@ -0,0 +1,18 @@
package com.cool.store.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2025/7/25 11:03
* @Version 1.0
*/
@Mapper
public interface EnterpriseUserGroupMappingMapper {
List<String> getUserIdsByGroupIdList(@Param("groupIdList") List<String> groupIdList);
}

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java
View File

@@ -99,4 +99,6 @@ public interface EnterpriseUserMapper {
* @return
*/
List<EnterpriseUserDO> searchUserByUserIdsAndKeyword( @Param("userIdList") List<String> userIdList, @Param("keyword") String keyword);
List<String> getUserIdsByRegionIdList( @Param("regionIdList") List<String> regionIdList);
}

33
coolstore-partner-dao/src/main/java/com/cool/store/mapper/MatterConfigMapper.java Normal file
View File

@@ -0,0 +1,33 @@
package com.cool.store.mapper;
import com.cool.store.entity.MatterConfigDO;
import com.cool.store.request.notice.MatterConfigQueryRequest;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
public interface MatterConfigMapper extends Mapper<MatterConfigDO> {
/**
* 强制修改
* @param matterConfigDO
* @return
*/
int updateForce(@Param("matterConfigDO") MatterConfigDO matterConfigDO);
/**
* 批量修改删除状态
*/
int updateDeleteStatus(@Param("ids") List<Long> ids, @Param("userId") String userId);
/**
* 条件查询
* @param request
* @return
*/
List<MatterConfigDO> ListByCondition(@Param("request") MatterConfigQueryRequest request);
}

30
coolstore-partner-dao/src/main/java/com/cool/store/mapper/MessageTemplateMapper.java Normal file
View File

@@ -0,0 +1,30 @@
package com.cool.store.mapper;
import com.cool.store.dto.notice.CommonDTO;
import com.cool.store.dto.notice.NoticeDTO;
import com.cool.store.entity.MessageTemplateDO;
import com.cool.store.request.notice.MessageTemplateQueryRequest;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
public interface MessageTemplateMapper extends Mapper<MessageTemplateDO> {
List<MessageTemplateDO> selectByIds(@Param("ids") List<Long> ids);
int updateDeleteStatusBatch(@Param("ids") List<Long> ids, @Param("userId") String userId);
List<NoticeDTO> getMessageTemplateList(@Param("request") MessageTemplateQueryRequest request);
int batchUpdateStoreInfoAndUserInfo(@Param("ids") List<Long> ids,
@Param("storeInfo") String storeInfo,
@Param("userInfo") String userInfo,
@Param("userId") String userId);
int batchUpdatePublishStatus(@Param("ids") List<Long> ids);
}

7
coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAccountMapper.java.1
View File

@@ -1,7 +0,0 @@
package com.cool.store.mapper;
import com.cool.store.entity.ShopAccountDO;
import tk.mybatis.mapper.common.Mapper;
public interface ShopAccountMapper extends Mapper<ShopAccountDO> {
}

19
coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreGroupMappingMapper.java Normal file
View File

@@ -0,0 +1,19 @@
package com.cool.store.mapper;
import com.cool.store.entity.StoreGroupMappingDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2025/7/25 10:21
* @Version 1.0
*/
@Mapper
public interface StoreGroupMappingMapper {
List<StoreGroupMappingDO> getStoreGroupMappingByGroupIDs( @Param("groupIds")List<String> groupIds);
}

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
View File

@@ -45,4 +45,6 @@ public interface StoreMapper {
List<StoreDO> getStoreNumByStoreCodes(@Param("storeCodeIds") List<String> storeCodeIds);
List<StoreAreaDTO> listStoreByRegionPathList(@Param("regionPathList") List<String> regionPathList);
}

38
coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMessageMapper.java Normal file
View File

@@ -0,0 +1,38 @@
package com.cool.store.mapper;
import com.cool.store.dto.notice.MessageTemplateCountDTO;
import com.cool.store.entity.StoreMessageDO;
import com.cool.store.request.notice.StoreMessageRequest;
import com.cool.store.vo.notice.MessageDetailVO;
import com.cool.store.vo.notice.StoreMessageVO;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
public interface StoreMessageMapper extends Mapper<StoreMessageDO> {
int insertBatch(@Param("list") List<StoreMessageDO> list);
List<MessageTemplateCountDTO> getMessageTemplateCountList(@Param("templateIds") List<Long> templateIds);
List<StoreMessageDO> getStoreMessageList(@Param("request") StoreMessageRequest request);
int batchRevoke(@Param("ids") List<Long> ids, @Param("userId") String userId, @Param("userName") String userName);
int revokeById(@Param("id") Long id, @Param("userId") String userId, @Param("userName") String userName);
Integer queryStoreModuleCount(@Param("storeId") String storeId,
@Param("userId") String userId,
@Param("moduleCode") Integer moduleCode);
List<StoreMessageVO> getStoreMessageListByCondition(@Param("storeId") String storeId,
@Param("moduleCode") Integer moduleCode,
@Param("todayTask") Integer todayTask,
@Param("pendingFlag") Integer pendingFlag,
@Param("userId") String userId);
MessageDetailVO getMessageDetail(Long id);
}