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

Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust

Browse Source
This commit is contained in:
苏竹红
2024-10-12 19:14:30 +08:00
parent fd0352c208 0b528c4dee
commit 3900475c48
12 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-dao/src/main/java/com/cool/store/dao/OperationLogDAO.java
View File

@@ -70,11 +70,11 @@ public class OperationLogDAO {
}
return operationLogMapper.getBySubStageStatusAndUser(userId,shopSubStageStatus);
}
public List<OperationLogDO> getByShopSubStage(Long shopId, List<Integer> shopSubStageStatusList, List<Integer> types) {
if (Objects.isNull(shopId) || CollectionUtils.isEmpty(shopSubStageStatusList)) {
public List<OperationLogDO> getByShopSubStage(Long shopId, List<Integer> shopSubStageList, List<Integer> types) {
if (Objects.isNull(shopId) || CollectionUtils.isEmpty(shopSubStageList)) {
return null;
}
return operationLogMapper.getByShopSubStage(shopId,shopSubStageStatusList,types);
return operationLogMapper.getByShopSubStage(shopId,shopSubStageList,types);
}
public Integer updateByPrimaryKeySelective(OperationLogDO operationLogDO) {

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java
View File

@@ -290,11 +290,11 @@ public class ShopStageInfoDAO {
}
return shopStageInfoMapper.getSubStageList(shopIds,shopSubStage);
}
public List<ShopStageInfoDO> getSubStages(List<Long> shopIds, Integer shopSubStageStatus){
public List<ShopStageInfoDO> getSubStages(List<Long> shopIds, Integer shopSubStage){
if(CollectionUtils.isEmpty(shopIds) ){
return Collections.emptyList();
}
return shopStageInfoMapper.getSubStages(shopIds,shopSubStageStatus);
return shopStageInfoMapper.getSubStages(shopIds,shopSubStage);
}
/**

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

@@ -20,7 +20,7 @@ public interface OperationLogMapper extends Mapper<OperationLogDO> {
List<OperationLogDO> getBySubStageStatusEnumAndsStatus(@Param("shopId") Long shopId, @Param("shopSubStageStatus") Integer shopSubStageStatus, @Param("type") Integer type);
List<OperationLogDO> getByShopSubStage(@Param("shopId") Long shopId, @Param("shopSubStageStatusList") List<Integer> shopSubStageStatusList, @Param("types") List<Integer> types);
List<OperationLogDO> getByShopSubStage(@Param("shopId") Long shopId, @Param("shopSubStageList") List<Integer> shopSubStageList, @Param("types") List<Integer> types);
Long batchAddOperationLog(@Param("list") List<OperationLogDO> operationLogDO) ;

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

@@ -134,7 +134,7 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
@Param("shopSubStageStatusList") List<Integer> shopSubStageStatusList,
@Param("investmentUserId") String investmentUserId, @Param("authRegionIds") List<String> authRegionIds);
List<ShopStageInfoDO> getSubStageList(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);
List<ShopStageInfoDO> getSubStages(@Param("shopIds") List<Long> shopIds,@Param("shopSubStageStatus") Integer shopSubStageStatus);
List<ShopStageInfoDO> getSubStages(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);
/**
* 获取线索处在某个阶段的某个状态的店铺数量

8
coolstore-partner-dao/src/main/resources/mapper/OperationLogMapper.xml
View File

@@ -52,11 +52,11 @@
select *
from xfsg_operation_log
where shop_id = #{shopId}
<if test="shopSubStageStatusList !=null and shopSubStageStatusList.size()>0">
and shop_sub_stage_status in
<foreach collection="shopSubStageStatusList" index="index" item="shopSubStageStatus" open="(" close=")"
<if test="shopSubStageList !=null and shopSubStageList.size()>0">
and shop_sub_stage in
<foreach collection="shopSubStageList" index="index" item="shopSubStage" open="(" close=")"
separator=",">
#{shopSubStageStatus}
#{shopSubStage}
</foreach>
</if>
<if test="types !=null and types.size()>0">

4
coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
View File

@@ -342,7 +342,7 @@
<select id="getSubStages" resultType="com.cool.store.entity.ShopStageInfoDO">
select *
from xfsg_shop_stage_info
where 1=1
where is_terminated = 1
<if test="shopIds !=null and shopIds.size()>0">
and shop_id in
<foreach collection="shopIds" item="shopId" index="index" open="(" separator="," close=")">
@@ -350,7 +350,7 @@
</foreach>
</if>
<if test="shopSubStage !=null">
and shop_sub_stage_status =#{shopSubStageStatus}
and shop_sub_stage =#{shopSubStage}
</if>
</select>
</mapper>

2
coolstore-partner-service/src/main/java/com/cool/store/service/OperationLogService.java
View File

@@ -16,7 +16,7 @@ public interface OperationLogService {
Long addOperationLog(Long shopId, ShopSubStageStatusEnum shopSubStageStatusEnum,String userId, List<EnterpriseUserDO> operationUserList, OperationTypeEnum operationTypeEnum, String remark,OperationStatusEnum operationStatusEnum);
List<AuditInfoResponse> getAuditInfo(Long shopId,List<Integer> shopSubStageStatusList);
List<AuditInfoResponse> getAuditInfo(Long shopId,List<Integer> shopSubStageList);
Boolean batchUpdateProcessed( List<OperationLogDO> operationLogs,Long audit , String userId, String reason);
}

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
View File

@@ -71,6 +71,7 @@ public class BuildInformationServiceImpl implements BuildInformationService{
response.setInStorePhoto(informationDO.getInStorePhoto());
response.setJuridicalIdCardFront(informationDO.getJuridicalIdCardFront());
response.setJuridicalIdCardNo(informationDO.getJuridicalIdCardNo());
response.setJuridicalIdCardReverse(informationDO.getJuridicalIdCardReverse());
response.setJuridicalHandheldIdCardReverse(informationDO.getJuridicalHandheldIdCardReverse());
response.setJuridicalHandheldIdCardFront(informationDO.getJuridicalHandheldIdCardFront());
response.setJuridicalHandheldIdCardReverse(informationDO.getJuridicalHandheldIdCardReverse());

17
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
View File

@@ -35,6 +35,7 @@ import java.util.*;
import java.util.stream.Collectors;
import static com.cool.store.enums.point.ShopSubStageStatusEnum.*;
import static com.cool.store.utils.poi.DateUtils.YYYY_MM_DD_HH_MM_SS;
/**
* @Author suzhuhong
@@ -489,10 +490,13 @@ public class DeskServiceImpl implements DeskService {
if (ShopSubStageEnum.SHOP_STAGE_16.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())
|| ShopSubStageEnum.SHOP_STAGE_17.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())
|| ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {
List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
doThing(deskStageMap, subStageList);
} else if (ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {
List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_7.getShopSubStage());
doThing(deskStageMap, subStageList);
} else if (ShopSubStageEnum.SHOP_STAGE_11.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {
List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
List<DecorationDesignInfoDO> decorationDesignInfos = decorationDesignInfoDAO.getByIds(shopIds);
doThing(deskStageMap, subStageList);
for (DecorationDesignInfoDO decorationDesignInfoDO : decorationDesignInfos) {
@@ -533,6 +537,9 @@ public class DeskServiceImpl implements DeskService {
if (ShopSubStageEnum.SHOP_STAGE_7.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {
preparationCommonPendingVO.setSubmitTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, finalShopPayDoMap.getOrDefault(x.getShopId(), new LinePayDO()).getCreateTime()));
}
if (ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {
preparationCommonPendingVO.setSubmitTime(deskStageMap.get(x.getShopId()).get(0).getActualCompleteTime());
}
if (ShopSubStageEnum.SHOP_STAGE_16.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {
preparationCommonPendingVO.setSubmitTime(deskStageMap.get(x.getShopId()).get(0).getActualCompleteTime());
}
@@ -575,12 +582,14 @@ public class DeskServiceImpl implements DeskService {
List<DeskStageDTO> deskStageDTOS = deskStageMap.get(shopStageInfoDO.getShopId());
if (CollectionUtils.isEmpty(deskStageDTOS)) {
DeskStageDTO dto = new DeskStageDTO();
dto.setActualCompleteTime(shopStageInfoDO.getActualCompleteTime());
Date date = DateUtils.dateTime(YYYY_MM_DD_HH_MM_SS, shopStageInfoDO.getActualCompleteTime());
dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, date));
dto.setShopSubStageStatus(shopStageInfoDO.getShopSubStageStatus());
deskStageMap.put(shopStageInfoDO.getShopId(), Collections.singletonList(dto));
} else {
DeskStageDTO dto = new DeskStageDTO();
dto.setActualCompleteTime(shopStageInfoDO.getActualCompleteTime());
Date date = DateUtils.dateTime(YYYY_MM_DD_HH_MM_SS, shopStageInfoDO.getActualCompleteTime());
dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, date));
dto.setShopSubStageStatus(shopStageInfoDO.getShopSubStageStatus());
deskStageDTOS.add(dto);
deskStageMap.put(shopStageInfoDO.getShopId(), deskStageDTOS);

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java
View File

@@ -78,9 +78,9 @@ public class OperationLogServiceImpl implements OperationLogService {
}
@Override
public List<AuditInfoResponse> getAuditInfo(Long shopId, List<Integer> shopSubStageStatusList) {
public List<AuditInfoResponse> getAuditInfo(Long shopId, List<Integer> shopSubStageList) {
List<AuditInfoResponse> responses = new ArrayList<>();
List<OperationLogDO> logList = operationLogDAO.getByShopSubStage(shopId, shopSubStageStatusList, null);
List<OperationLogDO> logList = operationLogDAO.getByShopSubStage(shopId, shopSubStageList, null);
Map<Date,List<OperationLogDO>> operationLogMap = logList.stream().collect(Collectors.groupingBy(OperationLogDO::getCreateTime));
for (Date date : operationLogMap.keySet()) {
List<OperationLogDO> operations = operationLogMap.get(date);

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java
View File

@@ -266,6 +266,8 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
PlatformBuildDO platformBuildDO = platformBuildDAO.selectOneByShopId(shopId, type);
PlatformBuildResponse platformBuildResponse = new PlatformBuildResponse();
if (Objects.isNull(platformBuildDO)) {
BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(shopId);
BeanUtils.copyProperties(informationDO, platformBuildResponse);
return platformBuildResponse;
}
BeanUtils.copyProperties(platformBuildDO, platformBuildResponse);

28
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCPlatformBuildController.java
View File

@@ -3,6 +3,7 @@ package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.enums.PlatformBuildEnum;
import com.cool.store.enums.point.ShopSubStageEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.request.PlatformBuildAuditRequest;
import com.cool.store.request.platformBuildListRequest;
@@ -73,32 +74,19 @@ public class PCPlatformBuildController {
@ApiOperation("根据type获取平台建店审批记录:1-抖音，2-快手，3-美团团购，4-饿了么，5-美团外卖")
@GetMapping("/getAuditInfo")
public ResponseResult<List<AuditInfoResponse>> getAuditInfo(@RequestParam("shopId") Long shopId, @RequestParam("type") Integer type) {
List<Integer> shopSubStageStatusList = new ArrayList<>();
List<Integer> shopSubStageList = new ArrayList<>();
if (type.equals(PlatformBuildEnum.DOU_YIN.getCode())) {
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_180.getShopSubStageStatus());
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_181.getShopSubStageStatus());
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_182.getShopSubStageStatus());
shopSubStageList.add(ShopSubStageEnum.SHOP_STAGE_18.getShopSubStage());
}else if (type.equals(PlatformBuildEnum.KUAI_SHOU.getCode())) {
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_220.getShopSubStageStatus());
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_221.getShopSubStageStatus());
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_222.getShopSubStageStatus());
shopSubStageList.add(ShopSubStageEnum.SHOP_STAGE_22.getShopSubStage());
}else if (type.equals(PlatformBuildEnum.MEI_TUAN_TUAN_GOU.getCode())) {
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_200.getShopSubStageStatus());
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_201.getShopSubStageStatus());
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_202.getShopSubStageStatus());
shopSubStageList.add(ShopSubStageEnum.SHOP_STAGE_20.getShopSubStage());
}else if (type.equals(PlatformBuildEnum.E_LE_ME.getCode())) {
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_210.getShopSubStageStatus());
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_211.getShopSubStageStatus());
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_213.getShopSubStageStatus());
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_214.getShopSubStageStatus());
shopSubStageList.add(ShopSubStageEnum.SHOP_STAGE_21.getShopSubStage());
}else if (type.equals(PlatformBuildEnum.MEI_TUAN_WAI_MAI.getCode())) {
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_190.getShopSubStageStatus());
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_191.getShopSubStageStatus());
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_193.getShopSubStageStatus());
shopSubStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_194.getShopSubStageStatus());
shopSubStageList.add(ShopSubStageEnum.SHOP_STAGE_19.getShopSubStage());
}
return ResponseResult.success(operationLogService.getAuditInfo(shopId, shopSubStageStatusList));
return ResponseResult.success(operationLogService.getAuditInfo(shopId, shopSubStageList));
}
}