From 31e20ddb1eafa5bf64a0824629fb8c7a05450318 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 19 六月 2020 20:26:28 +0800
Subject: [PATCH] 商品系统完善
---
src/main/java/com/ks/tool/bkz/controller/SDLJGoodsController.java | 78 +++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/ks/tool/bkz/controller/SDLJGoodsController.java b/src/main/java/com/ks/tool/bkz/controller/SDLJGoodsController.java
index aa86143..297a9b2 100644
--- a/src/main/java/com/ks/tool/bkz/controller/SDLJGoodsController.java
+++ b/src/main/java/com/ks/tool/bkz/controller/SDLJGoodsController.java
@@ -1,19 +1,23 @@
package com.ks.tool.bkz.controller;
-import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
-import com.ks.tool.bkz.entity.FirstOrderSubInfo;
-import com.ks.tool.bkz.entity.sdlj.SearchFilter;
-import com.ks.tool.bkz.service.FirstOrderSubInfoService;
import com.ks.tool.bkz.service.manager.RedisManager;
+import com.ks.tool.bkz.service.sdlj.SDLJUserGoodsService;
+import com.ks.tool.bkz.service.user.SDLJShareOpenHistoryService;
+import com.ks.tool.bkz.service.user.UserService;
import com.ks.tool.bkz.util.JsonUtil;
+import com.ks.tool.bkz.util.UserUtil;
+import com.ks.tool.bkz.util.annotation.Login;
import com.ks.tool.bkz.vo.sdlj.GoodsClassVO;
import com.ks.tool.bkz.vo.sdlj.SDLJGoodsInfoVO;
+import com.ks.tool.bkz.vo.sdlj.SDLJGoodsSearchVO;
+import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
@@ -25,49 +29,51 @@
private RedisManager redisManager;
@Resource
- private FirstOrderSubInfoService firstOrderSubInfoService;
+ private SDLJUserGoodsService sdljUserGoodsService;
+ @Resource
+ private SDLJShareOpenHistoryService sdljShareOpenHistoryService;
+
+ @Resource
+ private UserService userService;
+
+ @Login
@RequestMapping("searchGoods")
@ResponseBody
- public String searchGoods(int page,int classType, String searchInfo) {
- SearchFilter sf = new Gson().fromJson(searchInfo, SearchFilter.class);
- int pageSize=30;
+ public String searchGoods(int page, int classType, String searchInfo, HttpServletRequest request) {
+ SDLJGoodsSearchVO sf = new Gson().fromJson(searchInfo, SDLJGoodsSearchVO.class);
+ if (classType > 0)
+ sf.setClassType(classType);
+ sf.setSort("s.update_time desc");
+ int pageSize = 30;
+ String account = UserUtil.getAccountFromToken(request.getHeader("token"));
- List<FirstOrderSubInfo> list= firstOrderSubInfoService.listAll(page,pageSize);
+ Long uid = userService.selectByAccount(account).getId();
+ //鏌ヨ鏄惁鍙互鎼滅储鍏ㄩ儴
+ if(sdljShareOpenHistoryService.isOpen(uid))
+ uid=null;
+
+ List<SDLJGoodsInfoVO> list = sdljUserGoodsService.query(sf, uid, page, pageSize);
List<SDLJGoodsInfoVO> goodsList = new ArrayList<>();
- int index=(page-1)*pageSize;
- for (FirstOrderSubInfo info:list) {
+ int index = (page - 1) * pageSize;
+ for (SDLJGoodsInfoVO vo : list) {
index++;
- SDLJGoodsInfoVO vo=new SDLJGoodsInfoVO();
vo.setIndex(index);
- vo.setActualPrice("12.00");
- vo.setCommission("2.00");
- vo.setCommissionRate("20%");
- vo.setCouponPrice(info.getItemActPrice()+"");
- vo.setGoodsId(info.getItemId());
- List<String> imgList=new ArrayList<>();
- imgList.add(info.getItemImg());
- vo.setImgList(imgList);
- vo.setLijinAmount(info.getPromotionAmount()+"");
- vo.setTitle(info.getTitle());
- vo.setZkPrice(info.getItemActPrice()+"");
goodsList.add(vo);
}
+ List<GoodsClassVO> classList = new ArrayList<>();
+
+ classList.add(new GoodsClassVO(0, "鍏ㄩ儴"));
+ classList.add(new GoodsClassVO(1, "鍒嗙被1"));
+ classList.add(new GoodsClassVO(2, "鍒嗙被2"));
+ classList.add(new GoodsClassVO(3, "鍒嗙被3"));
- List<GoodsClassVO> classList=new ArrayList<>();
-
- classList.add(new GoodsClassVO(0,"鍏ㄩ儴"));
- classList.add(new GoodsClassVO(1,"鍒嗙被1"));
- classList.add(new GoodsClassVO(2,"鍒嗙被2"));
- classList.add(new GoodsClassVO(3,"鍒嗙被3"));
-
-
- JSONObject data=new JSONObject();
- data.put("goods",goodsList);
- data.put("goodsClass",classList);
- data.put("total",1000);
- data.put("hasMore",true);
+ JSONObject data = new JSONObject();
+ data.put("goods", goodsList);
+ data.put("goodsClass", classList);
+ data.put("total", 1000);
+ data.put("hasMore", true);
return JsonUtil.loadTrueResult(data);
}
--
Gitblit v1.8.0