:fried_shrimp: 收藏页,买过的商品,卖出的商品

goods-service/src/main/java/io/github/nnkwrik/goodsservice/controller/UserController.java

@@ -37,9 +37,23 @@ public class UserController {
 
 
     @GetMapping("/collect/list")
-    public Response getCollectList(@JWT(required = true)JWTUser user){
+    public Response getCollectList(@JWT(required = true) JWTUser user) {
         List<GoodsSimpleVo> vo = userService.getUserCollectList(user.getOpenId());
         log.info("用户【{}】查询收藏的商品,总数:{}", user.getNickName(), vo.size());
         return Response.ok(vo);
     }
+
+    @GetMapping("/bought/goods")
+    public Response getUserBought(@JWT(required = true) JWTUser user) {
+        List<GoodsSimpleVo> vo = userService.getUserBought(user.getOpenId());
+        log.info("用户【{}】查询买过的商品,总数:{}", user.getNickName(), vo.size());
+        return Response.ok(vo);
+    }
+
+    @GetMapping("/sold/goods")
+    public Response getUserSold(@JWT(required = true) JWTUser user) {
+        List<GoodsSimpleVo> vo = userService.getUserSold(user.getOpenId());
+        log.info("用户【{}】查询卖出的商品,总数:{}", user.getNickName(), vo.size());
+        return Response.ok(vo);
+    }
 }

goods-service/src/main/java/io/github/nnkwrik/goodsservice/dao/GoodsMapper.java

@@ -32,7 +32,7 @@ public interface GoodsMapper {
      */
     @Select("select id, `name`, primary_pic_url, price\n" +
             "from goods\n" +
-            "where is_on_sale = 1 and is_delete = 0\n" +
+            "where is_selling = 1 and is_delete = 0\n" +
             "order by " + popular_score + " desc")
     List<Goods> findSimpleGoods();
 
@@ -44,7 +44,7 @@ public interface GoodsMapper {
     @Select("select id, `name`, primary_pic_url, price\n" +
             "from goods\n" +
             "where category_id = #{cateId}\n" +
-            "and is_on_sale = 1 and is_delete = 0\n" +
+            "and is_selling = 1 and is_delete = 0\n" +
             "order by " + popular_score + " desc")
     List<Goods> findSimpleGoodsByCateId(@Param("cateId") int cateId);
 
@@ -63,7 +63,7 @@ public interface GoodsMapper {
             "       `desc`,\n" +
             "       want_count,\n" +
             "       browse_count,\n" +
-            "       is_on_sale,\n" +
+            "       is_selling,\n" +
             "       last_edit,\n" +
             "       postage,\n" +
             "       region,\n" +
@@ -96,7 +96,7 @@ public interface GoodsMapper {
             "from goods\n" +
             "where category_id = (select category_id from goods where id = #{goodsId})\n" +
             "  and id != #{goodsId}\n" +
-            "  and is_on_sale = 1\n" +
+            "  and is_selling = 1\n" +
             "  and is_delete = 0\n" +
             "order by " + popular_score + " desc")
     List<Goods> findSimpleGoodsInSameCate(@Param("goodsId") int goodsId);
@@ -116,7 +116,7 @@ public interface GoodsMapper {
             "                             inner join category as bar on foo.parent_id = bar.parent_id\n" +
             "                      where goods.id = #{goodsId})\n" +
             "  and id != #{goodsId}\n" +
-            "  and is_on_sale = 1\n" +
+            "  and is_selling = 1\n" +
             "  and is_delete = 0\n" +
             "order by " + popular_score + " desc")
     List<Goods> findSimpleGoodsInSameParentCate(@Param("goodsId") int goodsId);
@@ -165,7 +165,7 @@ public interface GoodsMapper {
     @Select("select COUNT(*)\n" +
             "from goods\n" +
             "where seller_id = #{seller_id}\n" +
-            "  and is_on_sale = false\n" +
+            "  and is_selling = false\n" +
             "  and is_delete = false;")
     Integer getGellerHistory(@Param("seller_id") String sellerId);
 }

goods-service/src/main/java/io/github/nnkwrik/goodsservice/dao/UserMapper.java

@@ -43,10 +43,24 @@ public interface UserMapper {
     void deleteUserWant(@Param("user_id") String userId, @Param("goods_id") int goodsId);
 
 
-    @Select("select goods.id, name, primary_pic_url, price, is_on_sale\n" +
+    @Select("select goods.id, name, primary_pic_url, price, is_selling\n" +
             "from goods\n" +
             "       inner join user_preference as u \n" +
             "         on goods.id = u.goods_id and u.user_id = #{user_id} and u.type = 1 and is_delete = false\n" +
             "order by u.create_time desc;")
-    List<Goods> getUserCollect(@Param("user_id")String userId);
+    List<Goods> getUserCollect(@Param("user_id") String userId);
+
+    @Select("select id, name, primary_pic_url, price, sold_time\n" +
+            "from goods\n" +
+            "where buyer_id = #{buyer_id}\n" +
+            "  and is_selling = 0\n" +
+            "order by sold_time desc")
+    List<Goods> getUserBought(@Param("buyer_id") String buyerId);
+
+    @Select("select id, name, primary_pic_url, price, sold_time\n" +
+            "from goods\n" +
+            "where seller_id = #{seller_id}\n" +
+            "  and is_selling = 0\n" +
+            "order by sold_time desc;")
+    List<Goods> getUserSold(@Param("seller_id") String sellerId);
 }

goods-service/src/main/java/io/github/nnkwrik/goodsservice/model/po/Goods.java

@@ -20,7 +20,7 @@ public class Goods {
     private String desc;
     private Integer wantCount;
     private Integer browseCount;
-    private Boolean isOnSale;
+    private Boolean isSelling;
     private Boolean isDelete;
     private Date lastEdit;
 
@@ -32,4 +32,7 @@ public class Goods {
     private Boolean ableSelfTake;
     private Boolean ableMeet;
     private Boolean ableExpress;
+
+    private String buyerId;
+    private Date soldTime;
 }

goods-service/src/main/java/io/github/nnkwrik/goodsservice/model/vo/inner/GoodsSimpleVo.java

@@ -12,5 +12,6 @@ public class GoodsSimpleVo {
     private String name;
     private String list_pic_url;
     private Double price;
-    private Boolean is_on_sale;
+    private Boolean is_selling;
+    private String sold_time;
 }

goods-service/src/main/java/io/github/nnkwrik/goodsservice/service/UserService.java

@@ -15,4 +15,8 @@ public interface UserService {
     void collectAddOrDelete(int goodsId, String userId, boolean hasCollect);
 
     List<GoodsSimpleVo> getUserCollectList(String userId);
+
+    List<GoodsSimpleVo> getUserBought(String buyerId);
+
+    List<GoodsSimpleVo> getUserSold(String sellerId);
 }

goods-service/src/main/java/io/github/nnkwrik/goodsservice/service/impl/GoodsServiceImpl.java

@@ -20,7 +20,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.sound.midi.Soundbank;
 import java.util.*;
 import java.util.stream.Collectors;
 

goods-service/src/main/java/io/github/nnkwrik/goodsservice/service/impl/UserServiceImpl.java

@@ -41,5 +41,18 @@ public class UserServiceImpl implements UserService {
         return PO2VO.convertList(PO2VO.goodsSimple,goodsList);
     }
 
+    @Override
+    public List<GoodsSimpleVo> getUserBought(String buyerId) {
+        List<Goods> goodsList = userMapper.getUserBought(buyerId);
+        return PO2VO.convertList(PO2VO.goodsSimple,goodsList);
+    }
+
+    @Override
+    public List<GoodsSimpleVo> getUserSold(String sellerId) {
+        List<Goods> goodsList = userMapper.getUserSold(sellerId);
+        return PO2VO.convertList(PO2VO.goodsSimple,goodsList);
+
+    }
+
 
 }

goods-service/src/main/java/io/github/nnkwrik/goodsservice/util/PO2VO.java

@@ -47,7 +47,11 @@ public class PO2VO {
                 GoodsSimpleVo vo = new GoodsSimpleVo();
                 BeanUtils.copyProperties(po, vo);
                 vo.setList_pic_url(po.getPrimaryPicUrl());
-                vo.setIs_on_sale(po.getIsOnSale());
+                vo.setIs_selling(po.getIsSelling());
+                if (po.getSoldTime() != null) {
+                    SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+                    vo.setSold_time(formatter.format(po.getSoldTime()));
+                }
                 return vo;
             };
 

wx-front/app.json

@@ -33,7 +33,9 @@
     "pages/post/post",
     "pages/region/region",
     "pages/nav2post/nav2post",
-    "pages/postCate/postCate"
+    "pages/postCate/postCate",
+    "pages/ucenter/bought/bought",
+    "pages/ucenter/sold/sold"
   ],
   "window": {
     "backgroundTextStyle": "dark",

wx-front/pages/goods/goods.wxml

@@ -13,7 +13,7 @@
       <text class="name">{{goods.name}}</text>
       <view class='flex'>
         <text class="price">￥{{goods.price}}</text>
-        <view wx:if='{{!goods.is_on_sale}}' class='tag'>已出售</view>
+        <view wx:if='{{!goods.is_selling}}' class='tag'>已出售</view>
       </view>
       <text wx:if="{{goods.market_price}}" class="market-price">原价 : ￥{{goods.market_price}}</text>
 
@@ -277,6 +277,6 @@
     </view>
   </view> -->
   <!-- <view class="c">立即购买</view> -->
-  <view class="r" wx:if='{{!goods.is_on_sale}}' bindtap="addToCart">该商品已出售</view>
+  <view class="r" wx:if='{{!goods.is_selling}}' bindtap="addToCart">该商品已出售</view>
   <view class="r" wx:else bindtap="addToCart">想要</view>
 </view>

wx-front/pages/goods/goods.wxss

@@ -101,7 +101,7 @@
   font-size: 29rpx;
   line-height: 35rpx;
   color: #555;
-  margin-top: 30rpx;
+  /* margin-top: 30rpx; */
   margin-bottom: 30rpx;
   text-decoration: line-through;
   text-align: center;

wx-front/pages/ucenter/bought/bought.js

@@ -0,0 +1,45 @@
+var util = require('../../../utils/util.js');
+var api = require('../../../config/api.js');
+
+var app = getApp();
+
+Page({
+  data: {
+    boughtList: []
+  },
+  getCollectList() {
+    let that = this;
+    util.request(api.BoughtList).then(function (res) {
+      if (res.errno === 0) {
+        console.log(res.data);
+        that.setData({
+          boughtList: res.data
+        });
+      }
+    });
+  },
+  onLoad: function (options) {
+    this.getCollectList();
+  },
+  onReady: function () {
+
+  },
+  onShow: function () {
+
+  },
+  onHide: function () {
+    // 页面隐藏
+
+  },
+  onUnload: function () {
+    // 页面关闭
+  },
+  openGoods(event) {
+    let goodsId = this.data.boughtList[event.currentTarget.dataset.index].id;
+
+      wx.navigateTo({
+        url: '/pages/goods/goods?id=' + goodsId,
+      });
+  },
+
+})

wx-front/pages/ucenter/bought/bought.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "我买到的"
+}

wx-front/pages/ucenter/bought/bought.wxml

@@ -0,0 +1,20 @@
+<view class="container">
+  <view class="collect-list" wx:if='{{boughtList.length}}'>
+    <view class="item" bindtap="openGoods" wx:for="{{boughtList}}" wx:key="{{item.id}}" data-index="{{index}}">
+      <image class="img" src="{{item.list_pic_url}}"></image>
+      <view class="info">
+        <view class="name">{{item.name}}</view>
+        <view class="subtitle">{{item.goods_brief}}</view>
+        <view class="flex">
+          <view class="price">￥{{item.price}}</view>
+          <view class='time'>购买于 :{{item.sold_time}}</view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  <view class="result-empty" wx:else>
+    <image class="icon" src="http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/noSearchResult-7572a94f32.png"></image>
+    <text class="text">您还没有买过宝贝</text>
+  </view>
+</view>

wx-front/pages/ucenter/bought/bought.wxss

@@ -0,0 +1,104 @@
+page {
+  background: #f4f4f4;
+  min-height: 100%;
+}
+
+.container {
+  background: #f4f4f4;
+  min-height: 100%;
+}
+
+.collect-list {
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+  background: #fff;
+  padding-left: 30rpx;
+  border-top: 1px solid #e1e1e1;
+}
+
+.item {
+  height: 212rpx;
+  width: 720rpx;
+  background: #fff;
+  padding: 30rpx 30rpx 30rpx 0;
+  border-bottom: 1px solid #e1e1e1;
+}
+
+.item:last-child {
+  border-bottom: 1px solid #fff;
+}
+
+.item .img {
+  float: left;
+  width: 150rpx;
+  height: 150rpx;
+}
+
+.item .info {
+  float: right;
+  width: 540rpx;
+  height: 150rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding-left: 20rpx;
+}
+
+.item .info .name {
+  font-size: 28rpx;
+  color: #333;
+  line-height: 40rpx;
+}
+
+.item .info .subtitle {
+  margin-top: 8rpx;
+  font-size: 24rpx;
+  color: #888;
+  line-height: 40rpx;
+}
+
+.item .info .price {
+  margin-top: 8rpx;
+  font-size: 28rpx;
+  color: #f94b4b;
+  line-height: 40rpx;
+  width: 160rpx;
+}
+
+.item .info .flex {
+  display: flex;
+}
+
+.item .info .time {
+  display: flex;
+  align-items: center;
+  padding: 0 10rpx;
+  width: auto;
+  color: #999;
+  overflow: hidden;
+  font-size: 26rpx;
+  line-height: 55rpx;
+}
+
+.result-empty {
+  width: 100%;
+  height: 100%;
+  padding-top: 300rpx;
+}
+
+.result-empty .icon {
+  margin: 0 auto;
+  display: block;
+  width: 240rpx;
+  height: 240rpx;
+}
+
+.result-empty .text {
+  display: block;
+  width: 100%;
+  height: 40rpx;
+  font-size: 28rpx;
+  text-align: center;
+  color: #999;
+}

wx-front/pages/ucenter/collect/collect.json

@@ -1,3 +1,3 @@
 {
-  
+  "navigationBarTitleText": "我收藏的"
 }

wx-front/pages/ucenter/collect/collect.wxml

@@ -7,7 +7,7 @@
         <view class="subtitle">{{item.goods_brief}}</view>
         <view class="flex">
           <view class="price">￥{{item.price}}</view>
-          <view class='tag' wx:if='{{!item.is_on_sale}}'>已出售</view>
+          <view class='tag' wx:if='{{!item.is_selling}}'>已出售</view>
         </view>
       </view>
     </view>

wx-front/pages/ucenter/footprint/footprint.wxml

@@ -1,4 +1,4 @@
-<view class="container">
+<!-- <view class="container">
   <view class="footprint">
     <view class="day-item" wx:for="{{footprintList}}" wx:key="{{index}}">
       <view class="day-hd">{{item[0].add_time}}</view>
@@ -14,4 +14,22 @@
       </view>
     </view>
   </view>
+</view> -->
+
+<view class="container">
+  <view class="footprint">
+    <view class="day-item" >
+      <view class="day-hd">2013-4-5</view>
+      <view class="day-list">
+        <view class="item" data-footprint="111" bindtouchstart="touchStart" bindtouchend="touchEnd" bindtap="deleteItem" >
+          <image class="img" src="{{iitem.list_pic_url}}"></image>
+          <view class="info">
+            <view class="name">name</view>
+            <view class="subtitle">.goods_brief</view>
+            <view class="price">￥iitem.retail_price</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
 </view>

wx-front/pages/ucenter/index/index.wxml

@@ -24,22 +24,22 @@
       </navigator>
     </view>
     <view class="item no-border">
-      <navigator url="url" class="a">
+      <navigator url="{{isLogin?'/pages/ucenter/sold/sold':'/pages/auth/auth'}}" class="a">
         <text class="icon upload"></text>
-        <text class="txt">礼品卡</text>
+        <text class="txt">我卖出的</text>
       </navigator>
     </view>
     <view class="item">
-      <navigator url="{{isLogin?'/pages/ucenter/collect/collect':'/pages/auth/auth'}}" class="a">
+      <navigator url="{{isLogin?'/pages/ucenter/bought/bought':'/pages/auth/auth'}}" class="a">
 
         <text class="icon download"></text>
-        <text class="txt">我的收藏</text>
+        <text class="txt">我买到的</text>
       </navigator>
     </view>
     <view class="item">
-      <navigator url="/pages/ucenter/footprint/footprint" class="a">
+      <navigator url="{{isLogin?'/pages/ucenter/collect/collect':'/pages/auth/auth'}}" class="a">
         <text class="icon star"></text>
-        <text class="txt">我的足迹</text>
+        <text class="txt">我的收藏</text>
       </navigator>
     </view>
     <view class="item no-border">

wx-front/pages/ucenter/sold/sold.js

@@ -0,0 +1,45 @@
+var util = require('../../../utils/util.js');
+var api = require('../../../config/api.js');
+
+var app = getApp();
+
+Page({
+  data: {
+    soldList: []
+  },
+  getCollectList() {
+    let that = this;
+    util.request(api.SoldList).then(function (res) {
+      if (res.errno === 0) {
+        console.log(res.data);
+        that.setData({
+          soldList: res.data
+        });
+      }
+    });
+  },
+  onLoad: function (options) {
+    this.getCollectList();
+  },
+  onReady: function () {
+
+  },
+  onShow: function () {
+
+  },
+  onHide: function () {
+    // 页面隐藏
+
+  },
+  onUnload: function () {
+    // 页面关闭
+  },
+  openGoods(event) {
+    let goodsId = this.data.soldList[event.currentTarget.dataset.index].id;
+
+    wx.navigateTo({
+      url: '/pages/goods/goods?id=' + goodsId,
+    });
+  },
+
+})

wx-front/pages/ucenter/sold/sold.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "我卖出的"
+}

wx-front/pages/ucenter/sold/sold.wxml

@@ -0,0 +1,20 @@
+<view class="container">
+  <view class="collect-list" wx:if='{{soldList.length}}'>
+    <view class="item" bindtap="openGoods" wx:for="{{soldList}}" wx:key="{{item.id}}" data-index="{{index}}">
+      <image class="img" src="{{item.list_pic_url}}"></image>
+      <view class="info">
+        <view class="name">{{item.name}}</view>
+        <view class="subtitle">{{item.goods_brief}}</view>
+        <view class="flex">
+          <view class="price">￥{{item.price}}</view>
+          <view class='time'>出售于 :{{item.sold_time}}</view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  <view class="result-empty" wx:else>
+    <image class="icon" src="http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/noSearchResult-7572a94f32.png"></image>
+    <text class="text">您还没有卖出过宝贝</text>
+  </view>
+</view>

wx-front/pages/ucenter/sold/sold.wxss

@@ -0,0 +1,104 @@
+page {
+  background: #f4f4f4;
+  min-height: 100%;
+}
+
+.container {
+  background: #f4f4f4;
+  min-height: 100%;
+}
+
+.collect-list {
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+  background: #fff;
+  padding-left: 30rpx;
+  border-top: 1px solid #e1e1e1;
+}
+
+.item {
+  height: 212rpx;
+  width: 720rpx;
+  background: #fff;
+  padding: 30rpx 30rpx 30rpx 0;
+  border-bottom: 1px solid #e1e1e1;
+}
+
+.item:last-child {
+  border-bottom: 1px solid #fff;
+}
+
+.item .img {
+  float: left;
+  width: 150rpx;
+  height: 150rpx;
+}
+
+.item .info {
+  float: right;
+  width: 540rpx;
+  height: 150rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding-left: 20rpx;
+}
+
+.item .info .name {
+  font-size: 28rpx;
+  color: #333;
+  line-height: 40rpx;
+}
+
+.item .info .subtitle {
+  margin-top: 8rpx;
+  font-size: 24rpx;
+  color: #888;
+  line-height: 40rpx;
+}
+
+.item .info .price {
+  margin-top: 8rpx;
+  font-size: 28rpx;
+  color: #f94b4b;
+  line-height: 40rpx;
+  width: 160rpx;
+}
+
+.item .info .flex {
+  display: flex;
+}
+
+.item .info .time {
+  display: flex;
+  align-items: center;
+  padding: 0 10rpx;
+  width: auto;
+  color: #999;
+  overflow: hidden;
+  font-size: 26rpx;
+  line-height: 55rpx;
+}
+
+.result-empty {
+  width: 100%;
+  height: 100%;
+  padding-top: 300rpx;
+}
+
+.result-empty .icon {
+  margin: 0 auto;
+  display: block;
+  width: 240rpx;
+  height: 240rpx;
+}
+
+.result-empty .text {
+  display: block;
+  width: 100%;
+  height: 40rpx;
+  font-size: 28rpx;
+  text-align: center;
+  color: #999;
+}

zuul/src/main/resources/application.yml

@@ -58,6 +58,16 @@ zuul:
       serviceId: goods-service
       strip-prefix: false
       sensitiveHeaders:
+    bought:
+      path: /bought/**
+      serviceId: goods-service
+      strip-prefix: false
+      sensitiveHeaders:
+    sold:
+      path: /sold/**
+      serviceId: goods-service
+      strip-prefix: false
+      sensitiveHeaders: