收藏

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,12 +1,8 @@
 package com.miaxis.app.controller.customer;
 
 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 com.miaxis.customer.domain.CustomerInfo;
 import com.miaxis.customer.service.ICustomerInfoService;
 import com.miaxis.customer.vo.ExhibitionCustomerInfoVo;
@@ -14,7 +10,6 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -31,7 +26,6 @@ public class AppletCustomerInfoController extends BaseController {
 
     private final ICustomerInfoService customerInfoService;
 
-    private final ICollectionInfoService collectionInfoService;
 
     /**
      * 查询客户信息列表
@@ -83,49 +77,4 @@ public class AppletCustomerInfoController extends BaseController {
     }
 
 
-    /**
-     * 查询用户收藏列表
-     */
-    @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 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

@@ -3,6 +3,7 @@ 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;
@@ -22,4 +23,13 @@ public interface ICollectionInfoService extends IService<CollectionInfo> {
      */
     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

@@ -5,12 +5,13 @@ 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 com.miaxis.customer.service.ICustomerInfoService;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -25,8 +26,6 @@ public class CollectionInfoServiceImpl extends ServiceImpl<CollectionInfoMapper,
 
     private final CollectionInfoMapper collectionInfoMapper;
 
-    private final ICustomerInfoService customerInfoService;
-
     private final CustomerInfoMapper customerInfoMapper;
 
 
@@ -41,5 +40,24 @@ public class CollectionInfoServiceImpl extends ServiceImpl<CollectionInfoMapper,
         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

@@ -24,6 +24,9 @@ public class CollectionCustomerVo {
     @ApiModelProperty(value = "主键")
     private Long id;
 
+    @ApiModelProperty(value = "商家id")
+    private Long customerId;
+
     @TableField("corporate_name")
     @ApiModelProperty(value = "公司名称")
     private String corporateName;

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

@@ -1,14 +1,13 @@
 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接口
  *
@@ -55,14 +54,6 @@ public interface ICustomerInfoService extends IService<CustomerInfo>{
      */
     List<ExhibitionCustomerInfoVo> getCustomerListByProductId(Long productId);
 
-    /**
-     * applet
-     * 收藏商家
-     * @param userInfo 当前用户
-     * @param id 商家id
-     * @return
-     */
-    Response collectionBusiness(UserInfo userInfo, Long id);
 
     /**
      * 查询精选商家列表 根据收藏数排行

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

@@ -2,10 +2,7 @@ package com.miaxis.customer.service.impl;
 
 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;
@@ -30,7 +27,6 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
 
     private final CustomerInfoMapper customerInfoMapper;
 
-    private final CollectionInfoMapper collectionInfoMapper;
 
     /**
      * 查询客户信息列表
@@ -96,24 +92,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
         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

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

@@ -148,7 +148,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getCollectionList" resultType="com.miaxis.collection.vo.CollectionCustomerVo">
         SELECT
-        ci.id,
+        coi.id,
+        ci.id as customerId,
         ci.corporate_name,
         ci.applet_address,
         f1.file_url as corporateLogoFileUrl,