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

fix 开店管理增加合同签约，门店编码trim 修复导出字段没值

Browse Source
This commit is contained in:
shuo.wang
2025-05-06 18:36:32 +08:00
parent c5bcfee942
commit d64f99b568
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java
View File

@@ -84,6 +84,7 @@ public enum MessageEnum {
MESSAGE_56("您有一个门店测量阶段待提交，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_56("您有一个门店测量阶段待提交，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"),
MESSAGE_57("您有一个门店测量阶段待分配测量员和设计组，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_57("您有一个门店测量阶段待分配测量员和设计组，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"),
MESSAGE_58("您有一个门店设计阶段待分配设计师，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_58("您有一个门店设计阶段待分配设计师，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"),
MESSAGE_59("您有一个门店设计阶段报价任务待领取，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"),
; ;
private String title; private String title;

13
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java
View File

@@ -91,6 +91,9 @@ public class DecorationServiceImpl implements DecorationService {
@Resource @Resource
DecorationMeasureDAO decorationMeasureDAO; DecorationMeasureDAO decorationMeasureDAO;
@Resource
EnterpriseUserRoleDao enterpriseUserRoleDao;
@Override @Override
public DesignInfoVo DesignInfo(Long shopId) { public DesignInfoVo DesignInfo(Long shopId) {
return null; return null;
@@ -560,6 +563,16 @@ public class DecorationServiceImpl implements DecorationService {
} }
if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_901.getShopSubStageStatus().equals(subStage.getShopSubStageStatus())) { if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_901.getShopSubStageStatus().equals(subStage.getShopSubStageStatus())) {
shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_902); shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_902);
List<String> quotationOfficeList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Collections.singletonList(UserRoleEnum.QUOTATION_OFFICE.getCode()));
HashMap<String, String> map = new HashMap<>(4);
map.put("partnerUsername", lineInfo.getUsername());
map.put("partnerMobile", lineInfo.getMobile());
map.put("storeName", shopInfo.getShopName());
commonService.sendQWMessage(
quotationOfficeList,
MessageEnum.MESSAGE_59,
map
);
return Boolean.TRUE; return Boolean.TRUE;
} }
if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_902.getShopSubStageStatus().equals(subStage.getShopSubStageStatus())) { if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_902.getShopSubStageStatus().equals(subStage.getShopSubStageStatus())) {

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

@@ -108,7 +108,7 @@ public class ExportServiceImpl implements ExportService {
long total = branchShopList.getTotal(); long total = branchShopList.getTotal();
if (total == CommonConstants.ZERO) { if (total == CommonConstants.ZERO) {
return CommonConstants.ZERO_LONG; return CommonConstants.ZERO_LONG;
} else if (total > CommonConstants.FIVE_SECONDS) { } else if (total > 1) {
throw new ServiceException(ErrorCodeEnum.EXPORT_LIMIT_5000); throw new ServiceException(ErrorCodeEnum.EXPORT_LIMIT_5000);
} }
ImportTaskDO importTaskDO = new ImportTaskDO(); ImportTaskDO importTaskDO = new ImportTaskDO();