Merge #91 into master from cc_20230331_device

feat：添加阶段状态 * cc_20230331_device: (21 commits squashed) - feat：添加采购审批 - Merge branch 'master' into cc_20230331_device - feat：设备发货阶段 - feat：设备发货 - feat：设备发货 - feat：接口调整 - feat：接口调整 - feat：接口调整 - feat：接口调整 - feat：接口调整 - feat：接口调整 - feat：接口调整 - feat：接口调整 - feat：查询订单设备明细 - feat：测试 - feat：短信模板切换 - feat：getPendingList - feat：代办调整 - feat：处理人 - feat：添加阶段状态 - Merge branch 'master' into cc_20230331_device # Conflicts: #	coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java #	coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java 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/91
2026-04-12 09:16:48 +00:00
parent 77ca18b6fc
commit 1a77d8fc37
48 changed files with 1874 additions and 106 deletions
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopDeliveryPlanDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopDeliveryPlanDAO.java
@@ -0,0 +1,77 @@
+package com.cool.store.dao;
+
+import com.cool.store.entity.plan.ShopDeliveryPlanDO;
+import com.cool.store.mapper.ShopDeliveryPlanMapper;
+import com.cool.store.vo.desk.DeliveryPendingVO;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Repository
+public class ShopDeliveryPlanDAO {
+
+    @Resource
+    private ShopDeliveryPlanMapper shopDeliveryPlanMapper;
+
+    /**
+     * 根据ID查询
+     */
+    public ShopDeliveryPlanDO getById(Long id) {
+        if (id == null) {
+            return null;
+        }
+        return shopDeliveryPlanMapper.getById(id);
+    }
+
+    /**
+     * 根据门店ID查询
+     */
+    public ShopDeliveryPlanDO getByShopId(Long shopId) {
+        if (shopId == null) {
+            return null;
+        }
+        return shopDeliveryPlanMapper.getByShopId(shopId);
+    }
+
+    /**
+     * 插入
+     */
+    public int insert(ShopDeliveryPlanDO record) {
+        record.setCreateTime(new Date());
+        record.setUpdateTime(new Date());
+        return shopDeliveryPlanMapper.insert(record);
+    }
+
+    /**
+     * 更新
+     */
+    public int update(ShopDeliveryPlanDO record) {
+        record.setUpdateTime(new Date());
+        return shopDeliveryPlanMapper.update(record);
+    }
+
+    /**
+     * 删除
+     */
+    public int deleteById(Long id) {
+        if (id == null) {
+            return 0;
+        }
+        return shopDeliveryPlanMapper.deleteById(id);
+    }
+
+    public List<DeliveryPendingVO> getPendingList(String keyword, Integer type) {
+        return shopDeliveryPlanMapper.getPendingList(keyword,type);
+    }
+
+
+
+    /**
+     * 查询所有
+     */
+    public List<ShopDeliveryPlanDO> listAll() {
+        return shopDeliveryPlanMapper.listAll();
+    }
+}
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopDeliveryPlanItemDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopDeliveryPlanItemDAO.java
@@ -0,0 +1,93 @@
+package com.cool.store.dao;
+
+import com.cool.store.entity.plan.ShopDeliveryPlanItemDO;
+import com.cool.store.mapper.ShopDeliveryPlanItemMapper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+@Repository
+public class ShopDeliveryPlanItemDAO {
+
+    @Resource
+    private ShopDeliveryPlanItemMapper shopDeliveryPlanItemMapper;
+
+    /**
+     * 根据ID查询
+     */
+    public ShopDeliveryPlanItemDO getById(Long id) {
+        if (id == null) {
+            return null;
+        }
+        return shopDeliveryPlanItemMapper.getById(id);
+    }
+
+    /**
+     * 根据主表ID查询明细列表
+     */
+    public List<ShopDeliveryPlanItemDO> listByPlanId(Long planId) {
+        if (planId == null) {
+            return null;
+        }
+        return shopDeliveryPlanItemMapper.listByPlanId(planId);
+    }
+
+    /**
+     * 根据主表ID和类型查询明细
+     */
+    public ShopDeliveryPlanItemDO getByPlanIdAndItemType(Long planId, Integer itemType) {
+        if (planId == null || itemType == null) {
+            return null;
+        }
+        return shopDeliveryPlanItemMapper.getByPlanIdAndItemType(planId, itemType);
+    }
+
+    /**
+     * 插入
+     */
+    public int insert(ShopDeliveryPlanItemDO record) {
+        record.setCreateTime(new Date());
+        record.setUpdateTime(new Date());
+        return shopDeliveryPlanItemMapper.insert(record);
+    }
+
+
+    public int batchInsert(List<ShopDeliveryPlanItemDO> recordList) {
+        if (CollectionUtils.isEmpty(recordList)){
+            return 0;
+        }
+        return shopDeliveryPlanItemMapper.batchInsert(recordList);
+    }
+
+    /**
+     * 更新
+     */
+    public int update(ShopDeliveryPlanItemDO record) {
+        record.setUpdateTime(new Date());
+        return shopDeliveryPlanItemMapper.update(record);
+    }
+
+    /**
+     * 删除
+     */
+    public int deleteById(Long id) {
+        if (id == null) {
+            return 0;
+        }
+        return shopDeliveryPlanItemMapper.deleteById(id);
+    }
+
+    /**
+     * 根据主表ID删除明细
+     */
+    public int deleteByPlanId(Long planId) {
+        if (planId == null) {
+            return 0;
+        }
+        return shopDeliveryPlanItemMapper.deleteByPlanId(planId);
+    }
+}
--- 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
@@ -489,6 +489,15 @@ public class ShopStageInfoDAO {
        example.createCriteria().andIn("shopId",shopIds).andEqualTo("shopStage",shopStage);
        return shopStageInfoMapper.selectByExample(example);
    }
+
+    public List<ShopStageInfoDO> getStageByShopSubStage(List<Long> shopIds, Integer shopSubStage){
+        if (CollectionUtils.isEmpty(shopIds) ||  shopSubStage == null){
+            return null;
+        }
+        Example example = new Example(ShopStageInfoDO.class);
+        example.createCriteria().andIn("shopId",shopIds).andEqualTo("shopSubStage",shopSubStage);
+        return shopStageInfoMapper.selectByExample(example);
+    }
    //查询处于xx状态的数据
    public List<ShopStageInfoDO> getShopStageInfoByShopSubStageStatus(Integer shopSubStageStatus) {
        Example example = new Example(ShopStageInfoDO.class);
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopDeliveryPlanItemMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopDeliveryPlanItemMapper.java
@@ -0,0 +1,51 @@
+package com.cool.store.mapper;
+
+import com.cool.store.entity.plan.ShopDeliveryPlanItemDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ShopDeliveryPlanItemMapper {
+
+    /**
+     * 根据ID查询
+     */
+    ShopDeliveryPlanItemDO getById(@Param("id") Long id);
+
+    /**
+     * 根据主表ID查询明细列表
+     */
+    List<ShopDeliveryPlanItemDO> listByPlanId(@Param("planId") Long planId);
+
+    /**
+     * 根据主表ID和类型查询明细
+     */
+    ShopDeliveryPlanItemDO getByPlanIdAndItemType(@Param("planId") Long planId, @Param("itemType") Integer itemType);
+
+    /**
+     * 插入
+     */
+    int insert(ShopDeliveryPlanItemDO record);
+
+    /**
+     * 批 liqu量插入
+     */
+    int batchInsert(@Param("list") List<ShopDeliveryPlanItemDO> list);
+
+    /**
+     * 更新
+     */
+    int update(ShopDeliveryPlanItemDO record);
+
+    /**
+     * 删除
+     */
+    int deleteById(@Param("id") Long id);
+
+    /**
+     * 根据主表ID删除明细
+     */
+    int deleteByPlanId(@Param("planId") Long planId);
+}
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopDeliveryPlanMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopDeliveryPlanMapper.java
@@ -0,0 +1,50 @@
+package com.cool.store.mapper;
+
+import com.cool.store.entity.plan.ShopDeliveryPlanDO;
+import com.cool.store.vo.desk.DeliveryPendingVO;
+import io.swagger.models.auth.In;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ShopDeliveryPlanMapper {
+
+    /**
+     * 根据ID查询
+     */
+    ShopDeliveryPlanDO getById(@Param("id") Long id);
+
+    /**
+     * 根据门店ID查询
+     */
+    ShopDeliveryPlanDO getByShopId(@Param("shopId") Long shopId);
+
+    /**
+     * 插入
+     */
+    int insert(ShopDeliveryPlanDO record);
+
+    /**
+     * 更新
+     */
+    int update(ShopDeliveryPlanDO record);
+
+    /**
+     * 删除
+     */
+    int deleteById(@Param("id") Long id);
+
+    /**
+     * 查询所有
+     */
+    List<ShopDeliveryPlanDO> listAll();
+
+    /**
+     * 查询代办
+     * @param keyword
+     * @return
+     */
+    List<DeliveryPendingVO> getPendingList(@Param("keyword") String keyword, @Param("type") Integer type);
+}