From 3d31c69b5bbaf149324199ba122596369dd03151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Thu, 21 May 2026 09:38:59 +0000 Subject: [PATCH 1/2] Merge #146 into master from cc_20260520_declare_goods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:新增获取门店报货信息接口 * cc_20260520_declare_goods: (2 commits squashed) - fix:新增根据门店编码列表获取门店报货信息接口 - fix:新增字段 Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/146 --- .../java/com/cool/store/dao/StoreDao.java | 13 ++- .../com/cool/store/mapper/StoreMapper.java | 6 ++ .../src/main/resources/mapper/StoreMapper.xml | 11 ++ .../store/dto/store/DeclareGoodsDateDTO.java | 21 ++++ .../java/com/cool/store/entity/StoreDO.java | 10 ++ .../store/entity/store/StoreExtendInfoDO.java | 100 ++++++++++++++++++ .../request/store/StoreNumListRequest.java | 22 ++++ .../store/vo/store/StoreDeclareGoodsVO.java | 39 +++++++ .../com/cool/store/service/StoreService.java | 6 ++ .../store/service/impl/StoreServiceImpl.java | 50 +++++++++ .../controller/webb/OpenApiController.java | 11 +- .../controller/webb/PCStoreController.java | 9 +- 12 files changed, 293 insertions(+), 5 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/store/DeclareGoodsDateDTO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/entity/store/StoreExtendInfoDO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/store/StoreNumListRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/store/StoreDeclareGoodsVO.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java index fafe7b5db..27a930ba3 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java @@ -5,7 +5,7 @@ import com.cool.store.dto.store.StoreAddressDTO; import com.cool.store.dto.store.StoreExtendSoftOpenDTO; import com.cool.store.dto.store.StoreOrderTimeDTO; import com.cool.store.entity.StoreDO; -import com.cool.store.enums.StoreStatusEnum; +import com.cool.store.entity.store.StoreExtendInfoDO; import com.cool.store.mapper.StoreMapper; import com.cool.store.response.MiniShopsResponse; import com.google.common.collect.Lists; @@ -318,4 +318,15 @@ public class StoreDao { public void insertOrUpdateOpenReportTime(String storeId, Date openReportTime) { storeMapper.insertOrUpdateOpenReportTime(storeId, openReportTime); } + + /** + * 门店扩展信息 + */ + public Map getExtendInfoMap(List storeIds) { + if (CollectionUtils.isEmpty(storeIds)) { + return Collections.emptyMap(); + } + List list = storeMapper.getExtendInfoByStoreIds(storeIds); + return CollStreamUtil.toMap(list, StoreExtendInfoDO::getStoreId, v -> v); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java index 8d9dde95b..c3db7a57e 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java @@ -5,6 +5,7 @@ import com.cool.store.dto.store.StoreAreaDTO; import com.cool.store.dto.store.StoreExtendSoftOpenDTO; import com.cool.store.dto.store.StoreOrderTimeDTO; import com.cool.store.entity.StoreDO; +import com.cool.store.entity.store.StoreExtendInfoDO; import com.cool.store.response.MiniShopsResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -193,4 +194,9 @@ public interface StoreMapper { * 新增或编辑门店开店流程完成时间 */ void insertOrUpdateOpenReportTime(@Param("storeId") String storeId, @Param("openReportTime") Date openReportTime); + + /** + * 门店扩展信息 + */ + List getExtendInfoByStoreIds(@Param("storeIds") List storeIds); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml index 2019aa7c3..ece05b197 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml @@ -51,6 +51,8 @@ + + + SELECT * + FROM store_extend_info_${enterpriseId} + WHERE store_id IN + + #{item} + + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/store/DeclareGoodsDateDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/store/DeclareGoodsDateDTO.java new file mode 100644 index 000000000..2ea8eb1fe --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/store/DeclareGoodsDateDTO.java @@ -0,0 +1,21 @@ +package com.cool.store.dto.store; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 报送货日期DTO + *

