我的客服中心问题查询

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/HelpCategoryDTO.java

@@ -0,0 +1,49 @@
+package com.chelvc.cloud.vehicle.api.dto;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 帮助分类对象 help_category
+ * 
+ * @author liude
+ * @date 2023-11-08
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString(callSuper = true)
+public class HelpCategoryDTO implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一ID */
+    private Long id;
+
+    /**
+     * 分类名称
+     */
+    private String name;
+
+    /** 分类图标 */
+    private String icon;
+
+    /** 专题数量 */
+    private Long helpCount;
+
+    /** 展示状态 */
+    private Long showStatus;
+
+    /** 排序 */
+    private Long sort;
+    /**
+     * 问题列表
+     */
+    List<HelpDTO> helpList;
+}

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/HelpDTO.java

@@ -0,0 +1,45 @@
+package com.chelvc.cloud.vehicle.api.dto;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 帮助对象 help
+ * 
+ * @author liude
+ * @date 2023-11-08
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString(callSuper = true)
+public class HelpDTO implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 分类ID */
+    private Long categoryId;
+
+    /** 图标 */
+    private String icon;
+
+    /** 标题 */
+    private String title;
+
+    /** 是否显示 */
+    private Long showStatus;
+
+    /** 阅读量 */
+    private Long readCount;
+
+    /** 正文 */
+    private String content;
+}

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/MerchantDTO.java

@@ -127,4 +127,9 @@ public class MerchantDTO implements Serializable {
      */
     private Integer region;
 
+    /**
+     * 购物车商品信息
+     */
+    private List<OmsCartItemDTO> cartItems;
+
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/UserAllCartItemDTO.java

@@ -0,0 +1,27 @@
+package com.chelvc.cloud.vehicle.api.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 用户商家购物车
+ *
+ * @author liude
+ * @date 2024/2/21
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserAllCartItemDTO extends MerchantDTO implements Serializable {
+    /**
+     * 购物车商品信息
+     */
+    private List<OmsCartItemDTO> cartItems;
+
+}

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/HelpCategoryModifyParam.java

@@ -0,0 +1,39 @@
+package com.chelvc.cloud.vehicle.api.param;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 帮助分类对象 help_category
+ * 
+ * @author liude
+ * @date 2023-11-08
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString(callSuper = true)
+public class HelpCategoryModifyParam
+{
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分类名称
+     */
+    private String name;
+
+    /** 分类图标 */
+    private String icon;
+
+    /** 专题数量 */
+    private Long helpCount;
+
+    /** 展示状态 */
+    private Long showStatus;
+
+    /** 排序 */
+    private Long sort;
+}

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/HelpCategoryPagingParam.java

@@ -0,0 +1,32 @@
+package com.chelvc.cloud.vehicle.api.param;
+import com.chelvc.framework.common.model.Paging;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 问题配置数据模型
+ *
+ * @author liude
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class HelpCategoryPagingParam implements Serializable {
+
+    /**
+     * 分页信息
+     */
+    @NotNull(message = "分页不能为空")
+    private Paging paging;
+    /**
+     * 标题
+     */
+    private String title;
+
+}

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/HelpModifyParam.java

@@ -0,0 +1,42 @@
+package com.chelvc.cloud.vehicle.api.param;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 帮助对象 help
+ * 
+ * @author liude
+ * @date 2023-11-08
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString(callSuper = true)
+public class HelpModifyParam implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 分类ID */
+    private Long categoryId;
+
+    /** 图标 */
+    private String icon;
+
+    /** 标题 */
+    private String title;
+
+    /** 是否显示 */
+    private Long showStatus;
+
+    /** 阅读量 */
+    private Long readCount;
+
+    /** 正文 */
+    private String content;
+}

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/HelpPagingParam.java

@@ -0,0 +1,32 @@
+package com.chelvc.cloud.vehicle.api.param;
+import com.chelvc.framework.common.model.Paging;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 问题配置数据模型
+ *
+ * @author liude
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class HelpPagingParam implements Serializable {
+
+    /**
+     * 分页信息
+     */
+    @NotNull(message = "分页不能为空")
+    private Paging paging;
+    /**
+     * 标题
+     */
+    private String title;
+
+}

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/OmsCartItemPagingParam.java

@@ -0,0 +1,34 @@
+package com.chelvc.cloud.vehicle.api.param;
+
+import com.chelvc.framework.common.model.Paging;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 预约信息参数
+ *
+ * @author liude
+ * @date 2023/1/17
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OmsCartItemPagingParam implements Serializable {
+
+    /**
+     * 分页信息
+     */
+    @NotNull(message = "分页不能为空")
+    private Paging paging;
+    /**
+     * 商家名称
+     */
+    private String merchantName;
+
+}

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/IHelpCategoryService.java

@@ -1,5 +1,12 @@
 package com.chelvc.cloud.vehicle.api.service;
 
+import com.chelvc.cloud.vehicle.api.dto.HelpCategoryDTO;
+import com.chelvc.cloud.vehicle.api.dto.HelpDTO;
+import com.chelvc.cloud.vehicle.api.param.HelpCategoryModifyParam;
+import com.chelvc.cloud.vehicle.api.param.HelpCategoryPagingParam;
+import com.chelvc.cloud.vehicle.api.param.HelpPagingParam;
+import com.chelvc.framework.common.model.Pagination;
+
 import java.util.List;
 
 /**
@@ -16,7 +23,7 @@ public interface IHelpCategoryService
      * @param id 帮助分类主键
      * @return 帮助分类
      */
-//    public HelpCategory selectHelpCategoryById(Long id);
+    public HelpCategoryDTO selectHelpCategoryById(Long id);
 
     /**
      * 查询帮助分类列表
@@ -24,7 +31,7 @@ public interface IHelpCategoryService
      * @param helpCategory 帮助分类
      * @return 帮助分类集合
      */
