From 2dc243a18f38cad72812b35f9f6dd6d4fd774533 Mon Sep 17 00:00:00 2001
From: xiaofeng <xinjianfeng@126.com>
Date: Tue, 16 Jul 2019 01:08:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E5=92=8C=E4=BB=B7=E6=A0=BC=E5=86=97=E4=BD=99=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile-web/src/page/product/detail.vue        | 19 +++++++++++------
 mobile-web/src/page/user/favorite/list.vue    | 21 ++++++++++++++-----
 .../message/ProductSpuCollectionMessage.java  | 10 +++++++++
 .../ProductSpuCollectionServiceImpl.java      | 12 +++++++++--
 .../api/bo/UserProductSpuCollectionsBO.java   | 10 +++++++++
 .../dto/UserProductSpuCollectionsAddDTO.java  | 10 +++++++++
 .../UserProductSpuCollectionsDO.java          | 10 +++++++++
 .../UserProductSpuCollectionsServiceImpl.java | 11 ++++++++++
 .../UserProductSpuCollectionsMapper.xml       |  2 +-
 9 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/mobile-web/src/page/product/detail.vue b/mobile-web/src/page/product/detail.vue
index f2184ee14..55e073ed0 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="onFavoriteClicked">
+      <van-goods-action-mini-btn icon="like-o"  :class="{active:hasCollectionType === 1 }" @click="onFavoriteClicked">
         收藏
       </van-goods-action-mini-btn>
       <van-goods-action-mini-btn icon="cart" :info="cartCount > 0 ? cartCount : undefined" @click="onClickCart">
@@ -208,6 +208,7 @@
         calSkuPriceResult: {
 
         },
+          hasCollectionType:0
 
       };
     },
@@ -327,11 +328,14 @@
               // alert("hasCollectionType==" + hasCollectionType);
               collectionSpu(id,hasCollectionType).then(data =>{
                   let v = data;
-                  if (hasCollectionType == 1 && v){
-                      alert("商品已收藏");
-                  }else if (hasCollectionType == 2 && v){
-                      alert("商品已取消");
-                  }
+                  this.hasCollectionType = hasCollectionType;
+                  // if (hasCollectionType == 1 && v){
+                  //     // alert("商品已收藏");
+                  //     this.hasCollectionType = hasCollectionType;
+                  // }else if (hasCollectionType == 2 && v){
+                  //     // alert("商品已取消");
+                  //     this.hasCollectionType = hasCollectionType;
+                  // }
               })
           });
 
