From a2d0755d266133067251789ec4f5e4bb80aa84f0 Mon Sep 17 00:00:00 2001 From: xyiege Date: Sat, 16 Jul 2022 10:21:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E8=A1=8C=E5=95=86=E5=93=81=E6=8E=92?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/chjyj/szwh/bean/Goods.java | 10 ++--- .../admin/AdminGoodsController.java | 6 +-- .../cn/chjyj/szwh/service/GoodsService.java | 2 +- .../szwh/service/impl/GoodsServiceImpl.java | 43 ++++++++++++++++--- .../szwh/service/impl/ShopCarServiceImpl.java | 2 +- .../cn/chjyj/szwh/mapper/GoodsMapperTest.java | 9 ++-- .../chjyj/szwh/service/GoodsServiceTest.java | 41 ++++++++++++++++++ 7 files changed, 93 insertions(+), 20 deletions(-) create mode 100644 src/test/java/cn/chjyj/szwh/service/GoodsServiceTest.java diff --git a/src/main/java/cn/chjyj/szwh/bean/Goods.java b/src/main/java/cn/chjyj/szwh/bean/Goods.java index 27d227a..c071dda 100644 --- a/src/main/java/cn/chjyj/szwh/bean/Goods.java +++ b/src/main/java/cn/chjyj/szwh/bean/Goods.java @@ -13,7 +13,7 @@ public class Goods { private Integer userId;//用户编号 private String userIslicode;//委托方isli标识码 private String username;//委托方名称 - private Integer goodsDetailsId;//商品明细id + private Integer goodsDetailId;//商品明细id private String goodsIslicode; //商品isli标识码 private String isLicode;//sliCode private Integer saleCount;//销售量 @@ -67,12 +67,12 @@ public class Goods { this.username = username; } - public Integer getGoodsDetailsId() { - return goodsDetailsId; + public Integer getGoodsDetailId() { + return goodsDetailId; } - public void setGoodsDetailsId(Integer goodsDetailsId) { - this.goodsDetailsId = goodsDetailsId; + public void setGoodsDetailId(Integer goodsDetailId) { + this.goodsDetailId = goodsDetailId; } public String getGoodsIslicode() { diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java index 1fe71fc..703b22a 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java @@ -60,7 +60,7 @@ public class AdminGoodsController extends BaseController { // 查找用户信息 User user = userService.getApiUser(goods.getUserIslicode(),token); result.put("userinfo",user); - GoodsDetail goodsDetail = goodsDetailService.getGoodsDetailBygid(goods.getGoodsDetailsId()); + GoodsDetail goodsDetail = goodsDetailService.getGoodsDetailBygid(goods.getGoodsDetailId()); }else{ throw new ChException("未查询到该标的"); @@ -79,8 +79,8 @@ public class AdminGoodsController extends BaseController { @PostMapping("/rankingList") public JSONObject rankingList(@RequestParam(value = "type",defaultValue = "1") String type){ int itype = Integer.valueOf(type); - Map retmap = goodsService.getMapDataByTyep(itype); - jsonObject.put("data",retmap); + List retlist = goodsService.getMapDataByTyep(itype); + jsonObject.put("data",retlist); jsonObject.put("code",200); jsonObject.put("msg","成功"); return jsonObject; diff --git a/src/main/java/cn/chjyj/szwh/service/GoodsService.java b/src/main/java/cn/chjyj/szwh/service/GoodsService.java index a73032a..a6e462a 100644 --- a/src/main/java/cn/chjyj/szwh/service/GoodsService.java +++ b/src/main/java/cn/chjyj/szwh/service/GoodsService.java @@ -33,5 +33,5 @@ public interface GoodsService { * @param type * @return */ - Map getMapDataByTyep(int type); + List getMapDataByTyep(int type); } diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java index 127f9bd..f018e57 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java @@ -1,7 +1,9 @@ package cn.chjyj.szwh.service.impl; import cn.chjyj.szwh.bean.Goods; +import cn.chjyj.szwh.bean.GoodsDetail; import cn.chjyj.szwh.constant.ChConstant; +import cn.chjyj.szwh.mapper.GoodsDetailMapper; import cn.chjyj.szwh.mapper.GoodsMapper; import cn.chjyj.szwh.service.GoodsService; import cn.chjyj.szwh.utils.ProperUtils; @@ -14,6 +16,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -23,6 +26,8 @@ public class GoodsServiceImpl implements GoodsService { private static Log log = LogFactory.getLog(GoodsServiceImpl.class); @Autowired private GoodsMapper goodsMapper; + @Autowired + private GoodsDetailMapper goodsDetailMapper; @Override public List getGoodsList(int page) { @@ -69,28 +74,52 @@ public class GoodsServiceImpl implements GoodsService { } @Override - public Map getMapDataByTyep(int type) { + public List getMapDataByTyep(int type) { Map retmap = new HashMap(); + String order="";//排序条件 - String where="goods.is_deleted=0 ";//排序 + String where="is_deleted=0 ";//排序 int limit=10; // 点击量倒序 if (type==1){ - where+="goods.click_count desc"; + order="click_count"; } // 销售量 if(type==2){ - where+="goods.sale_count desc"; + order="sale_count"; } //推荐,just 8 if(type==3){ limit=8; - where+="goods.recommend_sort desc"; + order="recommend_sort "; + where+= "and is_recommend=1"; } - - return null; + // 商品结果列表 + List nglist = new ArrayList(); + // 排序索引 + int index=0; + List glist = goodsMapper.getGoodsByCondition(where,limit,order,"DESC"); + if(glist!=null){ + for(Goods g:glist){ + Map ngmap = new HashMap<>(); + GoodsDetail goodsDetail = goodsDetailMapper.getGoodsDetailBygid(g.getGoodsDetailId()); + //添加内容 + ngmap.put("createtime",g.getCreateTime()); + ngmap.put("goods_islicode",g.getGoodsIslicode()); + ngmap.put("goods_name",goodsDetail.getGoodsName()); + ngmap.put("goods_status",g.getGoodsStatus()); + ngmap.put("goods_type",goodsDetail.getGoodsType()); + ngmap.put("id",index+1); + ngmap.put("key",g.getGoodsIslicode()); + ngmap.put("recommend_sort",g.getRecommendSort()); + ngmap.put("username",g.getUsername()); + nglist.add(ngmap); + index++; + } + } + return nglist; } } diff --git a/src/main/java/cn/chjyj/szwh/service/impl/ShopCarServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/ShopCarServiceImpl.java index 25c7820..362785c 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/ShopCarServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/ShopCarServiceImpl.java @@ -58,7 +58,7 @@ public class ShopCarServiceImpl implements ShopCarService { // 检查订单是否存在 long curtimestamp= System.currentTimeMillis()/1000l; // 检查商品库存 - GoodsDetail goodsDetail = goodsDetailMapper.getGoodsDetailBygid(goods.getGoodsDetailsId()); + GoodsDetail goodsDetail = goodsDetailMapper.getGoodsDetailBygid(goods.getGoodsDetailId()); if (goodsDetail!=null) { if(goodsDetail.getStock()<0 && goodsDetail.getGoodsEntrust()==1){ // 标的库存为0，不可添加 diff --git a/src/test/java/cn/chjyj/szwh/mapper/GoodsMapperTest.java b/src/test/java/cn/chjyj/szwh/mapper/GoodsMapperTest.java index 16c0386..b7fa0cc 100644 --- a/src/test/java/cn/chjyj/szwh/mapper/GoodsMapperTest.java +++ b/src/test/java/cn/chjyj/szwh/mapper/GoodsMapperTest.java @@ -57,8 +57,11 @@ public class GoodsMapperTest { @Test public void getGoodsByCon(){ - String wcon="is_deleted=0 order by click_count desc"; - List glist = goodsMapper.getGoodsByCondition(wcon); - System.out.println(glist.size()); + String wcon="is_deleted=0"; + List glist = goodsMapper.getGoodsByCondition(wcon,12,"click_count", "DESC"); + for(Goods g:glist){ + System.out.println(g.getId()); + } +// System.out.println(glist.size()); } } \ No newline at end of file diff --git a/src/test/java/cn/chjyj/szwh/service/GoodsServiceTest.java b/src/test/java/cn/chjyj/szwh/service/GoodsServiceTest.java new file mode 100644 index 0000000..5421d21 --- /dev/null +++ b/src/test/java/cn/chjyj/szwh/service/GoodsServiceTest.java @@ -0,0 +1,41 @@ +package cn.chjyj.szwh.service; + +import cn.chjyj.szwh.bean.Goods; +import cn.chjyj.szwh.mapper.GoodsMapper; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.List; + +import static org.junit.Assert.*; + +@SpringBootTest +@RunWith(SpringRunner.class) +public class GoodsServiceTest { + @Autowired + private GoodsService goodsService; + + @Test + public void getGoodsList() { + } + + @Test + public void getGoodsByIsli() { + } + + @Test + public void getApiGoods() { + } + + @Test + public void getMapDataByTyep() { + int type=1; + List glist = goodsService.getMapDataByTyep(type); + for(Goods g:glist){ + System.out.println(g.getGoodsDetailId()); + } + } +} \ No newline at end of file