Merge branch 'master' of ssh://192.168.8.213:10022/miaxis/zzjs

zzjs-admin/src/main/java/com/miaxis/app/controller/collection/AppletCollectionInfoController.java

@@ -0,0 +1,77 @@
+package com.miaxis.app.controller.collection;
+
+import com.miaxis.collection.service.ICollectionInfoService;
+import com.miaxis.collection.vo.CollectionCustomerVo;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.utils.SecurityUtils;
+import io.swagger.annotations.*;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【小程序-收藏管理】Controller
+ *
+ * @author miaxis
+ * @date 2021-03-10
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/applet/collection")
+@Api(tags = {"【小程序-收藏管理】"})
+public class AppletCollectionInfoController extends BaseController {
+
+    private final ICollectionInfoService collectionInfoService;
+
+
+    /**
+     * 查询用户收藏列表
+     */
+    @GetMapping("/collectionList")
+    @ApiOperation("查询用户收藏列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "当前页码", dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize", value = "每页数据量", dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<CollectionCustomerVo> collectionList() {
+        startPage();
+        //当前用户
+        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
+        List<CollectionCustomerVo> list = collectionInfoService.collectionList(userInfo);
+        return toResponsePageInfo(list);
+    }
+
+
+    /**
+     * 收藏商家
+     */
+    @PutMapping(value = "/collectionBusiness/{id}")
+    @ApiOperation("收藏商家")
+    public Response collectionBusiness(
+            @ApiParam(name = "id",value = "商家id",required = true)
+            @PathVariable("id") Long id
+    ){
+        //当前用户
+        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
+        return collectionInfoService.collectionBusiness(userInfo,id);
+    }
+
+    /**
+     * 取消收藏商家
+     */
+    @DeleteMapping(value = "/cancelCollection/{ids}")
+    @ApiOperation("取消收藏")
+    public Response cancelCollection(
+            @ApiParam(name = "ids", value = "收藏ids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(collectionInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+
+
+}

zzjs-admin/src/main/java/com/miaxis/app/controller/customer/AppletCustomerInfoController.java

@@ -1,22 +1,16 @@
 package com.miaxis.app.controller.customer;
 
-import com.miaxis.collection.mapper.CollectionInfoMapper;
 import com.miaxis.collection.service.ICollectionInfoService;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.domain.entity.SysUser;
-import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.customer.domain.CustomerInfo;
 import com.miaxis.customer.service.ICustomerInfoService;
-import com.miaxis.customer.vo.CustomerInfoVo;
+import com.miaxis.customer.vo.ExhibitionCustomerInfoVo;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -33,7 +27,6 @@ public class AppletCustomerInfoController extends BaseController {
 
     private final ICustomerInfoService customerInfoService;
 
-    private final ICollectionInfoService collectionInfoService;
 
     /**
      * 查询客户信息列表
@@ -60,12 +53,12 @@ public class AppletCustomerInfoController extends BaseController {
             @ApiImplicitParam(name = "pageNum", value = "当前页码", dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize", value = "每页数据量", dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<CustomerInfoVo> getCustomerListByProductId(
+    public ResponsePageInfo<ExhibitionCustomerInfoVo> getCustomerListByProductId(
             @ApiParam(name = "id", value = "品类id", required = true)
             @PathVariable("id") Long id
     ) {
         startPage();
-        List<CustomerInfoVo> list = customerInfoService.getCustomerListByProductId(id);
+        List<ExhibitionCustomerInfoVo> list = customerInfoService.getCustomerListByProductId(id);
         return toResponsePageInfo(list);
     }
 
@@ -78,38 +71,11 @@ public class AppletCustomerInfoController extends BaseController {
             @ApiImplicitParam(name = "pageNum", value = "当前页码", dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize", value = "每页数据量", dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<CustomerInfoVo> getCustomerListByCollectionCount() {
+    public ResponsePageInfo<ExhibitionCustomerInfoVo> getCustomerListByCollectionCount() {
         startPage();
-        List<CustomerInfoVo> list = customerInfoService.getCustomerListByCollectionCount();
+        List<ExhibitionCustomerInfoVo> list = customerInfoService.getCustomerListByCollectionCount();
         return toResponsePageInfo(list);
     }
 
 
-    /**
-     * 收藏商家
-     */
-    @PutMapping(value = "/collectionBusiness/{id}")
-    @ApiOperation("收藏商家")
-    public Response collectionBusiness(
-            @ApiParam(name = "id",value = "商家id",required = true)
-            @PathVariable("id") Long id
-    ){
-        //当前用户
-        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
-        return customerInfoService.collectionBusiness(userInfo,id);
-    }
-
-    /**
-     * 取消收藏商家
-     */
-    @DeleteMapping(value = "/cancelCollection/{ids}")
-    @ApiOperation("取消收藏")
-    public Response cancelCollection(
-            @ApiParam(name = "ids", value = "收藏ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return toResponse(collectionInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
-
-
 }

zzjs-service/src/main/java/com/miaxis/collection/service/ICollectionInfoService.java

@@ -2,6 +2,11 @@ package com.miaxis.collection.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.collection.domain.CollectionInfo;
+import com.miaxis.collection.vo.CollectionCustomerVo;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.UserInfo;
+
+import java.util.List;
 
 /**
  * 收藏Service接口
@@ -10,4 +15,21 @@ import com.miaxis.collection.domain.CollectionInfo;
  * @Version 1.0
  */
 public interface ICollectionInfoService extends IService<CollectionInfo> {
+
+    /**
+     * 查询用户收藏列表
+     * @param userInfo
+     * @return
+     */
+    List<CollectionCustomerVo> collectionList(UserInfo userInfo);
+
+    /**
+     * applet
+     * 收藏商家
+     * @param userInfo 当前用户
+     * @param id 商家id
+     * @return
+     */
+    Response collectionBusiness(UserInfo userInfo, Long id);
+
 }

zzjs-service/src/main/java/com/miaxis/collection/service/impl/CollectionInfoServiceImpl.java

@@ -4,8 +4,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.collection.domain.CollectionInfo;
 import com.miaxis.collection.mapper.CollectionInfoMapper;
 import com.miaxis.collection.service.ICollectionInfoService;
+import com.miaxis.collection.vo.CollectionCustomerVo;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.customer.mapper.CustomerInfoMapper;
 import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * @Author wwl
@@ -15,4 +23,41 @@ import org.springframework.stereotype.Service;
 @Service
 @RequiredArgsConstructor
 public class CollectionInfoServiceImpl extends ServiceImpl<CollectionInfoMapper, CollectionInfo> implements ICollectionInfoService {
+
+    private final CollectionInfoMapper collectionInfoMapper;
+
+    private final CustomerInfoMapper customerInfoMapper;
+
+
+    /**
+     * 查询用户收藏列表
+     * @param userInfo
+     * @return
+     */
+    @Override
+    @SneakyThrows
+    public List<CollectionCustomerVo> collectionList(UserInfo userInfo) {
+        return customerInfoMapper.getCollectionList(userInfo.getId());
+    }
+
+    /**
+     * applet
+     * 收藏商家
+     * @param userInfo 当前用户
+     * @param id 商家id
+     * @return
+     */
+    @Override
+    @SneakyThrows
+    @Transactional(rollbackFor = Exception.class)
+    public Response collectionBusiness(UserInfo userInfo, Long id) {
+        //保存收藏表
+        CollectionInfo collectionInfo = new CollectionInfo();
+        collectionInfo.setUserId(userInfo.getId());
+        collectionInfo.setCustomerId(id);
+        collectionInfoMapper.insert(collectionInfo);
+        return Response.success();
+    }
+
+
 }

zzjs-service/src/main/java/com/miaxis/collection/vo/CollectionCustomerVo.java

@@ -0,0 +1,59 @@
+package com.miaxis.collection.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 收藏客户信息对象返回参
+ *
+ * @author miaxis
+ * @date 2021-03-15
+ */
+@Data
+@ApiModel(value = "CollectionCustomerVo", description = "收藏客户信息对象返回参")
+public class CollectionCustomerVo {
+
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "商家id")
+    private Long customerId;
+
+    @TableField("corporate_name")
+    @ApiModelProperty(value = "公司名称")
+    private String corporateName;
+
+    @ApiModelProperty(value = "公司LOGO图片访问地址")
+    private String corporateLogoFileUrl;
+
+    @TableField("applet_address")
+    @ApiModelProperty(value = "小程序地址")
+    private String appletAddress;
+
+    @ApiModelProperty(value = "小程序图标访问地址")
+    private String appletLogoFileUrl;
+
+    @ApiModelProperty(value = "小程序二维码访问地址")
+    private String appletQrCodeFileUrl;
+
+    @TableField("applet_introduce")
+    @ApiModelProperty(value = "小程序介绍")
+    private String appletIntroduce;
+
+    @TableField("status")
+    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
+    private Integer status;
+
+    @ApiModelProperty(value = "收藏时间"  ,hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+}

zzjs-service/src/main/java/com/miaxis/customer/mapper/CustomerInfoMapper.java

@@ -2,8 +2,10 @@ package com.miaxis.customer.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.collection.vo.CollectionCustomerVo;
 import com.miaxis.customer.domain.CustomerInfo;
 import com.miaxis.customer.vo.CustomerInfoVo;
+import com.miaxis.customer.vo.ExhibitionCustomerInfoVo;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -34,12 +36,18 @@ public interface CustomerInfoMapper extends BaseMapper<CustomerInfo> {
      * @param productId
      * @return
      */
-    List<CustomerInfoVo> getCustomerListByProductId(@Param("productId") Long productId);
+    List<ExhibitionCustomerInfoVo> getCustomerListByProductId(@Param("productId") Long productId);
 
     /**
      * 查询精选商家列表 根据收藏数排行
      * @return
      */
-    List<CustomerInfoVo> getCustomerListByCollectionCount();
+    List<ExhibitionCustomerInfoVo> getCustomerListByCollectionCount();
 
+    /**
+     * 查询用户收藏列表
+     * @param id
+     * @return
+     */
+    List<CollectionCustomerVo> getCollectionList(@Param("id")Long id);
 }

zzjs-service/src/main/java/com/miaxis/customer/service/ICustomerInfoService.java

@@ -1,12 +1,12 @@
 package com.miaxis.customer.service;
 
-import java.util.List;
-
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.customer.domain.CustomerInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.customer.vo.CustomerInfoVo;
+import com.miaxis.customer.vo.ExhibitionCustomerInfoVo;
+
+import java.util.List;
 
 /**
  * 客户信息Service接口
@@ -52,21 +52,13 @@ public interface ICustomerInfoService extends IService<CustomerInfo>{
      * @param productId
      * @return
      */
-    List<CustomerInfoVo> getCustomerListByProductId(Long productId);
+    List<ExhibitionCustomerInfoVo> getCustomerListByProductId(Long productId);
 
-    /**
-     * applet
-     * 收藏商家
-     * @param userInfo 当前用户
-     * @param id 商家id
-     * @return
-     */
-    Response collectionBusiness(UserInfo userInfo, Long id);
 
     /**
      * 查询精选商家列表 根据收藏数排行
      * @return
      */
-    List<CustomerInfoVo> getCustomerListByCollectionCount();
+    List<ExhibitionCustomerInfoVo> getCustomerListByCollectionCount();
 
 }

zzjs-service/src/main/java/com/miaxis/customer/service/impl/CustomerInfoServiceImpl.java

@@ -1,16 +1,13 @@
 package com.miaxis.customer.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.collection.domain.CollectionInfo;
-import com.miaxis.collection.mapper.CollectionInfoMapper;
 import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.customer.domain.CustomerInfo;
 import com.miaxis.customer.mapper.CustomerInfoMapper;
 import com.miaxis.customer.service.ICustomerInfoService;
 import com.miaxis.customer.vo.CustomerInfoVo;
+import com.miaxis.customer.vo.ExhibitionCustomerInfoVo;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import org.springframework.stereotype.Service;
@@ -30,7 +27,6 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
 
     private final CustomerInfoMapper customerInfoMapper;
 
-    private final CollectionInfoMapper collectionInfoMapper;
 
     /**
      * 查询客户信息列表
@@ -92,28 +88,11 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
      * @return
      */
     @Override
-    public List<CustomerInfoVo> getCustomerListByProductId(Long productId) {
+    public List<ExhibitionCustomerInfoVo> getCustomerListByProductId(Long productId) {
         return customerInfoMapper.getCustomerListByProductId(productId);
     }
 
-    /**
-     * applet
-     * 收藏商家
-     * @param userInfo 当前用户
-     * @param id 商家id
-     * @return
-     */
-    @Override
-    @SneakyThrows
-    @Transactional(rollbackFor = Exception.class)
-    public Response collectionBusiness(UserInfo userInfo, Long id) {
-        //保存收藏表
-        CollectionInfo collectionInfo = new CollectionInfo();
-        collectionInfo.setUserId(userInfo.getId());
-        collectionInfo.setCustomerId(id);
-        collectionInfoMapper.insert(collectionInfo);
-        return Response.success();
-    }
+
 
     /**
      * applet
@@ -121,7 +100,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
      * @return
      */
     @Override
-    public List<CustomerInfoVo> getCustomerListByCollectionCount() {
+    public List<ExhibitionCustomerInfoVo> getCustomerListByCollectionCount() {
         return customerInfoMapper.getCustomerListByCollectionCount();
     }
 

zzjs-service/src/main/java/com/miaxis/customer/vo/ExhibitionCustomerInfoVo.java

@@ -0,0 +1,53 @@
+package com.miaxis.customer.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 展示客户信息对象返回参
+ *
+ * @author miaxis
+ * @date 2021-03-15
+ */
+@Data
+@ApiModel(value = "ExhibitionCustomerInfoVo", description = "展示客户信息对象返回参")
+public class ExhibitionCustomerInfoVo extends BaseBusinessEntity{
+
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @TableField("corporate_name")
+    @ApiModelProperty(value = "公司名称")
+    private String corporateName;
+
+    @ApiModelProperty(value = "公司LOGO图片访问地址")
+    private String corporateLogoFileUrl;
+
+    @TableField("applet_address")
+    @ApiModelProperty(value = "小程序地址")
+    private String appletAddress;
+
+    @ApiModelProperty(value = "小程序图标访问地址")
+    private String appletLogoFileUrl;
+
+    @ApiModelProperty(value = "小程序二维码访问地址")
+    private String appletQrCodeFileUrl;
+
+    @TableField("applet_introduce")
+    @ApiModelProperty(value = "小程序介绍")
+    private String appletIntroduce;
+
+    @TableField("status")
+    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
+    private Integer status;
+
+    @ApiModelProperty(value = "收藏数量")
+    private Integer collectionCount;
+
+
+}

zzjs-service/src/main/resources/mapper/customer/CustomerInfoMapper.xml

@@ -104,22 +104,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
 
-    <select id="getCustomerListByProductId" resultType="com.miaxis.customer.vo.CustomerInfoVo">
+    <select id="getCustomerListByProductId" resultType="com.miaxis.customer.vo.ExhibitionCustomerInfoVo">
         select
         ci.id,
         ci.corporate_name,
-        ci.corporate_logo,
         f1.file_url as corporateLogoFileUrl,
-        ci.city_code,
-        ci.industry_type,
-        ci.customer_star,
         ci.applet_address,
-        ci.applet_logo,
         f2.file_url as appletLogoFileUrl,
-        ci.applet_qr_code,
         f3.file_url as appletQrCodeFileUrl,
         ci.applet_introduce,
-        ci.shelf_status,
         ci.create_time,
         ci.update_time,
         ci.status
@@ -132,23 +125,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="getCustomerListByCollectionCount" resultType="com.miaxis.customer.vo.CustomerInfoVo">
+    <select id="getCustomerListByCollectionCount" resultType="com.miaxis.customer.vo.ExhibitionCustomerInfoVo">
         SELECT
         ci.id,
         (select COUNT(1) from collection_info coi where coi.customer_id = ci.id) as collectionCount,
         ci.corporate_name,
-        ci.corporate_logo,
         f1.file_url as corporateLogoFileUrl,
-        ci.city_code,
-        ci.industry_type,
-        ci.customer_star,
         ci.applet_address,
-        ci.applet_logo,
         f2.file_url as appletLogoFileUrl,
-        ci.applet_qr_code,
         f3.file_url as appletQrCodeFileUrl,
         ci.applet_introduce,
-        ci.shelf_status,
         ci.create_time,
         ci.update_time,
         ci.status
@@ -159,4 +145,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY collectionCount DESC
     </select>
 
+
+    <select id="getCollectionList" resultType="com.miaxis.collection.vo.CollectionCustomerVo">
+        SELECT
+        coi.id,
+        ci.id as customerId,
+        ci.corporate_name,
+        ci.applet_address,
+        f1.file_url as corporateLogoFileUrl,
+        f2.file_url as appletLogoFileUrl,
+        f3.file_url as appletQrCodeFileUrl,
+        ci.applet_introduce,
+        coi.create_time,
+        ci.status
+        FROM `customer_info` ci
+        LEFT JOIN file_info f1 on f1.file_id = ci.corporate_logo
+        LEFT JOIN file_info f2 on f2.file_id = ci.applet_logo
+        LEFT JOIN file_info f3 on f3.file_id = ci.applet_qr_code
+        LEFT JOIN collection_info coi ON coi.customer_id = ci.id
+        WHERE ci.id IN ( select coi.customer_id from collection_info coi where coi.user_id = #{id})
+
+    </select>
+
+
 </mapper>