|
@@ -6,6 +6,7 @@ import com.miekir.shibei.bean.GoodsBean;
|
|
|
import com.miekir.shibei.bean.ResponseResult;
|
|
import com.miekir.shibei.bean.ResponseResult;
|
|
|
import com.miekir.shibei.bean.ResultCode;
|
|
import com.miekir.shibei.bean.ResultCode;
|
|
|
import com.miekir.shibei.repository.CouponRepository;
|
|
import com.miekir.shibei.repository.CouponRepository;
|
|
|
|
|
+import com.miekir.shibei.repository.FavRepository;
|
|
|
import com.miekir.shibei.repository.UserRepository;
|
|
import com.miekir.shibei.repository.UserRepository;
|
|
|
import com.miekir.shibei.tool.RequestTool;
|
|
import com.miekir.shibei.tool.RequestTool;
|
|
|
import com.miekir.shibei.tool.StringTool;
|
|
import com.miekir.shibei.tool.StringTool;
|
|
@@ -27,6 +28,9 @@ public class CouponController {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private UserRepository userRepository;
|
|
private UserRepository userRepository;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private FavRepository favRepository;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 新增和更新优惠券
|
|
* 新增和更新优惠券
|
|
|
*/
|
|
*/
|
|
@@ -117,7 +121,7 @@ public class CouponController {
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value = "/api/getCouponList", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
|
|
@RequestMapping(value = "/api/getCouponList", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
- public String getCouponList(int couponType, int pageNum, int pageSize) {
|
|
|
|
|
|
|
+ public String getCouponList(@RequestHeader HttpHeaders header, int couponType, int pageNum, int pageSize) {
|
|
|
ResponseResult<List<CouponBean>> responseResult = new ResponseResult<List<CouponBean>>();
|
|
ResponseResult<List<CouponBean>> responseResult = new ResponseResult<List<CouponBean>>();
|
|
|
responseResult.setMessage("获取失败");
|
|
responseResult.setMessage("获取失败");
|
|
|
|
|
|
|
@@ -137,6 +141,18 @@ public class CouponController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
try {
|
|
try {
|
|
|
|
|
+ if (couponBeanList != null) {
|
|
|
|
|
+ String email = header.getFirst("email");
|
|
|
|
|
+ List<Long> favBeanList = favRepository.findFavListByEmail(email);
|
|
|
|
|
+ if (favBeanList != null && favBeanList.size() > 0) {
|
|
|
|
|
+ // 当前商品是否已收藏
|
|
|
|
|
+ for (CouponBean goodsBean : couponBeanList) {
|
|
|
|
|
+ if (favBeanList.contains(goodsBean.id)) {
|
|
|
|
|
+ goodsBean.isFavorite = true;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
responseResult.setContent(couponBeanList);
|
|
responseResult.setContent(couponBeanList);
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
@@ -153,7 +169,7 @@ public class CouponController {
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value = "/api/getCouponListByKeyword", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
|
|
@RequestMapping(value = "/api/getCouponListByKeyword", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
- public String getGoodsListByKeyword(String keywords, int pageNum, int pageSize) {
|
|
|
|
|
|
|
+ public String getGoodsListByKeyword(@RequestHeader HttpHeaders header, String keywords, int pageNum, int pageSize) {
|
|
|
String keywordsUtf8 = StringTool.getUtf8String(keywords);
|
|
String keywordsUtf8 = StringTool.getUtf8String(keywords);
|
|
|
|
|
|
|
|
ResponseResult<List<CouponBean>> responseResult = new ResponseResult<List<CouponBean>>();
|
|
ResponseResult<List<CouponBean>> responseResult = new ResponseResult<List<CouponBean>>();
|
|
@@ -172,6 +188,18 @@ public class CouponController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
try {
|
|
try {
|
|
|
|
|
+ if (goodsBeanList != null) {
|
|
|
|
|
+ String email = header.getFirst("email");
|
|
|
|
|
+ List<Long> favBeanList = favRepository.findFavListByEmail(email);
|
|
|
|
|
+ if (favBeanList != null && favBeanList.size() > 0) {
|
|
|
|
|
+ // 当前商品是否已收藏
|
|
|
|
|
+ for (CouponBean goodsBean : goodsBeanList) {
|
|
|
|
|
+ if (favBeanList.contains(goodsBean.id)) {
|
|
|
|
|
+ goodsBean.isFavorite = true;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
responseResult.setContent(goodsBeanList);
|
|
responseResult.setContent(goodsBeanList);
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|