用户收藏商户代码提交

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TCollectController.java

@@ -1,98 +0,0 @@
-package com.ylx.web.controller.massage;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-
-import com.ylx.common.core.domain.R;
-import com.ylx.common.utils.uuid.IdUtils;
-import com.ylx.massage.domain.TCollect;
-import com.ylx.massage.service.TCollectService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * 收藏表 前端控制器
- */
-@RestController
-@Slf4j
-@RequestMapping("api/collect/v1")
-@Api(tags = {"收藏"})
-public class TCollectController {
-    @Resource
-    private TCollectService collectService;
-
-    /**
-     * 添加收藏
-     *
-     * @param collect
-     * @return
-     */
-    @ApiOperation("添加收藏")
-    @RequestMapping(value = "/wx/addCollect", method = RequestMethod.POST)
-    public R addCollect(@RequestBody TCollect collect) {
-        try {
-            if (StringUtils.isBlank(collect.getcWxOpenId())) {
-                return R.fail("openId不能为空");
-            }
-            if (StringUtils.isBlank(collect.getcJsId())) {
-                return R.fail("技师Id不能为空");
-            }
-            TCollect collect1 = collectService.selectCollect(collect);
-            if(collect1 !=null){
-                return R.ok();
-            }
-            return R.ok(collectService.save(collect));
-        } catch (Exception e) {
-            log.error("收藏失败", e);
-            return R.fail("收藏失败");
-        }
-
-    }
-
-    /**
-     * 获取收藏
-     *
-     * @param param
-     * @return
-     */
-    @ApiOperation("获取收藏")
-    @RequestMapping(value = "/wx/getCollect", method = RequestMethod.POST)
-    public R<List<TCollect>> getCollect(@RequestBody TCollect param) {
-        List<TCollect> list = collectService.getAll(param);
-        return R.ok(list);
-    }
-
-    /**
-     * 取消收藏
-     *
-     * @param param
-     * @return
-     */
-    @ApiOperation("取消收藏")
-    @RequestMapping(value = "/wx/delCollect", method = RequestMethod.POST)
-    public R delCollect(@RequestBody TCollect param) {
-
-        try {
-            if (StringUtils.isNotBlank(param.getcId())) {
-                collectService.removeById(param.getcId());
-            } else if (StringUtils.isNotBlank(param.getcWxOpenId()) && StringUtils.isNotBlank(param.getcJsId())) {
-                LambdaQueryWrapper<TCollect> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                objectLambdaQueryWrapper.eq(TCollect::getcWxOpenId, param.getcWxOpenId()).eq(TCollect::getcJsId, param.getcJsId());
-                collectService.remove(objectLambdaQueryWrapper);
-            }
-            return R.ok();
-        } catch (Exception e) {
-            log.error("取消收藏失败", e);
-            return R.fail("取消收藏失败");
-        }
-    }
-}

nightFragrance-massage/src/main/java/com/ylx/base/BaseServiceImpl.java

@@ -0,0 +1,42 @@
+package com.ylx.base;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper; // 1. 必须引入这个包
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ylx.common.core.domain.model.WxLoginUser;
+import com.ylx.common.exception.ServiceException;
+import com.ylx.common.utils.SecurityUtils;
+
+/**
+ * 基础业务服务实现类
+ * @param <M> Mapper 类型 (必须继承 BaseMapper)
+ * @param <T> 实体类型
+ */
+// 2. 在 <M> 后面加上 extends BaseMapper<T>
+public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M, T> {
+
+    /**
+     * 获取当前登录的微信用户信息
+     */
+    protected WxLoginUser getCurrentWxLoginUser() {
+        WxLoginUser loginUser = SecurityUtils.getWxLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new ServiceException("用户未登录或登录已过期");
+        }
+        return loginUser;
+    }
+
+    /**
+     * 快捷获取当前用户ID
+     */
+    protected Long getCurrentUserId() {
+        return Long.parseLong(getCurrentWxLoginUser().getId());
+    }
+
+    /**
+     * 快捷获取当前用户昵称
+     */
+    protected String getCurrentUserNickName() {
+        return getCurrentWxLoginUser().getCNickName();
+    }
+}

