Merge #71 into master from cc_20260318_wishlist

feat：订单待确认审批流去掉 * cc_20260318_wishlist: (22 commits squashed) - feat：心愿单接口 - feat：心愿单接口 - feat：心愿单接口 - feat：心愿单接口查询当前门店铺位绑定的心愿单 - feat：心愿单接口状态 - feat：心愿单接口状态 - feat：心愿单接口状态 - feat：心愿单接口状态 - Merge branch 'master' into cc_20260318_wishlist - feat：代码merge 错误处理 - feat：新增storeType - feat：查询逻辑调整 - feat：新增use_ai 赛选 - feat：新增use_ai 赛选 - feat：新增use_ai 赛选 - feat：心愿单状态筛选 - feat：查询当前门店铺位绑定的心愿单 mini - feat：bug修复 - feat：类型调整 - feat：名称 - feat：订单待确认审批流去掉 - feat：订单待确认审批流去掉 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/71
2026-03-23 11:51:20 +00:00
parent d50a31d044
commit a13ba2175c
38 changed files with 908 additions and 242 deletions
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreWishlistDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreWishlistDAO.java
@@ -6,6 +6,7 @@ import com.cool.store.mapper.order.StoreWishlistMapper;
 import com.cool.store.vo.order.MiniStoreWishlistListVO;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import tk.mybatis.mapper.entity.Example;

@@ -25,6 +26,20 @@ public class StoreWishlistDAO {
        return mapper.insertBatch(list) > 0;
    }

+    public boolean insert(StoreWishlistDO item) {
+        if (item == null) {
+            return false;
+        }
+        return mapper.insertSelective(item) > 0;
+    }
+
+    public int updateByExampleSelective(StoreWishlistDO item) {
+        if (item == null) {
+            return 0;
+        }
+        return mapper.updateByPrimaryKeySelective(item);
+    }
+
    public boolean softDeleteByLineIdAndStoreTypeAndVersion(Long lineId, Long storeTypeId, String versionNo) {
        if (lineId == null || storeTypeId == null || versionNo == null) {
            return false;
@@ -39,6 +54,27 @@ public class StoreWishlistDAO {
        return mapper.getById(id);
    }

+    public StoreWishlistDO getByPointId(Long lineId,Long pointId) {
+        if (lineId == null||pointId==null) {
+            return null;
+        }
+        return mapper.getByPointId(lineId,pointId);
+    }
+
+    public Boolean updateByLineId(Long id) {
+        if (id == null) {
+            return null;
+        }
+        return mapper.updateByLineId(id);
+    }
+
+    public Integer getPointBindWishlistCount( Long pointId,  Integer wishlistStatus) {
+        if (pointId == null||wishlistStatus==null) {
+            return 0;
+        }
+        return mapper.getPointBindWishlistCount(pointId,wishlistStatus);
+    }
+
    public List<StoreWishlistDO> listByLineIdAndStoreTypeAndVersion(Long lineId, Long storeTypeId, String versionNo) {
        if (lineId == null || storeTypeId == null || versionNo == null) {
            return Collections.emptyList();
@@ -53,14 +89,8 @@ public class StoreWishlistDAO {
        return mapper.listByLineId(lineId, storeTypeId);
    }

-    public List<MiniStoreWishlistListVO> listByVersionList(List<String> versionNoList) {
-        if (CollectionUtils.isEmpty(versionNoList)) {
-            return Collections.emptyList();
-        }
-        return mapper.listByVersionList(versionNoList);
+    public List<MiniStoreWishlistListVO> listByVersionList(String keyword,Long storeTypeId,Integer wishlistStatus) {
+        return mapper.listByVersionList(keyword,storeTypeId,wishlistStatus);
    }

-    public List<String> getDistinctVersion(String keyword,Long storeTypeId){
-        return mapper.versionNoList(keyword,storeTypeId);
-    }
 }
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreWishlistOptionDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreWishlistOptionDAO.java
@@ -0,0 +1,38 @@
+package com.cool.store.dao.order;
+
+import com.cool.store.entity.order.StoreWishlistOptionDO;
+import com.cool.store.mapper.order.StoreWishlistOptionMapper;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Repository;
+
+import java.util.Collections;
+import java.util.List;
+
+@Repository
+@RequiredArgsConstructor
+public class StoreWishlistOptionDAO {
+
+    private final StoreWishlistOptionMapper mapper;
+
+    public boolean insertBatch(List<StoreWishlistOptionDO> list) {
+        if (CollectionUtils.isEmpty(list)) {
+            return false;
+        }
+        return mapper.insertBatch(list) > 0;
+    }
+
+    public boolean softDeleteByWishlistIds(List<Long> wishlistIds) {
+        if (CollectionUtils.isEmpty(wishlistIds)) {
+            return false;
+        }
+        return mapper.softDeleteByWishlistIds(wishlistIds) > 0;
+    }
+
+    public List<StoreWishlistOptionDO> listByWishlistIds(List<Long> wishlistIds) {
+        if (CollectionUtils.isEmpty(wishlistIds)) {
+            return Collections.emptyList();
+        }
+        return mapper.listByWishlistIds(wishlistIds);
+    }
+}
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/StoreWishlistMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/StoreWishlistMapper.java
@@ -17,6 +17,11 @@ public interface StoreWishlistMapper extends Mapper<StoreWishlistDO> {

    StoreWishlistDO getById(@Param("id") Long id);

+    StoreWishlistDO getByPointId(@Param("lineId") Long lineId, @Param("pointId") Long pointId);
+
+
+    Integer getPointBindWishlistCount(@Param("pointId") Long pointId, @Param("wishlistStatus") Integer wishlistStatus);
+
    List<StoreWishlistDO> listByLineIdAndStoreTypeAndVersion(@Param("lineId") Long lineId,
                                                             @Param("storeTypeId") Long storeTypeId,
                                                             @Param("versionNo") String versionNo);
@@ -25,7 +30,16 @@ public interface StoreWishlistMapper extends Mapper<StoreWishlistDO> {
                                               @Param("storeTypeId") Long storeTypeId);


-    List<MiniStoreWishlistListVO> listByVersionList(@Param("versionNoList") List<String> versionNoList);
+    List<MiniStoreWishlistListVO> listByVersionList(@Param("keyword") String keyword,
+                                                    @Param("storeTypeId") Long storeTypeId,
+                                                    @Param("wishlistStatus") Integer wishlistStatus);
+
+    /**
+     * 更新心愿单状态 将当前加盟商所有的在待完善加盟资质的心愿单状态改为绑定铺位
+     * @param lineId
+     * @return
+     */
+    Boolean updateByLineId(Long lineId) ;
+

-    List<String> versionNoList(@Param("keyword") String keyword, @Param("storeTypeId") Long storeTypeId);
 }
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/StoreWishlistOptionMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/StoreWishlistOptionMapper.java
@@ -0,0 +1,16 @@
+package com.cool.store.mapper.order;
+
+import com.cool.store.entity.order.StoreWishlistOptionDO;
+import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+public interface StoreWishlistOptionMapper extends Mapper<StoreWishlistOptionDO> {
+
+    int insertBatch(@Param("list") List<StoreWishlistOptionDO> list);
+
+    int softDeleteByWishlistIds(@Param("wishlistIds") List<Long> wishlistIds);
+
+    List<StoreWishlistOptionDO> listByWishlistIds(@Param("wishlistIds") List<Long> wishlistIds);
+}