-//    public List<HelpCategory> selectHelpCategoryList(HelpCategory helpCategory);
+    public List<HelpCategoryDTO> selectHelpCategoryList(HelpCategoryModifyParam helpCategory);
 
     /**
      * 新增帮助分类
@@ -32,7 +39,7 @@ public interface IHelpCategoryService
      * @param helpCategory 帮助分类
      * @return 结果
      */
-//    public int insertHelpCategory(HelpCategory helpCategory);
+    public void insertHelpCategory(HelpCategoryModifyParam helpCategory);
 
     /**
      * 修改帮助分类
@@ -40,15 +47,8 @@ public interface IHelpCategoryService
      * @param helpCategory 帮助分类
      * @return 结果
      */
-//    public int updateHelpCategory(HelpCategory helpCategory);
+    public void updateHelpCategory(Long id,HelpCategoryModifyParam helpCategory);
 
-    /**
-     * 批量删除帮助分类
-     * 
-     * @param ids 需要删除的帮助分类主键集合
-     * @return 结果
-     */
-    public int deleteHelpCategoryByIds(Long[] ids);
 
     /**
      * 删除帮助分类信息
@@ -56,5 +56,12 @@ public interface IHelpCategoryService
      * @param id 帮助分类主键
      * @return 结果
      */
-    public int deleteHelpCategoryById(Long id);
+    public void deleteHelpCategoryById(Long id);
+
+    /**
+     * 分页查询帮助分类列表
+     * @param param
+     * @return
+     */
+    Pagination<HelpCategoryDTO> getHelpCategoryPaging(HelpCategoryPagingParam param);
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/IHelpService.java

@@ -1,5 +1,8 @@
 package com.chelvc.cloud.vehicle.api.service;
-
+import com.chelvc.cloud.vehicle.api.dto.HelpDTO;
+import com.chelvc.cloud.vehicle.api.param.HelpModifyParam;
+import com.chelvc.cloud.vehicle.api.param.HelpPagingParam;
+import com.chelvc.framework.common.model.Pagination;
 
 import java.util.List;
 
@@ -17,39 +20,32 @@ public interface IHelpService
      * @param id 帮助主键
      * @return 帮助
      */
-//    public Help selectHelpById(Long id);
+    public HelpDTO selectHelpById(Long id);
 
     /**
      * 查询帮助列表
      * 
-     * @param help 帮助
+     * @param param 帮助
      * @return 帮助集合
      */
-//    public List<Help> selectHelpList(Help help);
+   public List<HelpDTO> selectHelpList(HelpModifyParam param);
 
     /**
      * 新增帮助
      * 
-     * @param help 帮助
+     * @param param 帮助
      * @return 结果
      */
-//    public int insertHelp(Help help);
+    public void insertHelp(HelpModifyParam param);
 
     /**
      * 修改帮助
      * 
-     * @param help 帮助
+     * @param param 帮助
      * @return 结果
      */
-//    public int updateHelp(Help help);
+    public void updateHelp(Long id,HelpModifyParam param);
 
-    /**
-     * 批量删除帮助
-     * 
-     * @param ids 需要删除的帮助主键集合
-     * @return 结果
-     */
-    public int deleteHelpByIds(Long[] ids);
 
     /**
      * 删除帮助信息
@@ -57,5 +53,12 @@ public interface IHelpService
      * @param id 帮助主键
      * @return 结果
      */
-    public int deleteHelpById(Long id);
+    public void deleteHelpById(Long id);
+
+    /**
+     * 分页查询帮助列表
+     * @param param
+     * @return
+     */
+    Pagination<HelpDTO> getHelpPaging(HelpPagingParam param);
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/MerchantService.java

@@ -2,6 +2,7 @@ package com.chelvc.cloud.vehicle.api.service;
 
 import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
 import com.chelvc.cloud.vehicle.api.dto.MerchantDetailDTO;
+import com.chelvc.cloud.vehicle.api.dto.UserAllCartItemDTO;
 import com.chelvc.cloud.vehicle.api.param.*;
 import com.chelvc.framework.common.model.Pagination;
 