nightFragrance-massage/src/main/java/com/ylx/collect/controller/CustomerCollectController.java

@@ -0,0 +1,51 @@
+package com.ylx.collect.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ylx.collect.domain.dto.CollectOperateDTO;
+import com.ylx.collect.domain.vo.CollectPageVO;
+import com.ylx.collect.service.CollectService;
+import com.ylx.common.core.domain.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/customer/collect")
+@Api(tags = {"用户端收藏商户"})
+@Slf4j
+@PreAuthorize("@customerAuth.isCustomer()")
+public class CustomerCollectController {
+
+    @Resource
+    private CollectService collectService;
+
+    @ApiOperation("添加收藏")
+    @PostMapping(value = "/add")
+    public R<Boolean> addCollect(@Validated @RequestBody CollectOperateDTO dto) {
+        boolean success = this.collectService.addCollect(dto);
+        return R.ok(success);
+    }
+
+    @ApiOperation("我的收藏分页列表")
+    @PostMapping(value = "/page")
+    public R<Page<CollectPageVO>> page(@RequestBody CollectOperateDTO dto) {
+        Page<CollectPageVO> resultPage = this.collectService.page(dto);
+        return R.ok(resultPage);
+    }
+
+    @ApiOperation("取消收藏")
+    @PostMapping(value = "/cancel")
+    public R<Boolean> cancelCollect(@Validated @RequestBody CollectOperateDTO dto) {
+        boolean success = this.collectService.cancelCollect(dto);
+        return R.ok(success);
+    }
+
+}

nightFragrance-massage/src/main/java/com/ylx/collect/domain/Collect.java

@@ -0,0 +1,35 @@
+package com.ylx.collect.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.ylx.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName("collect")
+public class Collect extends BaseEntity {
+    private static final long serialVersionUID = -6122501868978194500L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 收藏用户ID
+     */
+    private Long userId;
+
+    /**
+     * 商户ID
+     */
+    private Long merchantId;
+
+    /**
+     * 是否删除 0否 1是
+     */
+    private Integer isDelete;
+
+}

nightFragrance-massage/src/main/java/com/ylx/collect/domain/dto/CollectOperateDTO.java

@@ -0,0 +1,21 @@
+package com.ylx.collect.domain.dto;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ylx.collect.domain.vo.CollectPageVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("收藏通用入参DTO")
+public class CollectOperateDTO extends Page<CollectPageVO> {
+
+    @NotNull(message = "商户ID不能为空")
+    @ApiModelProperty("商户主键ID")
+    private Long merchantId;
+
+}

nightFragrance-massage/src/main/java/com/ylx/collect/domain/vo/CollectPageVO.java

@@ -0,0 +1,21 @@
+package com.ylx.collect.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@ApiModel("我的收藏VO")
+@Data
+public class CollectPageVO {
+
+    private Long id;
+
+    /**
+     * 收藏用户ID
+     */
+    private Long userId;
+
+    /**
+     * 商户ID
+     */
+    private Long merchantId;
+}

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/TCollectMapper.java → nightFragrance-massage/src/main/java/com/ylx/collect/mapper/CollectMapper.java

@@ -1,9 +1,9 @@
-package com.ylx.massage.mapper;
+package com.ylx.collect.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.ylx.massage.domain.TCollect;
+import com.ylx.collect.domain.Collect;
 
 import java.util.List;
 
@@ -11,6 +11,6 @@ import java.util.List;
  * 收藏表 Mapper 接口
  */
 @Mapper