@@ -448,6 +452,9 @@
 
 <style lang="less">
   .goods {
+      .active {
+          color: #e50f3d;
+      }
     padding-bottom: 50px;
 
     &-swipe {
diff --git a/mobile-web/src/page/user/favorite/list.vue b/mobile-web/src/page/user/favorite/list.vue
index efa611cb9..09a054f42 100644
--- a/mobile-web/src/page/user/favorite/list.vue
+++ b/mobile-web/src/page/user/favorite/list.vue
@@ -7,19 +7,27 @@
         @load="onLoad"
         >
         <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>
+<!--            <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>-->
+            <van-card
+                    :price="formatPrice(item.price)"
+                    :desc="item.sellPoint"
+                    :title="item.spuName"
+                    :thumb="item.spuImage"
+            />
         </div>
     </van-list>
 </div>
 </template>
 
 <script>
+    // import { Card } from 'vant';
 import { GetFavoritePage ,DelFavorite} from "../../../api/user.js";
 
+// Vue.use(Card);
 export default {
     data(){
         return{
@@ -31,6 +39,9 @@ export default {
         }
     },
     methods:{
+        formatPrice(data) {
+            return (data / 100).toFixed(2);
+        },
         onClose(item){
             return function(clickPosition, instance) {
                 switch (clickPosition) {
diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/message/ProductSpuCollectionMessage.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/message/ProductSpuCollectionMessage.java
index 685a2cc45..b957218e0 100644
--- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/message/ProductSpuCollectionMessage.java
+++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/message/ProductSpuCollectionMessage.java
@@ -37,6 +37,16 @@ public class ProductSpuCollectionMessage {
      */
     private String spuImage;
 
+    /**
+     * 卖点
+     */
+    private String sellPoint;
+
+    /**
+     * 价格，单位：分
+     */
+    private Integer price;
+
     /**
      * 1 收藏 2 取消
      */
diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuCollectionServiceImpl.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuCollectionServiceImpl.java
index dae127325..874cc4412 100644
--- a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuCollectionServiceImpl.java
+++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuCollectionServiceImpl.java
@@ -6,11 +6,14 @@ import cn.iocoder.mall.product.api.constant.ProductErrorCodeEnum;
 import cn.iocoder.mall.product.api.message.ProductSpuCollectionMessage;
 import cn.iocoder.mall.product.dao.ProductSpuMapper;
 import cn.iocoder.mall.product.dataobject.ProductSpuDO;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * ProductSpuCollectionServiceImpl
@@ -47,9 +50,14 @@ public class ProductSpuCollectionServiceImpl implements ProductSpuCollectionServ
      */
     private void sendProductSpuCollectionMessage(final ProductSpuDO productSpuDO, final Integer hasCollectionType,
             final Integer userId) {
+        List<String> result = Lists.newArrayList(Splitter.on(",").omitEmptyStrings().trimResults().split(productSpuDO.getPicUrls()));
         ProductSpuCollectionMessage productSpuCollectionMessage = new ProductSpuCollectionMessage()
-                .setSpuId(productSpuDO.getId()).setSpuName(productSpuDO.getName())
-                .setSpuImage(productSpuDO.getPicUrls()).setHasCollectionType(hasCollectionType)
+                .setSpuId(productSpuDO.getId())
+                .setSpuName(productSpuDO.getName())
+                .setSpuImage(result.size() > 0 ? result.get(0) : "")
+                .setSellPoint(productSpuDO.getSellPoint())
+                .setPrice(productSpuDO.getPrice())
+                .setHasCollectionType(hasCollectionType)
                 .setUserId(userId);
         rocketMQTemplate.convertAndSend(ProductSpuCollectionMessage.TOPIC, productSpuCollectionMessage);
     }
diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserProductSpuCollectionsBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserProductSpuCollectionsBO.java
index 694cd73a0..d427a7fc6 100644
--- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserProductSpuCollectionsBO.java
+++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserProductSpuCollectionsBO.java
@@ -45,6 +45,16 @@ public class UserProductSpuCollectionsBO implements Serializable {
      */
     private String spuImage;
 
+    /**
+     * 卖点
+     */
+    private String sellPoint;
+
+    /**
+     * 价格，单位：分
+     */
+    private Integer price;
+
     /**
      * 创建时间
      */
diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserProductSpuCollectionsAddDTO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserProductSpuCollectionsAddDTO.java
index e949c3d1b..d2e86ae4f 100644
--- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserProductSpuCollectionsAddDTO.java
+++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserProductSpuCollectionsAddDTO.java
@@ -46,6 +46,16 @@ public class UserProductSpuCollectionsAddDTO implements Serializable {
      */
     private String spuImage;
 
+    /**
+     * 卖点
+     */
+    private String sellPoint;
+
+    /**
+     * 价格，单位：分
+     */
+    private Integer price;
+
     /**
      * 创建时间
      */
diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserProductSpuCollectionsDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserProductSpuCollectionsDO.java
index bda45a973..9d532b9d5 100644
--- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserProductSpuCollectionsDO.java
+++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserProductSpuCollectionsDO.java
@@ -50,6 +50,16 @@ public class UserProductSpuCollectionsDO implements Serializable {
      */
     private String spuImage;
 
+    /**
+     * 卖点
+     */
+    private String sellPoint;
+
+    /**
+     * 价格，单位：分
+     */
+    private Integer price;
+
     /**
      * 创建时间
      */
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 2c4a6a20b..55e1858a6 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
@@ -11,6 +11,8 @@ import cn.iocoder.mall.user.api.dto.UserProductSpuCollectionsUpdateDTO;
 import cn.iocoder.mall.user.biz.convert.UserProductSpuCollectionsConvert;
 import cn.iocoder.mall.user.biz.dao.UserProductSpuCollectionsMapper;
 import cn.iocoder.mall.user.biz.dataobject.UserProductSpuCollectionsDO;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -33,6 +35,10 @@ public class UserProductSpuCollectionsServiceImpl implements UserProductSpuColle
     @Autowired
     private UserProductSpuCollectionsMapper userProductSpuCollectionsMapper;
 
+    // TODO 暂时先使用冗余字段，有需要在对接实时数据查询
+//    @Reference(validation = "true", version = "${dubbo.consumer.PromotionActivityService.version}")
+//    private ProductSpuService productSpuService;
+
 
     @Override
     public int addUserSkuCollections(UserProductSpuCollectionsAddDTO userProductSpuCollectionsAddDTO) {
@@ -72,6 +78,11 @@ public class UserProductSpuCollectionsServiceImpl implements UserProductSpuColle
             return CommonResult.success(
                     new UserProductSpuCollectionsPageBO().setList(Collections.emptyList()).setTotal(totalCount));
         }
+        for (UserProductSpuCollectionsDO userProductSpuCollectionsDO : list
+             ) {
+            List<String> result = Lists.newArrayList(Splitter.on(",").omitEmptyStrings().trimResults().split(userProductSpuCollectionsDO.getSpuImage()));
+            userProductSpuCollectionsDO.setSpuImage(result.size() > 0 ? result.get(0) : "");
+        }
 
         UserProductSpuCollectionsPageBO userProductSpuCollectionsPageBO = new UserProductSpuCollectionsPageBO();
         userProductSpuCollectionsPageBO.setList(UserProductSpuCollectionsConvert.INSTANCE.convert(list));
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 d4d3b3daa..ec77f1fe0 100644
--- a/user/user-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml
+++ b/user/user-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml
@@ -4,7 +4,7 @@
 
     <sql id="FIELDS">
         id, user_id, nickname, spu_id, spu_name,
-        spu_image, create_time, update_time,
+        spu_image,sell_point,price, create_time, update_time,
         deleted
     </sql>