@@ -109,4 +110,11 @@ public interface MerchantService {
      * @return
      */
     List<MerchantDTO> listRankMerchants(MerchantRankParam param, Long userId);
+
+    /**
+     * 我的购物车列表
+     * @param param
+     * @return
+     */
+    public Pagination<MerchantDTO> getUserMineCartPaging(OmsCartItemPagingParam param);
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/OmsCartItemService.java

@@ -1,7 +1,11 @@
 package com.chelvc.cloud.vehicle.api.service;
 import com.chelvc.cloud.vehicle.api.dto.MerchantCartItemDTO;
 import com.chelvc.cloud.vehicle.api.dto.OmsCartItemDTO;
+import com.chelvc.cloud.vehicle.api.dto.UserAllCartItemDTO;
 import com.chelvc.cloud.vehicle.api.param.OmsCartItemModifyParam;
+import com.chelvc.cloud.vehicle.api.param.OmsCartItemPagingParam;
+import com.chelvc.framework.common.model.Pagination;
+import lombok.NonNull;
 
 import java.util.List;
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/copier/HelpCategoryCopier.java

@@ -0,0 +1,61 @@
+package com.chelvc.cloud.vehicle.server.copier;
+
+import com.chelvc.cloud.vehicle.api.dto.CategoryDTO;
+import com.chelvc.cloud.vehicle.api.dto.HelpCategoryDTO;
+import com.chelvc.cloud.vehicle.api.param.CategoryModifyParam;
+import com.chelvc.cloud.vehicle.api.param.HelpCategoryModifyParam;
+import com.chelvc.cloud.vehicle.server.entity.Category;
+import com.chelvc.cloud.vehicle.server.entity.HelpCategory;
+import org.mapstruct.Builder;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
+import org.mapstruct.factory.Mappers;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 帮助分类信息拷贝接口
+ *
+ * @author liude
+ * @date 2024/3/5
+ */
+@Mapper(builder = @Builder(disableBuilder = true))
+public interface HelpCategoryCopier {
+    /**
+     * 对象拷贝接口实例
+     */
+    HelpCategoryCopier INSTANCE = Mappers.getMapper(HelpCategoryCopier.class);
+
+    /**
+     * 帮助分类信息拷贝
+     *
+     * @param helpCategory 帮助分类信息
+     * @return 帮助分类信息
+     */
+    HelpCategoryDTO copying(HelpCategory helpCategory);
+
+    /**
+     * 帮助分类信息拷贝
+     *
+     * @param helpCategories 帮助分类信息集合
+     * @return 帮助分类信息列表
+     */
+    List<HelpCategoryDTO> copying(Collection<HelpCategory> helpCategories);
+
+    /**
+     * 帮助分类信息拷贝
+     *
+     * @param param 帮助分类更新参数
+     * @return 帮助分类信息
+     */
+    HelpCategory copying(HelpCategoryModifyParam param);
+
+    /**
+     * 帮助分类信息拷贝
+     *
+     * @param param    帮助分类更新参数
+     * @param helpCategory 帮助分类信息
+     */
+    void copying(HelpCategoryModifyParam param, @MappingTarget HelpCategory helpCategory);
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/copier/HelpCopier.java

@@ -0,0 +1,61 @@
+package com.chelvc.cloud.vehicle.server.copier;
+
+import com.chelvc.cloud.vehicle.api.dto.HelpCategoryDTO;
+import com.chelvc.cloud.vehicle.api.dto.HelpDTO;
+import com.chelvc.cloud.vehicle.api.param.HelpCategoryModifyParam;
+import com.chelvc.cloud.vehicle.api.param.HelpModifyParam;
+import com.chelvc.cloud.vehicle.server.entity.Help;
+import com.chelvc.cloud.vehicle.server.entity.HelpCategory;
+import org.mapstruct.Builder;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
+import org.mapstruct.factory.Mappers;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 帮助信息拷贝接口
+ *
+ * @author liude
+ * @date 2024/3/5
+ */
+@Mapper(builder = @Builder(disableBuilder = true))
+public interface HelpCopier {
+    /**
+     * 对象拷贝接口实例
+     */
+    HelpCopier INSTANCE = Mappers.getMapper(HelpCopier.class);
+
+    /**
+     * 帮助信息拷贝
+     *
+     * @param help 帮助信息
+     * @return 帮助信息
+     */
+    HelpDTO copying(Help help);
+
+    /**
+     * 帮助信息拷贝
+     *
+     * @param helps 帮助信息集合
+     * @return 帮助信息列表
+     */
+    List<HelpDTO> copying(Collection<Help> helps);
+
+    /**
+     * 帮助信息拷贝
+     *
+     * @param param 帮助更新参数
+     * @return 帮助信息
+     */
+    Help copying(HelpModifyParam param);
+
+    /**
+     * 帮助信息拷贝
+     *
+     * @param param    帮助更新参数
+     * @param help 帮助信息
+     */
+    void copying(HelpModifyParam param, @MappingTarget Help help);
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/HelpCategoryMapper.java

@@ -1,6 +1,8 @@
 package com.chelvc.cloud.vehicle.server.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.chelvc.cloud.vehicle.server.entity.HelpCategory;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -10,53 +12,8 @@ import java.util.List;
  * @author liude
  * @date 2023-11-08
  */
-public interface HelpCategoryMapper 
+@Mapper
+public interface HelpCategoryMapper extends BaseMapper<HelpCategory>
 {
-    /**
-     * 查询帮助分类
-     * 
-     * @param id 帮助分类主键
-     * @return 帮助分类
-     */
-    public HelpCategory selectHelpCategoryById(Long id);
 
-    /**
-     * 查询帮助分类列表
-     * 
-     * @param helpCategory 帮助分类
-     * @return 帮助分类集合
-     */
-    public List<HelpCategory> selectHelpCategoryList(HelpCategory helpCategory);
-
-    /**
-     * 新增帮助分类
-     * 
-     * @param helpCategory 帮助分类
-     * @return 结果
-     */
-    public int insertHelpCategory(HelpCategory helpCategory);
-
-    /**
-     * 修改帮助分类
-     * 
-     * @param helpCategory 帮助分类
-     * @return 结果
-     */
-    public int updateHelpCategory(HelpCategory helpCategory);
-
-    /**
-     * 删除帮助分类
-     * 
-     * @param id 帮助分类主键
-     * @return 结果
-     */
-    public int deleteHelpCategoryById(Long id);
-
-    /**
-     * 批量删除帮助分类
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteHelpCategoryByIds(Long[] ids);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/HelpMapper.java

@@ -1,6 +1,8 @@
 package com.chelvc.cloud.vehicle.server.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.chelvc.cloud.vehicle.server.entity.Help;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -10,53 +12,8 @@ import java.util.List;
  * @author liude
  * @date 2023-11-08
  */
-public interface HelpMapper 
+@Mapper
+public interface HelpMapper extends BaseMapper<Help>
 {
-    /**
-     * 查询帮助
-     * 
-     * @param id 帮助主键
-     * @return 帮助
-     */
-    public Help selectHelpById(Long id);
 
-    /**
-     * 查询帮助列表
-     * 
-     * @param help 帮助
-     * @return 帮助集合
-     */
-    public List<Help> selectHelpList(Help help);
-
-    /**
-     * 新增帮助
-     * 
-     * @param help 帮助
-     * @return 结果
-     */
-    public int insertHelp(Help help);
-
-    /**
-     * 修改帮助
-     * 
-     * @param help 帮助
-     * @return 结果
-     */
-    public int updateHelp(Help help);
-
-    /**
-     * 删除帮助
-     * 
-     * @param id 帮助主键
-     * @return 结果
-     */
-    public int deleteHelpById(Long id);
-
-    /**
-     * 批量删除帮助
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteHelpByIds(Long[] ids);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/MerchantMapper.java

@@ -73,4 +73,7 @@ public interface MerchantMapper extends BaseMapper<Merchant> {
     List<MerchantDTO> listRankMerchants(@Param("merchantId")LocalDateTime monthStartLocalTime, @Param("regionId")Integer regionId,
                                         @Param("longitude")Double longitude,
                                         @Param("latitude")Double latitude, @Param("level")int level);
+
+
+    List<Long> getMerchantIds(Long userId);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/OmsCartItemMapper.java

@@ -18,5 +18,8 @@ import java.util.List;
  */
 @Mapper
 public interface OmsCartItemMapper extends BaseMapper<OmsCartItem>
+
+
 {
+
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/IHelpCategoryService.java

@@ -1,7 +1,5 @@
 package com.chelvc.cloud.vehicle.server.service;
-
-import java.util.List;
-
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.chelvc.cloud.vehicle.server.entity.HelpCategory;
 
 /**
@@ -10,53 +8,6 @@ import com.chelvc.cloud.vehicle.server.entity.HelpCategory;
  * @author liude
  * @date 2023-11-08
  */
-public interface IHelpCategoryService 
+public interface IHelpCategoryService extends IService<HelpCategory>
 {
-    /**
-     * 查询帮助分类
-     * 
-     * @param id 帮助分类主键
-     * @return 帮助分类
-     */
-    public HelpCategory selectHelpCategoryById(Long id);
-
-    /**
-     * 查询帮助分类列表
-     * 
-     * @param helpCategory 帮助分类
-     * @return 帮助分类集合
-     */
-    public List<HelpCategory> selectHelpCategoryList(HelpCategory helpCategory);
-
-    /**
-     * 新增帮助分类
-     * 
-     * @param helpCategory 帮助分类
-     * @return 结果
-     */
-    public int insertHelpCategory(HelpCategory helpCategory);
-
-    /**
-     * 修改帮助分类
-     * 
-     * @param helpCategory 帮助分类
-     * @return 结果
-     */
-    public int updateHelpCategory(HelpCategory helpCategory);
-
-    /**
-     * 批量删除帮助分类
-     * 
-     * @param ids 需要删除的帮助分类主键集合
-     * @return 结果
-     */
-    public int deleteHelpCategoryByIds(Long[] ids);
-
-    /**
-     * 删除帮助分类信息
-     * 
-     * @param id 帮助分类主键
-     * @return 结果
-     */
-    public int deleteHelpCategoryById(Long id);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/IHelpService.java

@@ -2,6 +2,7 @@ package com.chelvc.cloud.vehicle.server.service;
 
 import java.util.List;
 
+import com.chelvc.cloud.vehicle.api.dto.HelpDTO;
 import com.chelvc.cloud.vehicle.server.entity.Help;
 
 /**
@@ -13,50 +14,8 @@ import com.chelvc.cloud.vehicle.server.entity.Help;
 public interface IHelpService 
 {
     /**
-     * 查询帮助
-     * 
-     * @param id 帮助主键
-     * @return 帮助
+     * 分类下得问题集合
+     * @return
      */
-    public Help selectHelpById(Long id);
-
-    /**
-     * 查询帮助列表
-     * 
-     * @param help 帮助
-     * @return 帮助集合
-     */
-    public List<Help> selectHelpList(Help help);
-
-    /**
-     * 新增帮助
-     * 
-     * @param help 帮助
-     * @return 结果
-     */
-    public int insertHelp(Help help);
-
-    /**
-     * 修改帮助
-     * 
-     * @param help 帮助
-     * @return 结果
-     */
-    public int updateHelp(Help help);
-
-    /**
-     * 批量删除帮助
-     * 
-     * @param ids 需要删除的帮助主键集合
-     * @return 结果
-     */
-    public int deleteHelpByIds(Long[] ids);
-
-    /**
-     * 删除帮助信息
-     * 
-     * @param id 帮助主键
-     * @return 结果
-     */
-    public int deleteHelpById(Long id);
+    List<HelpDTO> helpList(Long categoryId);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/OmsCartItemService.java

@@ -1,5 +1,6 @@
 package com.chelvc.cloud.vehicle.server.service;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.chelvc.cloud.vehicle.api.dto.MerchantCartItemDTO;
 import com.chelvc.cloud.vehicle.api.dto.OmsCartItemDTO;
 import com.chelvc.cloud.vehicle.server.entity.OmsCartItem;
 
@@ -23,5 +24,12 @@ public interface OmsCartItemService extends IService<OmsCartItem>{
      */
     void delete(List<Long> ids,Long userId);
 
+    /**
+     * 根据商家查询订单
+     * @param merchantId
+     * @return
+     */
+    public List<OmsCartItemDTO> merchantListCartItem(Long merchantId);
+
 
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/HelpCategoryServiceImpl.java

@@ -1,13 +1,27 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chelvc.cloud.vehicle.api.dto.HelpCategoryDTO;
+import com.chelvc.cloud.vehicle.api.param.HelpCategoryModifyParam;
+import com.chelvc.cloud.vehicle.api.param.HelpCategoryPagingParam;
+import com.chelvc.cloud.vehicle.server.copier.HelpCategoryCopier;
 import com.chelvc.cloud.vehicle.server.dao.HelpCategoryMapper;
 import com.chelvc.cloud.vehicle.server.entity.HelpCategory;
 import com.chelvc.cloud.vehicle.server.service.IHelpCategoryService;
+import com.chelvc.cloud.vehicle.server.service.IHelpService;
+import com.chelvc.framework.base.context.SessionContextHolder;
+import com.chelvc.framework.base.util.ResourceUtils;
+import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.util.StringUtils;
+import com.chelvc.framework.database.util.PagingUtils;
+import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -16,12 +30,13 @@ import java.util.List;
  * @author liude
  * @date 2023-11-08
  */
-@Service
+@DubboService(interfaceClass = com.chelvc.cloud.vehicle.api.service.IHelpCategoryService.class)
 @RequiredArgsConstructor(onConstructor = @__({@Autowired, @Lazy}))
-public class HelpCategoryServiceImpl implements IHelpCategoryService
-{
-    private final HelpCategoryMapper helpCategoryMapper;
+public class HelpCategoryServiceImpl extends ServiceImpl<HelpCategoryMapper,HelpCategory> implements
+        IHelpCategoryService,com.chelvc.cloud.vehicle.api.service.IHelpCategoryService
 
+{
+    private final IHelpService helpService;
     /**
      * 查询帮助分类
      * 
@@ -29,58 +44,68 @@ public class HelpCategoryServiceImpl implements IHelpCategoryService
      * @return 帮助分类
      */
     @Override
-    public HelpCategory selectHelpCategoryById(Long id)
+    public HelpCategoryDTO selectHelpCategoryById(@NonNull Long id)
     {
-        return helpCategoryMapper.selectHelpCategoryById(id);
+        return HelpCategoryCopier.INSTANCE.copying(this.getById(id));
     }
 
     /**
      * 查询帮助分类列表
      * 
-     * @param helpCategory 帮助分类
+     * @param param 帮助分类
      * @return 帮助分类
      */
     @Override
-    public List<HelpCategory> selectHelpCategoryList(HelpCategory helpCategory)
+    public List<HelpCategoryDTO> selectHelpCategoryList(@NonNull HelpCategoryModifyParam param)
     {
-        return helpCategoryMapper.selectHelpCategoryList(helpCategory);
+        List<HelpCategory> helpCategories = this.lambdaQuery()
+                .like(StringUtils.nonEmpty(param.getName()),HelpCategory::getName,param.getName())
+                .eq(StringUtils.nonEmpty(param.getShowStatus()),HelpCategory::getShowStatus,param.getShowStatus())
+                .orderByDesc(HelpCategory::getSort)
+                .list();
+        List<HelpCategoryDTO> helpCategoryList = HelpCategoryCopier.INSTANCE.copying(helpCategories);
+        helpCategoryList.forEach(item ->{
+            item.setHelpList(this.helpService.helpList(item.getId()));
+        });
+        return helpCategoryList;
     }
 
     /**
      * 新增帮助分类
      * 
-     * @param helpCategory 帮助分类
+     * @param param 帮助分类
      * @return 结果
      */
     @Override
-    public int insertHelpCategory(HelpCategory helpCategory)
+    public void insertHelpCategory(@NonNull HelpCategoryModifyParam param)
     {
-        return helpCategoryMapper.insertHelpCategory(helpCategory);
+        HelpCategory helpCategory = HelpCategoryCopier.INSTANCE.copying(param);
+        Long userId = SessionContextHolder.getId();
+        helpCategory.setCreateTime(new Date());
+        helpCategory.setUpdater(userId);
+        helpCategory.setUpdateTime(new Date());
+        helpCategory.setCreator(userId);
+        this.save(helpCategory);
     }
 
     /**
      * 修改帮助分类
      * 
-     * @param helpCategory 帮助分类
+     * @param param 帮助分类
      * @return 结果
      */
     @Override
-    public int updateHelpCategory(HelpCategory helpCategory)
+    public void updateHelpCategory(@NonNull Long id, @NonNull HelpCategoryModifyParam param)
     {
-        return helpCategoryMapper.updateHelpCategory(helpCategory);
+        HelpCategory helpCategory = ResourceUtils.required(this.getById(id), "该分类不存在");
+        HelpCategoryCopier.INSTANCE.copying(param,helpCategory);
+        Long userId = SessionContextHolder.getId();
+        helpCategory.setUpdater(userId);
+        helpCategory.setUpdateTime(new Date());
+        this.updateById(helpCategory);
     }
 
-    /**
-     * 批量删除帮助分类
-     * 
-     * @param ids 需要删除的帮助分类主键
-     * @return 结果
-     */
-    @Override
-    public int deleteHelpCategoryByIds(Long[] ids)
-    {
-        return helpCategoryMapper.deleteHelpCategoryByIds(ids);
-    }
+
 
     /**
      * 删除帮助分类信息
@@ -89,8 +114,20 @@ public class HelpCategoryServiceImpl implements IHelpCategoryService
      * @return 结果
      */
     @Override
-    public int deleteHelpCategoryById(Long id)
+    public void deleteHelpCategoryById(@NonNull Long id)
     {
-        return helpCategoryMapper.deleteHelpCategoryById(id);
+        HelpCategory helpCategory = ResourceUtils.required(this.getById(id), "该分类不存在");
+        this.deleteHelpCategoryById(id);
+    }
+
+
+    @Override
+    public Pagination<HelpCategoryDTO> getHelpCategoryPaging(HelpCategoryPagingParam param){
+        Page<HelpCategory> page = this.lambdaQuery()
+                .like(StringUtils.nonEmpty(param.getTitle()),HelpCategory::getName,param.getTitle())
+                .orderByDesc(HelpCategory::getShowStatus)
+                .orderByDesc(HelpCategory::getSort)
+                .page(PagingUtils.convert(param.getPaging()));
+        return PagingUtils.convert(page, HelpCategoryCopier.INSTANCE::copying);
     }
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/HelpServiceImpl.java

@@ -1,9 +1,22 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chelvc.cloud.vehicle.api.dto.HelpDTO;
+import com.chelvc.cloud.vehicle.api.param.HelpModifyParam;
+import com.chelvc.cloud.vehicle.api.param.HelpPagingParam;
+import com.chelvc.cloud.vehicle.server.copier.HelpCopier;
 import com.chelvc.cloud.vehicle.server.dao.HelpMapper;
 import com.chelvc.cloud.vehicle.server.entity.Help;
 import com.chelvc.cloud.vehicle.server.service.IHelpService;
+import com.chelvc.framework.base.context.SessionContextHolder;
+import com.chelvc.framework.base.util.ResourceUtils;
+import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.util.StringUtils;
+import com.chelvc.framework.database.util.PagingUtils;
+import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -17,11 +30,11 @@ import java.util.List;
  * @author liude
  * @date 2023-11-08
  */
-@Service
-@RequiredArgsConstructor(onConstructor = @__({@Autowired, @Lazy}))
-public class HelpServiceImpl implements IHelpService
+@DubboService(interfaceClass = com.chelvc.cloud.vehicle.api.service.IHelpService.class)
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class HelpServiceImpl extends ServiceImpl<HelpMapper,Help> implements
+        IHelpService,com.chelvc.cloud.vehicle.api.service.IHelpService
 {
-    private final HelpMapper helpMapper;
 
     /**
      * 查询帮助
@@ -30,59 +43,63 @@ public class HelpServiceImpl implements IHelpService
      * @return 帮助
      */
     @Override
-    public Help selectHelpById(Long id)
+    public HelpDTO selectHelpById(@NonNull  Long id)
     {
-        return helpMapper.selectHelpById(id);
+        Help help = this.getById(id);
+        return HelpCopier.INSTANCE.copying(help);
     }
 
     /**
      * 查询帮助列表
      * 
-     * @param help 帮助
+     * @param param 帮助
      * @return 帮助
      */
     @Override
-    public List<Help> selectHelpList(Help help)
+    public List<HelpDTO> selectHelpList(@NonNull HelpModifyParam param)
     {
-        return helpMapper.selectHelpList(help);
+        List<Help> helps = this.lambdaQuery()
+                .eq(StringUtils.nonEmpty(param.getShowStatus()),Help::getShowStatus,param.getShowStatus())
+                .like(StringUtils.nonEmpty(param.getTitle()),Help::getTitle,param.getTitle())
+                .orderByDesc(Help::getTitle).list();
+        return HelpCopier.INSTANCE.copying(helps);
     }
 
     /**
      * 新增帮助
      * 
-     * @param help 帮助
+     * @param param 帮助
      * @return 结果
      */
     @Override
-    public int insertHelp(Help help)
+    public void insertHelp(@NonNull HelpModifyParam param)
     {
+        Help help = HelpCopier.INSTANCE.copying(param);
+        Long userId = SessionContextHolder.getId();
         help.setCreateTime(new Date());
-        return helpMapper.insertHelp(help);
+        help.setUpdater(userId);
+        help.setUpdateTime(new Date());
+        help.setCreator(userId);
+        this.save(help);
     }
 
     /**
      * 修改帮助
      * 
-     * @param help 帮助
+     * @param param 帮助
      * @return 结果
      */
     @Override
-    public int updateHelp(Help help)
+    public void updateHelp(@NonNull Long id,@NonNull HelpModifyParam param)
     {
-        return helpMapper.updateHelp(help);
+        Help help = ResourceUtils.required(this.getById(id), "该问题帮助不存在");
+        HelpCopier.INSTANCE.copying(param,help);
+        Long userId = SessionContextHolder.getId();
+        help.setUpdater(userId);
+        help.setUpdateTime(new Date());
+        this.updateById(help);
     }
 
-    /**
-     * 批量删除帮助
-     * 
-     * @param ids 需要删除的帮助主键
-     * @return 结果
-     */
-    @Override
-    public int deleteHelpByIds(Long[] ids)
-    {
-        return helpMapper.deleteHelpByIds(ids);
-    }
 
     /**
      * 删除帮助信息
@@ -91,8 +108,25 @@ public class HelpServiceImpl implements IHelpService
      * @return 结果
      */
     @Override
-    public int deleteHelpById(Long id)
+    public void deleteHelpById(@NonNull Long id)
     {
-        return helpMapper.deleteHelpById(id);
+        Help help = ResourceUtils.required(this.getById(id), "该问题帮助不存在");
+        this.deleteHelpById(id);
+    }
+    @Override
+    public Pagination<HelpDTO> getHelpPaging(HelpPagingParam param){
+        Page<Help> page = this.lambdaQuery()
+                .like(StringUtils.nonEmpty(param.getTitle()),Help::getTitle,param.getTitle())
+                .orderByDesc(Help::getShowStatus)
+                .page(PagingUtils.convert(param.getPaging()));
+        return PagingUtils.convert(page,HelpCopier.INSTANCE::copying);
+    }
+    @Override
+   public List<HelpDTO> helpList(Long categoryId){
+        List<Help> list = this.lambdaQuery()
+                .eq(Help::getShowStatus,0)
+                .eq(Help::getCategoryId,categoryId)
+                .list();
+        return HelpCopier.INSTANCE.copying(list);
     }
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/MerchantServiceImpl.java

@@ -12,6 +12,7 @@ import com.chelvc.cloud.vehicle.api.dto.CategoryDTO;
 import com.chelvc.cloud.vehicle.api.dto.GoodsDTO;
 import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
 import com.chelvc.cloud.vehicle.api.dto.MerchantDetailDTO;
+import com.chelvc.cloud.vehicle.api.dto.UserAllCartItemDTO;
 import com.chelvc.cloud.vehicle.api.param.*;
 import com.chelvc.cloud.vehicle.api.util.DateTimeUtils;
 import com.chelvc.cloud.vehicle.server.copier.MerchantCopier;
@@ -22,6 +23,7 @@ import com.chelvc.cloud.vehicle.server.entity.Region;
 import com.chelvc.cloud.vehicle.server.service.CategoryService;
 import com.chelvc.cloud.vehicle.server.service.GoodsService;
 import com.chelvc.cloud.vehicle.server.service.MerchantService;
+import com.chelvc.cloud.vehicle.server.service.OmsCartItemService;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.base.util.ResourceUtils;
 import com.chelvc.framework.common.model.Pagination;
@@ -35,6 +37,7 @@ import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.redis.core.RedisTemplate;
 
 import java.util.ArrayList;
@@ -48,7 +51,7 @@ import java.util.stream.Collectors;
  * @author Woody
  * @date 2023/5/2
  */
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor(onConstructor = @__({@Autowired, @Lazy}))
 @DubboService(interfaceClass = com.chelvc.cloud.vehicle.api.service.MerchantService.class)
 public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> implements MerchantService,
         com.chelvc.cloud.vehicle.api.service.MerchantService {
@@ -62,6 +65,8 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
 
     private final RegionMapper regionMapper;
 
+    private final OmsCartItemService omsCartItemService;
+
     @DubboReference
     EmployeeService employeeService;
 
@@ -270,4 +275,28 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
         Merchant merchant = baseMapper.selectOne(wrapper);
         return merchant != null ? merchant.getName() : "";
     }
+
+    /**
+     * 购物车列表
+     * @param param
+     * @return
+     */
+    @Override
+    public Pagination<MerchantDTO> getUserMineCartPaging(OmsCartItemPagingParam param){
+        Long userId = SessionContextHolder.getSession().getId();
+        List<Long> merchants = this.baseMapper.getMerchantIds(userId);
+        if (merchants == null && merchants.size() > 0){
+            return null;
+        }
+        Page<Merchant> page = this.lambdaQuery()
+                .like(StringUtils.nonEmpty(param.getMerchantName()), Merchant::getName, param.getMerchantName())
+                .eq(Merchant::getStatus, MerchantStatus.ONLINE)
+                .in(Merchant::getId,merchants)
+                .orderByDesc(Merchant::getCreateTime).page(PagingUtils.convert(param.getPaging()));
+        Pagination<MerchantDTO> pagination = PagingUtils.convert(page, MerchantCopier.INSTANCE::copying);
+        pagination.getRecords().forEach(item ->{
+           item.setCartItems(this.omsCartItemService.merchantListCartItem(item.getId()));
+        });
+        return pagination;
+    }
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsCartItemServiceImpl.java

@@ -1,9 +1,12 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.vehicle.api.dto.MerchantCartItemDTO;
 import com.chelvc.cloud.vehicle.api.dto.OmsCartItemDTO;
+import com.chelvc.cloud.vehicle.api.dto.UserAllCartItemDTO;
 import com.chelvc.cloud.vehicle.api.param.OmsCartItemModifyParam;
+import com.chelvc.cloud.vehicle.api.param.OmsCartItemPagingParam;
 import com.chelvc.cloud.vehicle.server.copier.CartItemCopier;
 import com.chelvc.cloud.vehicle.server.copier.MerchantCopier;
 import com.chelvc.cloud.vehicle.server.dao.OmsCartItemMapper;
@@ -12,13 +15,18 @@ import com.chelvc.cloud.vehicle.server.entity.OmsCartItem;
 import com.chelvc.cloud.vehicle.server.service.MerchantService;
 import com.chelvc.cloud.vehicle.server.service.OmsCartItemService;
 import com.chelvc.framework.base.context.SessionContextHolder;
+import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.util.StringUtils;
+import com.chelvc.framework.database.util.PagingUtils;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 购物车Service业务层处理
@@ -26,7 +34,7 @@ import java.util.List;
  * @author liude
  * @date 2023-11-08
  */
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor(onConstructor = @__({@Autowired, @Lazy}))
 @DubboService(interfaceClass = com.chelvc.cloud.vehicle.api.service.OmsCartItemService.class)
 public class OmsCartItemServiceImpl extends ServiceImpl<OmsCartItemMapper, OmsCartItem> implements OmsCartItemService,
         com.chelvc.cloud.vehicle.api.service.OmsCartItemService {
@@ -182,6 +190,16 @@ public class OmsCartItemServiceImpl extends ServiceImpl<OmsCartItemMapper, OmsCa
         return merchantCartItemDTO;
     }
 
+    public List<OmsCartItemDTO> merchantListCartItem(Long merchantId){
+        Long userId = SessionContextHolder.getId();
+        List<OmsCartItem> cartItemList = this.lambdaQuery()
+                .eq(OmsCartItem::getUserId, userId)
+                .eq(OmsCartItem::getDeleteStatus,0)
+                .eq(OmsCartItem::getMerchantId,merchantId)
+                .list();
+        return CartItemCopier.INSTANCE.copying(cartItemList);
+    }
+
 
 //    @Override
 //    public List<MerchantCartItemDTO> listCartItemByUserId() {

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -355,7 +355,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         pagination.getRecords().forEach(item ->{
             item.setGoodsInfo(this.omsOrderItemService.getOrderItemByOrderId(item.getId()));
         });
-       return pagination;
+        return pagination;
     }
 
     @Override

vehicle-server/src/main/resources/mapper/HelpCategoryMapper.xml

@@ -12,65 +12,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="showStatus"    column="show_status"    />
         <result property="sort"    column="sort"    />
     </resultMap>
-
-    <sql id="selectHelpCategoryVo">
-        select id, name, icon, help_count, show_status, sort from help_category
-    </sql>
-
-    <select id="selectHelpCategoryList" parameterType="com.chelvc.cloud.vehicle.server.entity.HelpCategory" resultMap="HelpCategoryResult">
-        <include refid="selectHelpCategoryVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="icon != null  and icon != ''"> and icon = #{icon}</if>
-            <if test="helpCount != null "> and help_count = #{helpCount}</if>
-            <if test="showStatus != null "> and show_status = #{showStatus}</if>
-            <if test="sort != null "> and sort = #{sort}</if>
-        </where>
-    </select>
-    
-    <select id="selectHelpCategoryById" parameterType="Long" resultMap="HelpCategoryResult">
-        <include refid="selectHelpCategoryVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertHelpCategory" parameterType="com.chelvc.cloud.vehicle.server.entity.HelpCategory" useGeneratedKeys="true" keyProperty="id">
-        insert into help_category
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="name != null">name,</if>
-            <if test="icon != null">icon,</if>
-            <if test="helpCount != null">help_count,</if>
-            <if test="showStatus != null">show_status,</if>
-            <if test="sort != null">sort,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="name != null">#{name},</if>
-            <if test="icon != null">#{icon},</if>
-            <if test="helpCount != null">#{helpCount},</if>
-            <if test="showStatus != null">#{showStatus},</if>
-            <if test="sort != null">#{sort},</if>
-         </trim>
-    </insert>
-
-    <update id="updateHelpCategory" parameterType="com.chelvc.cloud.vehicle.server.entity.HelpCategory">
-        update help_category
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="name != null">name = #{name},</if>
-            <if test="icon != null">icon = #{icon},</if>
-            <if test="helpCount != null">help_count = #{helpCount},</if>
-            <if test="showStatus != null">show_status = #{showStatus},</if>
-            <if test="sort != null">sort = #{sort},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteHelpCategoryById" parameterType="Long">
-        delete from help_category where id = #{id}
-    </delete>
-
-    <delete id="deleteHelpCategoryByIds" parameterType="String">
-        delete from help_category where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
 </mapper>

vehicle-server/src/main/resources/mapper/HelpMapper.xml

@@ -14,72 +14,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="readCount"    column="read_count"    />
         <result property="content"    column="content"    />
     </resultMap>
-
-    <sql id="selectHelpVo">
-        select id, category_id, icon, title, show_status, create_time, read_count, content from help
-    </sql>
-
-    <select id="selectHelpList" parameterType="com.chelvc.cloud.vehicle.server.entity.Help" resultMap="HelpResult">
-        <include refid="selectHelpVo"/>
-        <where>  
-            <if test="categoryId != null "> and category_id = #{categoryId}</if>
-            <if test="icon != null  and icon != ''"> and icon = #{icon}</if>
-            <if test="title != null  and title != ''"> and title = #{title}</if>
-            <if test="showStatus != null "> and show_status = #{showStatus}</if>
-            <if test="readCount != null "> and read_count = #{readCount}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-        </where>
-    </select>
-    
-    <select id="selectHelpById" parameterType="Long" resultMap="HelpResult">
-        <include refid="selectHelpVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertHelp" parameterType="com.chelvc.cloud.vehicle.server.entity.Help" useGeneratedKeys="true" keyProperty="id">
-        insert into help
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="categoryId != null">category_id,</if>
-            <if test="icon != null">icon,</if>
-            <if test="title != null">title,</if>
-            <if test="showStatus != null">show_status,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="readCount != null">read_count,</if>
-            <if test="content != null">content,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="categoryId != null">#{categoryId},</if>
-            <if test="icon != null">#{icon},</if>
-            <if test="title != null">#{title},</if>
-            <if test="showStatus != null">#{showStatus},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="readCount != null">#{readCount},</if>
-            <if test="content != null">#{content},</if>
-         </trim>
-    </insert>
-
-    <update id="updateHelp" parameterType="com.chelvc.cloud.vehicle.server.entity.Help">
-        update help
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="categoryId != null">category_id = #{categoryId},</if>
-            <if test="icon != null">icon = #{icon},</if>
-            <if test="title != null">title = #{title},</if>
-            <if test="showStatus != null">show_status = #{showStatus},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="readCount != null">read_count = #{readCount},</if>
-            <if test="content != null">content = #{content},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteHelpById" parameterType="Long">
-        delete from help where id = #{id}
-    </delete>
-
-    <delete id="deleteHelpByIds" parameterType="String">
-        delete from help where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
 </mapper>

vehicle-server/src/main/resources/mapper/MerchantMapper.xml

@@ -123,4 +123,9 @@
             amount DESC
         limit 10
     </select>
+
+    <select id="getMerchantIds" resultType="java.lang.Long">
+        select m.id from merchant m left join oms_cart_item ca on m.id = ca.merchant_id
+        where ca.id is not null and  ca.user_id = #{userId}
+    </select>
 </mapper>

vehicle-server/src/main/resources/mapper/OmsCartItemMapper.xml

@@ -16,8 +16,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsSubTitle"    column="goods_sub_title"    />
         <result property="goodsSkuCode"    column="goods_sku_code"    />
         <result property="memberNickname"    column="member_nickname"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="modifyDate"    column="modify_date"    />
         <result property="deleteStatus"    column="delete_status"    />
         <result property="goodsCategoryId"    column="goods_category_id"    />
         <result property="goodsBrand"    column="goods_brand"    />