-public interface TCollectMapper extends BaseMapper<TCollect> {
-    public List<TCollect> getAll(@Param("param") TCollect param);
+public interface CollectMapper extends BaseMapper<Collect> {
+
 }

nightFragrance-massage/src/main/java/com/ylx/collect/service/CollectService.java

@@ -0,0 +1,21 @@
+package com.ylx.collect.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ylx.collect.domain.Collect;
+import com.ylx.collect.domain.dto.CollectOperateDTO;
+import com.ylx.collect.domain.vo.CollectPageVO;
+
+import java.util.List;
+
+/**
+ * 收藏表 服务类
+ */
+public interface CollectService extends IService<Collect> {
+
+    boolean addCollect(CollectOperateDTO dto);
+
+    boolean cancelCollect(CollectOperateDTO dto);
+
+    Page<CollectPageVO> page(CollectOperateDTO dto);
+}

nightFragrance-massage/src/main/java/com/ylx/collect/service/impl/CollectServiceImpl.java

@@ -0,0 +1,110 @@
+package com.ylx.collect.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ylx.base.BaseServiceImpl;
+import com.ylx.collect.domain.Collect;
+import com.ylx.collect.domain.dto.CollectOperateDTO;
+import com.ylx.collect.domain.vo.CollectPageVO;
+import com.ylx.collect.mapper.CollectMapper;
+import com.ylx.collect.service.CollectService;
+import com.ylx.common.utils.DateUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class CollectServiceImpl extends BaseServiceImpl<CollectMapper, Collect> implements CollectService {
+
+    private static final int NOT_DELETE = 0;
+    private static final int DELETE = 1;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean addCollect(CollectOperateDTO dto) {
+        // 1. 直接调用基类方法获取用户ID，无需再手动校验登录状态
+        Long userId = getCurrentUserId();
+
+        // 2. 幂等性检查：防止重复收藏
+        LambdaQueryWrapper<Collect> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Collect::getUserId, userId)
+                .eq(Collect::getIsDelete, NOT_DELETE)
+                .eq(Collect::getMerchantId, dto.getMerchantId());
+        if (this.count(wrapper) > 0) {
+            return true;
+        }
+
+        // 3. 执行新增
+        Collect collect = new Collect();
+        collect.setUserId(userId);
+        collect.setMerchantId(dto.getMerchantId());
+        collect.setCreateTime(DateUtils.getNowDate());
+        collect.setCreateBy(getCurrentUserNickName());
+        collect.setIsDelete(NOT_DELETE);
+        return this.save(collect);
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean cancelCollect(CollectOperateDTO dto) {
+        // 1. 获取当前用户
+        Long userId = getCurrentUserId();
+
+        Collect updateEntity = new Collect();
+        updateEntity.setIsDelete(DELETE);
+        updateEntity.setUpdateTime(DateUtils.getNowDate());
+        updateEntity.setUpdateBy(getCurrentUserNickName());
+
+        // 2. 构造删除条件
+        LambdaQueryWrapper<Collect> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Collect::getUserId, userId)
+                .eq(Collect::getIsDelete, NOT_DELETE)
+                .eq(Collect::getMerchantId, dto.getMerchantId());
+
+        // 3. 执行逻辑删除
+        return this.update(updateEntity, wrapper);
+    }
+
+    @Override
+    public Page<CollectPageVO> page(CollectOperateDTO dto) {
+        // 1. 获取当前用户，确保只能查自己的收藏
+        Long userId = getCurrentUserId();
+
+        // 2. 构建分页对象
+        Page<Collect> pageParam = new Page<>(dto.getCurrent(), dto.getSize());
+
+        // 3. 构建查询条件
+        LambdaQueryWrapper<Collect> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Collect::getUserId, userId)
+                .eq(Collect::getIsDelete, NOT_DELETE)
+                .orderByDesc(Collect::getCreateTime); // 按时间倒序
+
+        // 4. 执行查询
+        Page<Collect> resultPage = this.page(pageParam, wrapper);
+
+        Page<CollectPageVO> voPage = new Page<>();
+        // 1. 复制分页元数据（总条数、当前页码等）
+        voPage.setCurrent(resultPage.getCurrent());
+        voPage.setSize(resultPage.getSize());
+        voPage.setTotal(resultPage.getTotal());
+        voPage.setPages(resultPage.getPages());
+
+        // 2. 转换列表数据
+        List<CollectPageVO> voList = resultPage.getRecords().stream().map(collect -> {
+            CollectPageVO vo = new CollectPageVO();
+            // 属性拷贝
+            BeanUtil.copyProperties(collect, vo);
+            return vo;
+        }).collect(Collectors.toList());
+
+        voPage.setRecords(voList);
+        return voPage;
+    }
+
+}

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TCollect.java

