From 83d8bc4fabaf28a5f601e9d5db0b09fd93f11ebd Mon Sep 17 00:00:00 2001
From: xiaofeng <xinjianfeng@126.com>
Date: Tue, 9 Jul 2019 23:54:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=85=A5=E5=95=86=E5=93=81=E6=94=B6=E8=97=8F=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=202.=E6=9A=82=E6=97=B6=E4=BD=BF=E7=94=A8aler?=
 =?UTF-8?q?t=E5=BC=B9=E5=87=BA=E6=A1=86=E6=8F=90=E7=A4=BA=E6=94=B6?=
 =?UTF-8?q?=E8=97=8F=E5=92=8C=E5=8F=96=E6=B6=88=E6=94=B6=E8=97=8F,?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=B4=E6=94=B9=E6=88=90=E9=A2=9C=E8=89=B2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile-web/src/api/product.js                 |  7 ++++
 mobile-web/src/api/user.js                    |  9 +++++
 mobile-web/src/page/product/detail.vue        | 35 +++++++++++++++++--
 .../users/UserFavoriteController.java         | 10 +++++-
 .../api/UserProductSpuCollectionsService.java | 10 ++++++
 .../UserProductSpuCollectionsServiceImpl.java | 19 ++++++++--
 6 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/mobile-web/src/api/product.js b/mobile-web/src/api/product.js
index d6f4946ef..4d628fdae 100644
--- a/mobile-web/src/api/product.js
+++ b/mobile-web/src/api/product.js
@@ -31,3 +31,10 @@ export function getProductSpuInfo(id) {
     }
   });
 }
+
+export function collectionSpu(spuId,hasCollectionType) {
+  return request({
+    url: '/product-api/users/spu/collection/'+spuId+'/' + hasCollectionType,
+    method: 'post'
+  });
+}
diff --git a/mobile-web/src/api/user.js b/mobile-web/src/api/user.js
index bc4432cc2..ae6d70b8c 100644
--- a/mobile-web/src/api/user.js
+++ b/mobile-web/src/api/user.js
@@ -16,6 +16,15 @@ export function DelFavorite(id){
   })
 }
 
+export function hasUserSpuFavorite(spuId){
+  return request({
+    url: '/user-api/users/favorite/hasUserFavorite',
+    method: 'get',
+    params: {spuId}
+  })
+}
+
+
 export function GetCoupon(data){
   return request({
     url: '/User/GetCoupon',
diff --git a/mobile-web/src/page/product/detail.vue b/mobile-web/src/page/product/detail.vue
index bba9e64e7..f2184ee14 100644
--- a/mobile-web/src/page/product/detail.vue
+++ b/mobile-web/src/page/product/detail.vue
@@ -98,7 +98,7 @@
     </div>
     <van-goods-action>
 
-      <van-goods-action-mini-btn icon="like-o" @click="sorry">
+      <van-goods-action-mini-btn icon="like-o" @click="onFavoriteClicked">
         收藏
       </van-goods-action-mini-btn>
       <van-goods-action-mini-btn icon="cart" :info="cartCount > 0 ? cartCount : undefined" @click="onClickCart">
@@ -171,8 +171,9 @@
 
 <script>
   // import skuData from '../../data/sku';
-  import {getProductSpuInfo} from '../../api/product';
+  import {getProductSpuInfo,collectionSpu} from '../../api/product';
   import {addCart, countCart, getCartCalcSkuPrice} from '../../api/order';
+  import {hasUserSpuFavorite} from  '../../api/user';
   import {Dialog} from 'vant';
   import {checkLogin} from "../../utils/cache";
 
@@ -290,6 +291,7 @@
           }
         });
       },
+
       onClickCart() {
         this.$router.push('/cart');
       },
@@ -305,6 +307,35 @@
       onClickShowTag() {
         this.showTag = true;
       },
