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

Merge #56 into master from cc_20260121_store_type

Browse Source 
feat：PC 心愿单

* cc_20260121_store_type: (100 commits squashed)

  - feat:订单列表

  - fix:拜访记录导出

  - feat:列表处理

  - Merge branch 'cc_20251208_visit' into cc_20260121_store_type
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

  - feat:标准店接口处理

  - feat:标准店接口处理

  - feat:标准店接口处理

  - feat:标准店接口处理

  - feat:标准店接口处理

  - fix:加盟缴费调整

  - feat:标准店接口处理

  - fix:加盟缴费调整

  - Merge branch 'cc_20260126_pingan_wallet' into cc_20260121_store_type
    
    # Conflicts:
    #	coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BatchTransferDTO.java
    #	coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BatchTransferRequest.java

  - feat:冲突解决

  - feat:接口处理

  - feat:shopInfo

  - fix:PC缴费信息列表过滤已完成缴费信息

  - fix:测试接口修改

  - Merge branch 'refs/heads/cc_20260126_pingan_wallet' into cc_20260121_store_type

  - fix:测试接口修改

  - feat:接口

  - feat:接口调整

  - feat:注释调整

  - feat：key 调整

  - feat：订单ID

  - feat：日志打印

  - feat：选择标准店型

  - feat:useStandardStore

  - feat:标准店没有缴费阶段

  - feat:标准店没有缴费阶段

  - feat:标准店没有缴费阶段

  - feat:标准店没有缴费阶段

  - feat:阶段调整

  - fix:修复加盟缴费流程流转错误

  - feat:费用类型ID

  - feat:锁释放

  - feat:分账状态

  - fix:加盟签约合同数据补充

  - feat:排序

  - feat:选项单位

  - feat:选项单位

  - feat:选项单位

  - feat:选项单位

  - feat:option_unit

  - feat:option_unit

  - feat:更新调整

  - feat:视频非必填

  - feat:optionUnit

  - fix:转义

  - Merge branch 'master' into cc_20260126_pingan_wallet
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java

  - feat:同一配置项下只能设置一个默认选项

  - feat:数量支持小数，新增首次订货字段

  - fix:提交及修改校验合计缴费金额和分账总金额是否相同

  - feat：queryPage

  - feat：defaultQuantity 改为 BigDecimal

  - feat：defaultQuantity 改为 BigDecimal

  - feat：门店预约到店

  - feat：门店预约到店 取消预约

  - feat：门店预约到店 手机号

  - feat：添加原价

  - feat：添加原价

  - feat：添加原价

  - feat：字典表 remark

  - Merge branch 'master' into cc_20260121_store_type
    
    # 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-model/src/main/java/com/cool/store/vo/dict/DictColumnSimpleVO.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

  - feat：字典表 remark

  - feat：服务人员手机号

  - feat：价格计算调整店型优惠价*默认数量 + 原价 *（选择数量-默认数量）

  - fix:补充钱包账单推送新管家流程

  - fix:账单推送钱包支付类型payWay由1改为2

  - feat：同一配置项下只能设置一个默认选项 限制去掉

  - fix:平安钱包分账信息改为非必填

  - feat：同一配置项只能选择一个选项 限制去掉

  - feat：心愿单

  - feat：心愿单

  - feat：心愿单接口调整

  - feat：心愿单接口调整

  - feat：心愿单接口调整

  - feat：批量更新数据

  - feat：查询店型已配置的选项绑定 新增顶部预览图

  - feat：查询店型已配置的选项绑定 新增顶部预览图

  - feat：查询店型已配置的选项绑定 新增顶部预览图

  - feat：配置大类

  - feat：配置大类

  - feat：价格优化

  - feat：阶段审批处理

  - fix:删除设计费-立规

  - feat：配置大项 配置项接口改造

  - feat：配置大项 配置项接口改造

  - feat：handleAudit

  - feat：新增code

  - feat：categoryId

  - feat：心愿单接口更新

  - feat：心愿单接口更新

  - feat：心愿单接口更新

  - feat：心愿单接口更新

  - feat：心愿单接口更新

  - Merge branch 'cc_20260126_pingan_wallet' into cc_20260121_store_type
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java

  - Merge branch 'master' into cc_20260121_store_type
    
    # Conflicts:
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java

  - Merge branch 'master' into cc_20260121_store_type
    
    # Conflicts:
    #	coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java
    #	coolstore-partner-model/src/main/java/com/cool/store/vo/fees/PayeeBankConfigVO.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/ShopAllocationInfoServiceImpl.java

  - feat：PC 心愿单

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/56
This commit is contained in:
正新
2026-03-11 09:52:28 +00:00
parent b9690590bf
commit dbf25b4be9
10 changed files with 133 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,4 +54,6 @@ public interface MiniStoreOrderService {
List<MiniStoreWishlistListVO> wishlistList(PartnerUserInfoVO userInfoVO);
List<MiniStoreWishlistListVO> wishAllList(WishAllListRequest request);
}

37
coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java
View File

@@ -1485,6 +1485,43 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService {
return wishlist;
}
@Override
public List<MiniStoreWishlistListVO> wishAllList(WishAllListRequest request) {
PageHelper.startPage(request.getPageNum(),request.getPageSize());
List<String> distinctVersion = storeWishlistDAO.getDistinctVersion(request.getMobile());
List<MiniStoreWishlistListVO> wishlist = storeWishlistDAO.listByVersionList(distinctVersion);
for (MiniStoreWishlistListVO item : wishlist) {
List<StoreWishlistDO> rows = storeWishlistDAO.listByLineIdAndStoreTypeAndVersion(item.getLineId(), item.getStoreTypeId(), item.getVersionNo());
if (CollectionUtils.isEmpty(rows)) {
item.setOptions(Collections.emptyList());
continue;
}
List<Long> optionIds = rows.stream().map(StoreWishlistDO::getOptionId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
Map<Long, ConfigOptionDO> optionMap = new HashMap<>();
if (CollectionUtils.isNotEmpty(optionIds)) {
List<ConfigOptionDO> options = configOptionDAO.listActiveByIds(optionIds);
optionMap = options.stream().collect(Collectors.toMap(ConfigOptionDO::getId, Function.identity(), (a, b) -> a));
}
List<MiniStoreWishlistListVO.OptionVO> optionList = new ArrayList<>();
for (StoreWishlistDO row : rows) {
MiniStoreWishlistListVO.OptionVO vo = new MiniStoreWishlistListVO.OptionVO();
vo.setOptionId(row.getOptionId());
vo.setQuantity(row.getQuantity());
ConfigOptionDO cfg = optionMap.get(row.getOptionId());
if (cfg != null) {
vo.setOptionName(cfg.getOptionName());
vo.setOptionPrice(cfg.getOptionPrice());
vo.setImageUrl(cfg.getImageUrl());
}
optionList.add(vo);
}
item.setOptions(optionList);
}
return wishlist;
}
private BigDecimal safe(BigDecimal v) {
return v == null ? BigDecimal.ZERO : v;