@@ -1,106 +0,0 @@
-package com.ylx.massage.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * 收藏表
- */
-@Getter
-@Setter
-@Accessors(chain = true)
-@ApiModel(value = "TCollect" ,description = "收藏")
-@TableName(value = "t_collect" ,autoResultMap = true)
-public class TCollect implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId("c_id")
-    @ApiModelProperty("cId")
-    private String cId;
-
-    /**
-     * 微信用户openid
-     */
-    @TableField("c_wx_open_id")
-    @ApiModelProperty("微信用户openid")
-    private String cWxOpenId;
-
-    /**
-     * 技师 id
-     */
-    @TableField("c_js_id")
-    @ApiModelProperty("技师 id")
-    private String cJsId;
-
-    /**
-     * 创建时间
-     */
-    @TableField("dt_create_time")
-    @ApiModelProperty("创建时间")
-    private LocalDateTime dtCreateTime;
-
-    @ApiModelProperty("是否删除0否1是")
-    @TableLogic
-    private Integer isDelete;
-
-    /**
-     * 技师信息
-     */
-    @TableField(exist = false)
-    @ApiModelProperty("技师信息")
-    private TJs js;
-
-    public String getcId() {
-        return cId;
-    }
-
-    public void setcId(String cId) {
-        this.cId = cId;
-    }
-
-    public String getcWxOpenId() {
-        return cWxOpenId;
-    }
-
-    public void setcWxOpenId(String cWxOpenId) {
-        this.cWxOpenId = cWxOpenId;
-    }
-
-    public TJs getJs() {
-        return js;
-    }
-
-    public void setJs(TJs js) {
-        this.js = js;
-    }
-
-    public LocalDateTime getDtCreateTime() {
-        return dtCreateTime;
-    }
-
-    public void setDtCreateTime(LocalDateTime dtCreateTime) {
-        this.dtCreateTime = dtCreateTime;
-    }
-
-    public String getcJsId() {
-        return cJsId;
-    }
-
-    public void setcJsId(String cJsId) {
-        this.cJsId = cJsId;
-    }
-}

nightFragrance-massage/src/main/java/com/ylx/massage/service/TCollectService.java

@@ -1,16 +0,0 @@
-package com.ylx.massage.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ylx.massage.domain.TCollect;
-
-import java.util.List;
-
-/**
- * 收藏表 服务类
- */
-public interface TCollectService extends IService<TCollect> {
-
-    public List<TCollect> getAll(TCollect param);
-
-    TCollect selectCollect(TCollect collect);
-}

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TCollectServiceImpl.java

@@ -1,31 +0,0 @@
-package com.ylx.massage.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ylx.massage.domain.TCollect;
-import com.ylx.massage.mapper.TCollectMapper;
-import com.ylx.massage.service.TCollectService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 收藏表 服务实现类
- */
-@Service
-public class TCollectServiceImpl extends ServiceImpl<TCollectMapper, TCollect> implements TCollectService {
-    @Resource
-    private TCollectMapper collectMapper;
-
-    public List<TCollect> getAll(TCollect param) {
-        return collectMapper.getAll(param);
-    }
-
-    @Override
-    public TCollect selectCollect(TCollect collect) {
-        LambdaQueryWrapper<TCollect> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(TCollect::getcWxOpenId,collect.getcWxOpenId()).eq(TCollect::getcJsId,collect.getcJsId());
-        return this.getOne(wrapper);
-    }
-}

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TJsServiceImpl.java

@@ -8,6 +8,7 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ylx.collect.service.CollectService;
 import com.ylx.common.config.WechatAccountConfig;
 import com.ylx.common.constant.MassageConstants;
 import com.ylx.common.exception.ServiceException;
@@ -50,7 +51,7 @@ public class TJsServiceImpl extends ServiceImpl<TJsMapper, TJs> implements TJsSe
     private LocationUtil locationUtil;
 
     @Resource
-    private TCollectService collectService;
+    private CollectService collectService;
 
     @Resource
     private TXiangmuService xiangmuService;
@@ -496,14 +497,14 @@ public class TJsServiceImpl extends ServiceImpl<TJsMapper, TJs> implements TJsSe
             js.setComments(list);
         }
         //是否收藏