+      onFavoriteClicked(){
+        if (!checkLogin()) {
+          Dialog.alert({
+            title: '系统提示',
+            message: '未登陆用户，暂时不支持使用购物车',
+          });
+          return;
+        }
+        let id = this.$route.params.id; // 商品编号
+          let hasCollectionType = 1; // 收藏类型  默认收藏
+          hasUserSpuFavorite(id).then(data => {
+              let hasCollection = data;
+              // alert("是否收藏==" + hasCollection);
+              if (hasCollection){
+                  hasCollectionType = 2;
+              }
+
+              // alert("hasCollectionType==" + hasCollectionType);
+              collectionSpu(id,hasCollectionType).then(data =>{
+                  let v = data;
+                  if (hasCollectionType == 1 && v){
+                      alert("商品已收藏");
+                  }else if (hasCollectionType == 2 && v){
+                      alert("商品已取消");
+                  }
+              })
+          });
+
+      },
       onBuyClicked(data) {
         const { selectedNum } = data;
         this.$router.push({
diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserFavoriteController.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserFavoriteController.java
index 4869b166f..6fdca2a20 100644
--- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserFavoriteController.java
+++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserFavoriteController.java
@@ -39,8 +39,16 @@ public class UserFavoriteController {
     @DeleteMapping("remove")
     @RequiresLogin
     @ApiOperation(value = "用户商品收藏-删除")
-    public CommonResult<Boolean> removeFavorite(@RequestParam("spuId") final Integer spuId) {
+    public CommonResult<Boolean> removeUserFavorite(@RequestParam("spuId") final Integer spuId) {
         final Integer userId = UserSecurityContextHolder.getContext().getUserId();
         return userProductSpuCollectionsService.deleteUserProductSpuCollections(userId, spuId);
     }
+
+    @GetMapping("hasUserFavorite")
+    @RequiresLogin
+    @ApiOperation(value = "用户商品收藏-是否收藏")
+    public CommonResult<Boolean> hasUserSpuFavorite(@RequestParam("spuId") final Integer spuId) {
+        final Integer userId = UserSecurityContextHolder.getContext().getUserId();
+        return userProductSpuCollectionsService.hasUserSpuFavorite(spuId, userId);
+    }
 }
diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserProductSpuCollectionsService.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserProductSpuCollectionsService.java
index ff500c084..762288896 100644
--- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserProductSpuCollectionsService.java
+++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserProductSpuCollectionsService.java
@@ -51,4 +51,14 @@ public interface UserProductSpuCollectionsService {
      * @return
      */
     CommonResult<Boolean> deleteUserProductSpuCollections(Integer userId, Integer spuId);
+
+
+    /**
+     * 检验用户商品是否收藏
+     * @param spuId
+     * @param userId
+     * @return
+     */
+    CommonResult<Boolean> hasUserSpuFavorite(Integer spuId, Integer userId);
+
 }
diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserProductSpuCollectionsServiceImpl.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserProductSpuCollectionsServiceImpl.java
index b2dd16519..2c4a6a20b 100644
--- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserProductSpuCollectionsServiceImpl.java
+++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserProductSpuCollectionsServiceImpl.java
@@ -96,11 +96,26 @@ public class UserProductSpuCollectionsServiceImpl implements UserProductSpuColle
         if (userProductSpuCollectionsBO != null) {
             // 未取消收藏的数据
             if (userProductSpuCollectionsBO.getDeleted().equals(DeletedStatusEnum.DELETED_NO.getValue())) {
-                UserProductSpuCollectionsUpdateDTO userProductSpuCollectionsUpdateDTO = new UserProductSpuCollectionsUpdateDTO().setId(userProductSpuCollectionsBO.getId())
-                        .setUpdateTime(new Date()).setDeleted(DeletedStatusEnum.DELETED_YES.getValue());
+                UserProductSpuCollectionsUpdateDTO userProductSpuCollectionsUpdateDTO = new UserProductSpuCollectionsUpdateDTO()
+                        .setId(userProductSpuCollectionsBO.getId()).setUpdateTime(new Date())
+                        .setDeleted(DeletedStatusEnum.DELETED_YES.getValue());
                 result = this.updateUserProductSpuCollections(userProductSpuCollectionsUpdateDTO);
             }
         }
         return CommonResult.success(result > 0 ? Boolean.TRUE : Boolean.FALSE);
     }
+
+    @Override
+    public CommonResult<Boolean> hasUserSpuFavorite(final Integer spuId, final Integer userId) {
+        UserProductSpuCollectionsBO userProductSpuCollectionsBO = this
+                .getUserSpuCollectionsByUserIdAndSpuId(userId, spuId);
+
+        if (userProductSpuCollectionsBO != null) {
+            // 收藏
+            final boolean hasCollect = userProductSpuCollectionsBO.getDeleted()
+                    .equals(DeletedStatusEnum.DELETED_NO.getValue());
+            return CommonResult.success(hasCollect);
+        }
+        return CommonResult.success(Boolean.FALSE);
+    }
 }

From 11f601a0d48e04f8026746b7e9689746c6859498 Mon Sep 17 00:00:00 2001
From: xiaofeng <xinjianfeng@126.com>
Date: Wed, 10 Jul 2019 22:44:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile-web/src/api/user.js                    | 16 ++++++-------
 mobile-web/src/page/user/favorite/list.vue    | 24 +++++++++++--------
 .../UserProductSpuCollectionsMapper.xml       |  1 -
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/mobile-web/src/api/user.js b/mobile-web/src/api/user.js
index ae6d70b8c..52dfacbbc 100644
--- a/mobile-web/src/api/user.js
+++ b/mobile-web/src/api/user.js
@@ -1,18 +1,18 @@
 import request from "../config/request";
 
-export function GetFavorite(data){
+export function GetFavoritePage(pageNo,pageSize){
   return request({
-    url: '/User/GetFavorite',
-    method: 'post',
-    params: { data }
+    url: '/user-api/users/favorite/page',
+    method: 'get',
+    params: { pageNo,pageSize }
   })
 }
 
-export function DelFavorite(id){
+export function DelFavorite(spuId){
   return request({
-    url: '/User/DelFavorite',
-    method: 'get',
-    params: { id:id }
+    url: '/user-api/users/favorite/remove',
+    method: 'DELETE',
+    params: { spuId }
   })
 }
 
diff --git a/mobile-web/src/page/user/favorite/list.vue b/mobile-web/src/page/user/favorite/list.vue
index 44966336a..efa611cb9 100644
--- a/mobile-web/src/page/user/favorite/list.vue
+++ b/mobile-web/src/page/user/favorite/list.vue
@@ -9,6 +9,7 @@
         <div v-for="(item,index) in list" :key="index">
             <van-swipe-cell :right-width="65" :on-close="onClose(item)">
                 <product-card :product='item' />
+                    <span>{{item.spuName}}</span>
                     <span slot="right" >删除</span>
                 </van-swipe-cell>
         </div>
@@ -17,7 +18,7 @@
 </template>
 
 <script>
-import { GetFavorite ,DelFavorite} from "../../../api/user.js";
+import { GetFavoritePage ,DelFavorite} from "../../../api/user.js";
 
 export default {
     data(){
@@ -26,6 +27,7 @@ export default {
             finished:false,
             list:[],
             page:0,
+            pageSize:10
         }
     },
     methods:{
@@ -41,9 +43,9 @@ export default {
                         this.$dialog.confirm({
                             message: '确定删除吗？'
                         }).then(() => {
-                            DelFavorite(item.id).then(response=>{
+                            DelFavorite(item.spuId).then(response=>{
                                 this.$toast('删除成功');
-                                this.$router.go(0);  
+                                this.$router.go(0);
                             })
                             instance.close();
                         }).catch(() => {
@@ -54,16 +56,18 @@ export default {
             }
         },
         onLoad() {
-            this.page++;
-            GetFavorite().then(response=>{
-                response.list.forEach(item => {
-                    this.list.push(item);
-                });
+            let pageNo = this.page + 1;
+            GetFavoritePage(pageNo,this.pageSize).then(response=>{
+                this.page = pageNo;
+                this.list.push(...response.list);
+                // response.list.forEach(item => {
+                //     this.list.push(item);
+                // });
                 this.loading = false;
-                if(response.TotalPage<=this.page){
+                if(this.list.length >= response.total){
                     this.finished = true;
                 }
-            
+
             })
         }
     },
diff --git a/user/user-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml b/user/user-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml
index fb0287887..d4d3b3daa 100644
--- a/user/user-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml
+++ b/user/user-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml
@@ -24,7 +24,6 @@
         <where>
             user_id = #{userId} AND deleted = 0
         </where>
-        ORDER BY sort ASC
         <if test="offset != null and limit != null">
             LIMIT #{offset}, #{limit}
         </if>