+ * + * @author wangff + * @since 2026/5/20 + */ +@Data +public class DeclareGoodsDateDTO { + @ApiModelProperty("报货日期") + private String declareGoods; + + @ApiModelProperty("送货日期") + private String deliverGoods; +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java index ec21a60f8..56e5c37e4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java @@ -267,4 +267,14 @@ public class StoreDO { private String joinSupervision; + /** + * 报货类型 0-按周报货 1-按月报货 2-自提 + */ + private Integer declareGoodsType; + + /** + * 报送货日期 数组格式"[{"declareGoods": "","deliverGoods":""}]" + */ + private String declareGoodsDate; + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/store/StoreExtendInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/store/StoreExtendInfoDO.java new file mode 100644 index 000000000..0e255fbf7 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/store/StoreExtendInfoDO.java @@ -0,0 +1,100 @@ +package com.cool.store.entity.store; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 门店扩展信息 + * @author wangff + * @date 2025-09-16 02:37 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class StoreExtendInfoDO implements Serializable { + @ApiModelProperty("id") + private Long id; + + @ApiModelProperty("门店id") + private String storeId; + + @ApiModelProperty("闭店原因") + private Integer closeReason; + + @ApiModelProperty("闭店性质") + private Integer closeNature; + + @ApiModelProperty("门头类型") + private String storefrontType; + + @ApiModelProperty("最新装修日期") + private Date latestRenovateDate; + + @ApiModelProperty("最新订货时间") + private Date latestOrderTime; + + @ApiModelProperty("标签") + private String tags; + + @ApiModelProperty("暂停营业原因") + private String closeUpReason; + + @ApiModelProperty("外卖管理部门") + private String takeOutManageDept; + + @ApiModelProperty("商圈类型") + private String businessType; + + @ApiModelProperty("巡店难度") + private String patrolDifficulty; + + @ApiModelProperty("巡店难度原因") + private String patrolDiffReason; + + @ApiModelProperty("订货备注") + private String orderRemark; + + @ApiModelProperty("积分") + private BigDecimal score; + + @ApiModelProperty("是否重点关注") + private Integer isFocus; + + @ApiModelProperty("重点关注原因") + private String focusReason; + + @ApiModelProperty("私域二维码") + private String privateSphereQr; + + @ApiModelProperty("更新时间") + private Date updateTime; + + @ApiModelProperty("抬头类型") + private Integer invoiceType; + + @ApiModelProperty("发票抬头") + private String invoiceTitle; + + @ApiModelProperty("税号") + private String invoiceTin; + + @ApiModelProperty("开始试营业日期") + private Date softOpenDate; + + @ApiModelProperty("是否歇业中") + private Integer isCloseUp; + + @ApiModelProperty("开业报备流程完成时间") + private Date openReportTime; + + @ApiModelProperty("首次在营业状态时间(定时任务更新时间)") + private Date softOpenJobTime; +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/store/StoreNumListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/store/StoreNumListRequest.java new file mode 100644 index 000000000..3488cfde8 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/store/StoreNumListRequest.java @@ -0,0 +1,22 @@ +package com.cool.store.request.store; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Size; +import java.util.List; + +/** + *

+ * 门店编码列表请求 + *

+ * + * @author wangff + * @since 2026/5/20 + */ +@Data +public class StoreNumListRequest { + @ApiModelProperty("门店编码列表") + @Size(max = 100, message = "单次最多查询100条门店数据") + private List storeNums; +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/store/StoreDeclareGoodsVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/store/StoreDeclareGoodsVO.java new file mode 100644 index 000000000..ff681a96e --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/store/StoreDeclareGoodsVO.java @@ -0,0 +1,39 @@ +package com.cool.store.vo.store; + +import com.cool.store.annotation.DictField; +import com.cool.store.dto.store.DeclareGoodsDateDTO; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + *

+ * 门店报货信息VO + *

+ * + * @author wangff + * @since 2026/5/20 + */ +@Data +public class StoreDeclareGoodsVO { + @ApiModelProperty("门店编码") + private String storeNum; + + @ApiModelProperty("门店名称") + private String storeName; + + @ApiModelProperty("报货类型 0-按周报货 1-按月报货 2-自提 3-按2周/次投货 4-按3周/次投货 5-外物流") + private Integer declareGoodsType; + + @ApiModelProperty("报送货日期列表") + private List declareGoodsDateList; + + @JsonIgnore + private String businessTypeCode; + + @ApiModelProperty("商圈类型") + @DictField(sourceField = "businessTypeCode") + private String businessType; +} \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/StoreService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/StoreService.java index e1422a652..5b4e6be95 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/StoreService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/StoreService.java @@ -7,6 +7,7 @@ import com.cool.store.dto.store.StoreUserDTO; import com.cool.store.dto.store.StoreUserPositionDTO; import com.cool.store.request.store.StoreListRequest; import com.cool.store.response.MiniShopsResponse; +import com.cool.store.vo.store.StoreDeclareGoodsVO; import com.cool.store.vo.store.StoreListVO; import com.github.pagehelper.PageInfo; @@ -62,4 +63,9 @@ public interface StoreService { */ List getStoreUserPositionList(String storeId, String userName); + /** + * 根据门店编码列表获取门店报货信息 + */ + List getStoreDeclareGoodsByStoreNums(List storeNumList); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java index 34c70186c..b51ce1595 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java @@ -16,6 +16,7 @@ import com.cool.store.dao.SysRoleDao; import com.cool.store.dto.StoreDTO; import com.cool.store.dto.UserSimpleDTO; import com.cool.store.entity.*; +import com.cool.store.entity.store.StoreExtendInfoDO; import com.cool.store.entity.store.StoreMasterSignerInfoDO; import com.cool.store.enums.*; import com.cool.store.exception.ServiceException; @@ -24,10 +25,12 @@ import com.cool.store.request.store.StoreListRequest; import com.cool.store.response.MiniShopsResponse; import com.cool.store.service.StoreService; import com.cool.store.service.UserAuthMappingService; +import com.cool.store.service.dict.impl.DictService; import com.cool.store.utils.BeanUtil; import com.cool.store.utils.GeoMapUtil; import com.cool.store.utils.poi.constant.Constants; import com.cool.store.vo.SysRoleVO; +import com.cool.store.vo.store.StoreDeclareGoodsVO; import com.cool.store.vo.store.StoreListVO; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -81,6 +84,8 @@ public class StoreServiceImpl implements StoreService { StoreMasterSignerInfoDAO storeMasterSignerInfoDAO; @Resource EnterpriseUserRoleMapper enterpriseUserRoleMapper; + @Resource + DictService dictService; @Override public PageInfo getStoreExtendFieldInfo(Integer pageSize, Integer pageNum, Boolean queryOperations) { @@ -689,4 +694,49 @@ public class StoreServiceImpl implements StoreService { }).collect(Collectors.toList()); } + @Override + public List getStoreDeclareGoodsByStoreNums(List storeNumList) { + if (CollectionUtils.isEmpty(storeNumList)) { + return Collections.emptyList(); + } + if (storeNumList.size() > 100) { + throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE, "单次最多查询100条门店数据"); + } + List storeList = storeDao.getStoreNumByStoreCodes(storeNumList); + if (CollectionUtils.isEmpty(storeList)) { + return Collections.emptyList(); + } + List storeIds = CollStreamUtil.toList(storeList, StoreDO::getStoreId); + Map extendInfoMap = storeDao.getExtendInfoMap(storeIds); + ObjectMapper objectMapper = new ObjectMapper(); + List list = storeList.stream().map(store -> { + StoreDeclareGoodsVO vo = new StoreDeclareGoodsVO(); + vo.setStoreNum(store.getStoreNum()); + vo.setStoreName(store.getStoreName()); + vo.setDeclareGoodsType(store.getDeclareGoodsType()); + // 将 JSON 字符串转换为 List 对象 + if (StringUtils.isNotBlank(store.getDeclareGoodsDate())) { + try { + List dateList = objectMapper.readValue( + store.getDeclareGoodsDate(), + new TypeReference>() {} + ); + vo.setDeclareGoodsDateList(dateList); + } catch (Exception e) { + log.warn("解析报送货日期JSON失败, storeNum={}, declareGoodsDate={}", store.getStoreNum(), store.getDeclareGoodsDate(), e); + vo.setDeclareGoodsDateList(new ArrayList<>()); + } + } else { + vo.setDeclareGoodsDateList(Collections.emptyList()); + } + StoreExtendInfoDO extendInfoDO = extendInfoMap.get(store.getStoreId()); + if (Objects.nonNull(extendInfoDO)) { + vo.setBusinessTypeCode(extendInfoDO.getBusinessType()); + } + return vo; + }).collect(Collectors.toList()); + dictService.fillDictField(list); + return list; + } + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java index afe8e4ef9..1138b7e7b 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java @@ -9,16 +9,15 @@ import com.cool.store.dto.store.StoreUserPositionDTO; import com.cool.store.dto.wallet.PaymentDTO; import com.cool.store.dto.wx.MiniProgramFreeLoginDTO; import com.cool.store.handler.WeChatHandler; -import com.cool.store.enums.close.CloseTypeEnum; import com.cool.store.request.OpenApiStoreRequest; import com.cool.store.request.StoreCodeDTO; import com.cool.store.request.*; -import com.cool.store.request.close.store.ThirdCloseStoreApplyRequest; import com.cool.store.request.notice.ThirdHandleMessageRequest; import com.cool.store.request.notice.ThirdMatterRequest; import com.cool.store.request.openapi.ShopListRequest; import com.cool.store.request.openapi.StoreRequest; import com.cool.store.request.openapi.SubRegionRequest; +import com.cool.store.request.store.StoreNumListRequest; import com.cool.store.request.privatesphere.PrivateSphereSnRequest; import com.cool.store.request.wallet.AccountTradeCallbackRequest; import com.cool.store.request.wallet.AddTagCallbackNoticeRequest; @@ -33,11 +32,11 @@ import com.cool.store.service.*; import com.cool.store.service.privatesphere.PrivateSphereQrService; import com.cool.store.service.wallet.WalletService; import com.cool.store.service.xinfa.XinFaBusinessService; -import com.cool.store.service.xinfa.XinFaDeviceService; import com.cool.store.utils.HttpHelper; import com.cool.store.utils.poi.StringUtils; import com.cool.store.service.close.CloseStoreService; import com.cool.store.vo.privatesphere.PrivateSphereVO; +import com.cool.store.vo.store.StoreDeclareGoodsVO; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -315,4 +314,10 @@ public class OpenApiController { return ApiResponse.success(xinFaBusinessService.getStoreXinFaDeviceDetail(request.getStoreNum())); } + @ApiOperation("根据门店编码列表获取门店报货信息") + @PostMapping("/getStoreDeclareGoodsInfo") + public ApiResponse> getStoreDeclareGoodsInfo(@RequestBody @Validated StoreNumListRequest request) { + return ApiResponse.success(storeService.getStoreDeclareGoodsByStoreNums(request.getStoreNums())); + } + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java index 869e9bf5e..fd6b2ba34 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java @@ -1,13 +1,14 @@ package com.cool.store.controller.webb; -import com.cool.store.common.PageBasicInfo; import com.cool.store.context.CurrentUserHolder; import com.cool.store.dto.store.StoreUserDTO; import com.cool.store.request.store.StoreListRequest; +import com.cool.store.request.store.StoreNumListRequest; import com.cool.store.request.UserStoreRequest; import com.cool.store.response.MiniShopsResponse; import com.cool.store.response.ResponseResult; import com.cool.store.service.StoreService; +import com.cool.store.vo.store.StoreDeclareGoodsVO; import com.cool.store.vo.store.StoreListVO; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; @@ -50,4 +51,10 @@ public class PCStoreController { public ResponseResult> getStoreUserPositionList(String storeId, String userName) { return ResponseResult.success(storeService.getStoreUserPositionList(storeId, userName)); } + + @ApiOperation("根据门店编码列表获取门店报货信息") + @PostMapping("/declareGoodsInfo") + public ResponseResult> getStoreDeclareGoodsInfo(@RequestBody @Validated StoreNumListRequest request) { + return ResponseResult.success(storeService.getStoreDeclareGoodsByStoreNums(request.getStoreNums())); + } } From 0a621146392dcb97cff53d3f354ca280071733cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Thu, 21 May 2026 09:39:32 +0000 Subject: [PATCH 2/2] Merge #147 into master from cc_20250922_closeStore_w MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 非AI店非正新鸡排不开通网商钱包 * cc_20250922_closeStore_w: (100 commits squashed) - fix:新增用户管辖门店列表接口 - fix:门店列表接口新增门店积分字段 - fix:查询问题修复；新增草稿状态 - fix:申请单审批补充审批人字段 - fix:修改门店积分限制0-12 - fix:积分流水接口修复；申请单查询接口添加日期筛选 - fix:redis报错修复 - fix:惩处单查询提供惩处待处理、惩处已处理状态筛选 - fix:新管家关店原因字段补充 - fix:惩处单复议申请查询异常修复 - fix:小程序惩处单详情接口字段补充 - fix:查询字段补充 - fix - fix:转义 - fix - fix:新增撤销复议申请单接口 - fix:补充字段 - fix:补充字段 - fix:新增门店分数接口 - fix:申请单新增筛选条件 - fix:门店积分接口返回参数修改 - fix:小程序规则分页查询接口改为Post - fix:问题修复 - fix:十二分导入 - fix:导入状态部分失败改为失败 - fix:字段补充 - fix:异步下Excel导入图片临时文件被清理的问题 - fix:扣分申请导入图片路径修改并使用CDN - fix:导入图片上传oss文件类型修改为图片 - fix:批量审批 - fix:批量审批新增备注字段 - fix:字段补充 - Merge branch 'master' into cc_2021104_twelve_points # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java # coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java # coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java # coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java # coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml # coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java - fix:新增字段 - fix:字段补充 - fix:小程序新增接口根据闭店申请id获取闭店申请简单信息 - fix:小程序退款信息列表修改 - fix:闭店审批允许管理员审批 - fix:字典项新增排序、编辑删除权限、关联字典项 - Merge branch 'master' into cc_2021104_twelve_points - fix:十二分值-扣分列表申请复议截止日期格式 - fix:去除appealEndDate格式校验 - Merge remote-tracking branch 'origin/cc_20260128_dict_update' into cc_20260205_twelve_points_v2 - fix:阶段名称修改 - Merge branch 'refs/heads/master' into cc_20250922_closeStore_w # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageStatusEnum.java - fix:闭店记录列表补充审批id；仅在营门店允许发起闭店 - fix:提交新管家字段取值逻辑修改 - Merge branch 'cc_20260128_dict_update' into cc_2021104_twelve_points - fix:字典回显包含已删除字典项 - Merge branch 'master' into cc_2021104_twelve_points - Merge remote-tracking branch 'origin/cc_20260205_twelve_points_v2' into cc_2021104_twelve_points - fix:去除惩处单审批阶段；复议申请单证明图片非必填 - fix:复议拒绝后惩处单直接生效 - fix:扣分申请单证明图片改为非必填 - fix - fix:字段转义 - fix:惩处待处理包含带生效数据 - fix:字段转义 - fix:警告单金额和积分初始化为0 - fix - fix:小程序接口字段转义 - Merge branch 'master' into cc_2021104_twelve_points - fix:十二分审批记录展示待审批人 - fix - fix:惩处单复议申请逾期检查改为延时队列 - Merge branch 'refs/heads/master' into cc_20250922_closeStore_w - fix:闭店定时任务过滤闭店状态补充 - Merge branch 'refs/heads/master' into cc_2021104_twelve_points # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java - Merge branch 'master' into cc_20250922_closeStore_w - fix:闭店材料新增字段 - fix - fix:小程序闭店材料详情新增字段 - fix:闭店流程流转校验除授权书外是否已邮寄 - fix:营帐通JWT生成 - fix:营帐通JWT改为post - fix:修改secret - fix:配置 - Merge branch 'master' into cc_2021104_twelve_points - fix:十二分流水导出；流水新增规则描述字段 - fix - fix:闭店新管家接口错误信息返回 - Merge branch 'master' into cc_20250922_closeStore_w - Merge branch 'cc_20260412_jwt_ge' into cc_20250922_closeStore_w - Merge branch 'master' into cc_20250922_closeStore_w - fix:闭店火码关闭账号不存在时忽略 - Merge branch 'cc_2021104_twelve_points' into cc_20250922_closeStore_w - Merge branch 'master' into cc_20250922_closeStore_w # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java # coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java # coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java # coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java # coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java # coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java # coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java - fix:闭店逻辑修改 - fix:闭店待办列表新增字段 - fix:计划闭店时间修改 - fix:闭店信息新增初审、复审、终审时间字段；闭店管理列表新增返回字段 - fix:删除字段 - fix:字段名称修改 - fix:闭店中止新增审批记录 - Merge branch 'master' into cc_20250922_closeStore_w # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java - Merge branch 'master' into cc_20250922_closeStore_w # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java # coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java # coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java - fix:非标准店且非正新鸡排不开启网商钱包流程 - fix:修复不强制开通网商钱包导致的租赁合同上传失败的问题 - fix:不存在钱包开通阶段的，上传租赁合同后开启下一阶段 - Merge branch 'master' into cc_20250922_closeStore_w Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/147 --- .../src/main/java/com/cool/store/dao/ShopStageInfoDAO.java | 6 ++++++ .../cool/store/service/impl/ApplyLicenseServiceImpl.java | 7 +++++-- .../java/com/cool/store/service/impl/PointServiceImpl.java | 7 ++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java index 32b726da5..5a3e07fa6 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java @@ -63,6 +63,12 @@ public class ShopStageInfoDAO { if (shopSubStageEnum.equals(ShopSubStageEnum.SHOP_STAGE_14)) { continue; } + if (!CommonConstants.INDEX_ONE.equals(shopInfoDO.getUseStandardStore()) + && !String.valueOf(FranchiseBrandEnum.ZXJP.getCode()).equals(shopInfoDO.getFranchiseBrand()) + && ShopSubStageEnum.SHOP_STAGE_6.equals(shopSubStageEnum)) { + // 不是标准店且不是正新鸡排的情况下，不开启网商钱包开通阶段 + continue; + } ShopStageInfoDO shopStageInfo = new ShopStageInfoDO(); shopStageInfo.setLineId(lineInfoDO.getId()); shopStageInfo.setShopId(shopId); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index 119c63028..157d0ab78 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -116,9 +116,9 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { if (!acquired) { throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION); } + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); if (request.getLegalIsSamePartner()){ // 法人身份证信息和加盟商一致 - ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfo.getLineId()); if ( ! lineInfoDO.getUsername().equals(request.getLicenseLegalPerson())){ throw new ServiceException(ErrorCodeEnum.LEGAL_PERSON_NAME_NOT_SAME); @@ -148,7 +148,10 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { preparationService.buildStoreAndDecorationComplete(request.getShopId()); preparationService.selectSiteAndBuildStoreComplete(request.getShopId()); } - addTagIfUploadLicense(request.getShopId()); + if (CommonConstants.INDEX_ONE.equals(shopInfo.getUseStandardStore()) + || String.valueOf(FranchiseBrandEnum.ZXJP.getCode()).equals(shopInfo.getFranchiseBrand())) { + addTagIfUploadLicense(request.getShopId()); + } return Boolean.TRUE; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 55130c1f6..988dca926 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -1337,8 +1337,13 @@ public class PointServiceImpl implements PointService { shopInfoDAO.updateShopInfo(updateShop); //如果是通过 将钱包阶段状态从未开始改为已开始 已开始的不需要处理 ShopStageInfoDO walletStage = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_6); - if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(walletStage.getShopSubStageStatus())) { + if (Objects.nonNull(walletStage) && ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(walletStage.getShopSubStageStatus())) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(),ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_60); + } else { + ShopStageInfoDO payStage = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_7); + if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(payStage.getShopSubStageStatus())) { + shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70); + } } } shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, subStageStatus, auditId);