-        LambdaQueryWrapper<TCollect> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        objectLambdaQueryWrapper.eq(TCollect::getcJsId, jsId).eq(TCollect::getcWxOpenId, openId);
-        TCollect collect = collectService.getOne(objectLambdaQueryWrapper);
-        if (collect != null) {
-            js.setIsCollection(true);
-        } else {
-            js.setIsCollection(false);
-        }
+//        LambdaQueryWrapper<TCollect> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+//        objectLambdaQueryWrapper.eq(TCollect::getcJsId, jsId).eq(TCollect::getcWxOpenId, openId);
+//        TCollect collect = collectService.getOne(objectLambdaQueryWrapper);
+//        if (collect != null) {
+//            js.setIsCollection(true);
+//        } else {
+//            js.setIsCollection(false);
+//        }
         return js;
     }
 

nightFragrance-massage/src/main/resources/mapper/collect/CollectMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ylx.collect.mapper.CollectMapper">
+
+</mapper>

nightFragrance-massage/src/main/resources/mapper/massage/TCollectMapper.xml

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ylx.massage.mapper.TCollectMapper">
-
-    <resultMap id="getAllMap" type="com.ylx.massage.domain.TCollect">
-        <id column="c_id" property="cId"/>
-        <result column="c_wx_open_id" property="cWxOpenId"/>
-        <result column="c_js_id" property="cJsId"/>
-        <result column="dt_create_time" property="dtCreateTime"/>
-        <association property="js" javaType="com.ylx.massage.domain.TJs">
-            <id column="id" property="id"/>
-            <result column="c_open_id" property="cOpenId"/>
-            <result column="c_bh_list" property="cBhList"/>
-            <result column="c_img_list" property="cImgList"
-                    typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
-            <result column="c_sfz_img" property="cSfzImg"
-                    typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
-            <result column="n_sex" property="nSex"/>
-            <result column="c_nick_name" property="cNickName"/>
-            <result column="c_portrait" property="cPortrait"/>
-            <result column="c_name" property="cName"/>
-            <result column="c_phone" property="cPhone"/>
-            <result column="c_address" property="cAddress"/>
-            <result column="c_jianjie" property="cJianjie"/>
-            <result column="n_star" property="nStar"/>
-            <result column="n_bili" property="nBili"/>
-            <result column="n_num" property="nNum"/>
-            <result column="n_num2" property="nNum2"/>
-            <result column="n_status" property="nStatus"/>
-            <result column="n_status2" property="nStatus2"/>
-            <result column="n_tong" property="nTong"/>
-            <result column="c_time" property="cTime"/>
-            <result column="n_b1" property="nB1"/>
-            <result column="n_b2" property="nB2"/>
-            <result column="n_b3" property="nB3"/>
-            <result column="jsCreateTime" property="dtCreateTime"/>
-        </association>
-    </resultMap>
-    <select id="getAll" resultMap="getAllMap">
-        select t_collect.c_id,
-               t_collect.c_wx_open_id,
-               t_collect.c_js_id,
-               t_collect.dt_create_time,
-               t_js.id,
-               t_js.c_open_id,
-               t_js.c_bh_list,
-               t_js.c_img_list,
-               t_js.c_sfz_img,
-               t_js.n_sex,
-               t_js.c_nick_name,
-               t_js.c_portrait,
-               t_js.c_name,
-               t_js.c_phone,
-               t_js.c_address,
-               t_js.c_jianjie,
-               t_js.n_star,
-               t_js.n_bili,
-               t_js.n_num,
-               t_js.n_status,
-               t_js.n_status2,
-               t_js.n_tong,
-               t_js.c_time,
-               t_js.n_b1,
-               t_js.n_b2,
-               t_js.n_b3,
-               t_js.dt_create_time as jsCreateTime
-        from t_collect
-        left join
-            t_js
-        on
-            t_collect.c_js_id = t_js.id
-        <where>
-            t_collect.is_delete = 0 and t_js.is_delete = 0
-            <if test="param.cWxOpenId != null and param.cWxOpenId != ''">
-                and t_collect.c_wx_open_id = #{ param.cWxOpenId }
-            </if>
-            <if test="param.cJsId != null and param.cJsId != ''">
-                and t_collect.c_js_id = #{ param.cJsId }
-            </if>
-        </where>
-        order by
-            t_collect.dt_create_time desc
-    </select>
-
-</mapper>