Skip to content

C
cloud-platform
Commit 10400fa7 authored by hanfeng's avatar hanfeng
Browse files
Options

Merge branch 'master-Member-bug-modify' into base-modify 

# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
parents 22221e77 a15af830
Show whitespace changes
Inline Side-by-side
Showing with 200 additions and 152 deletions
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
View file @ 10400fa7
...@@ -112,6 +112,13 @@ public class BackStageOrderController extends CommonBaseController implements Us ...@@ -112,6 +112,13 @@ public class BackStageOrderController extends CommonBaseController implements Us
if (userDTO == null) { if (userDTO == null) {
return ObjectRestResponse.succ(new PageDataVO<>()); return ObjectRestResponse.succ(new PageDataVO<>());
} }
//车辆排班表查询订单详情
if (dto.getOneNo()!=null) {
dto.setPage(1);
dto.setLimit(1);
dto.setType(1);
}
if (StringUtils.isNotBlank(dto.getPhone()) || StringUtils.isNotBlank(dto.getRealName())) { if (StringUtils.isNotBlank(dto.getPhone()) || StringUtils.isNotBlank(dto.getRealName())) {
List<AppUserLogin> appUserLoins = userFeign.getOne(dto.getPhone(), dto.getRealName()); List<AppUserLogin> appUserLoins = userFeign.getOne(dto.getPhone(), dto.getRealName());
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
View file @ 10400fa7
...@@ -359,6 +359,12 @@ public class BaseOrderController extends CommonBaseController implements UserRes ...@@ -359,6 +359,12 @@ public class BaseOrderController extends CommonBaseController implements UserRes
private List<String> vehicleIds; private List<String> vehicleIds;
/**
* 获取一条车辆详情,需要传的订单号
*/
private String oneNo;
//订单用户ID列表 //订单用户ID列表
private List<Integer> userIds; private List<Integer> userIds;
//订单用户大区id列表 //订单用户大区id列表
......
xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
View file @ 10400fa7
...@@ -151,6 +151,9 @@ ...@@ -151,6 +151,9 @@
<if test="no != null and no != '' "> <if test="no != null and no != '' ">
and no like CONCAT ("%", #{no}, "%") and no like CONCAT ("%", #{no}, "%")
</if> </if>
<if test="oneNo != null and oneNo != '' ">
and no =#{oneNo}
</if>
<if test="name != null"> <if test="name != null">
and b.name like CONCAT ("%", #{name}, "%") and b.name like CONCAT ("%", #{name}, "%")
</if> </if>
......
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodBiz.java
View file @ 10400fa7
...@@ -31,6 +31,7 @@ import java.lang.reflect.InvocationTargetException; ...@@ -31,6 +31,7 @@ import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* 旅游商品表 * 旅游商品表
...@@ -64,6 +65,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> { ...@@ -64,6 +65,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
/** /**
* 查询旅游路线列表 * 查询旅游路线列表
*
* @param page * @param page
* @param limit * @param limit
* @param query * @param query
...@@ -73,24 +75,24 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> { ...@@ -73,24 +75,24 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
* @param distance * @param distance
* @return * @return
*/ */
public ObjectRestResponse<PageDataVO<TourGood>> getGoodList(int page, int limit , String query , Double latitude, Double longitude, Integer tagId, Double distance){ public ObjectRestResponse<PageDataVO<TourGood>> getGoodList(int page, int limit, String query, Double latitude, Double longitude, Integer tagId, Double distance) {
Map<String, Object> params = initParam(page, limit, query, latitude, longitude, tagId, distance); Map<String, Object> params = initParam(page, limit, query, latitude, longitude, tagId, distance);
PageDataVO<TourGood> dataVO=null; PageDataVO<TourGood> dataVO = null;
if(latitude!=null&&latitude>0&&longitude!=null&&longitude>0){ if (latitude != null && latitude > 0 && longitude != null && longitude > 0) {
dataVO=PageDataVO.pageInfo(page, limit, ()->mapper.getCoordinateList(params)); dataVO = PageDataVO.pageInfo(page, limit, () -> mapper.getCoordinateList(params));
}else { } else {
dataVO=PageDataVO.pageInfo(page, limit, ()->mapper.getGoodList(params)); dataVO = PageDataVO.pageInfo(page, limit, () -> mapper.getGoodList(params));
} }
return new ObjectRestResponse().status(RestCode.SUCCESS.getStatus()).msg(RestCode.SUCCESS.getMsg()).data(dataVO); return new ObjectRestResponse().status(RestCode.SUCCESS.getStatus()).msg(RestCode.SUCCESS.getMsg()).data(dataVO);
} }
private Map<String, Object> initParam(int page, int limit, String query, Double latitude, Double longitude, Integer tagId, Double distance) { private Map<String, Object> initParam(int page, int limit, String query, Double latitude, Double longitude, Integer tagId, Double distance) {
Map<String,Object> params = new HashMap<String,Object>(); Map<String, Object> params = new HashMap<String, Object>();
params.put("query",query); params.put("query", query);
params.put("latitude",latitude); params.put("latitude", latitude);
params.put("longitude",longitude); params.put("longitude", longitude);
params.put("tagId",tagId); params.put("tagId", tagId);
params.put("distance",distance); params.put("distance", distance);
return params; return params;
} }
...@@ -100,167 +102,167 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> { ...@@ -100,167 +102,167 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
//获取商品列表 //获取商品列表
public PageDataVO<TourGoodVo> getAll(GoodSearchDTO dto){ public PageDataVO<TourGoodVo> getAll(GoodSearchDTO dto) {
PageHelper.startPage(dto.getPage(),dto.getLimit()); PageHelper.startPage(dto.getPage(), dto.getLimit());
PageInfo<TourGoodVo> goodPageInfo = new PageInfo<>(mapper.findGoodList(dto)); PageInfo<TourGoodVo> goodPageInfo = new PageInfo<>(mapper.findGoodList(dto));
return PageDataVO.pageInfo(goodPageInfo); return PageDataVO.pageInfo(goodPageInfo);
} }
//获取商品列表 //获取商品列表
public ObjectRestResponse goodsEdit(TourGoodDTO dto){ public ObjectRestResponse goodsEdit(TourGoodDTO dto) {
if(dto==null){ if (dto == null) {
return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空"); return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
} }
TourGood good=new TourGood(); TourGood good = new TourGood();
try { try {
Long times=System.currentTimeMillis(); Long times = System.currentTimeMillis();
BeanUtils.copyProperties(good,dto); BeanUtils.copyProperties(good, dto);
Integer goodId=good.getId(); Integer goodId = good.getId();
good.setUpdTime(times); good.setUpdTime(times);
if(goodId==null||goodId==0){ if (goodId == null || goodId == 0) {
good.setCrtTime(times); good.setCrtTime(times);
mapper.insertSelective(good); mapper.insertSelective(good);
goodId=good.getId(); goodId = good.getId();
}else { } else {
mapper.updateByPrimaryKeySelective(good); mapper.updateByPrimaryKeySelective(good);
} }
if(goodId>0){ if (goodId > 0) {
List<GoodBannerDTO> bannerList=dto.getBannerDTOS(); List<GoodBannerDTO> bannerList = dto.getBannerDTOS();
if(bannerList.size()>0){ if (bannerList.size() > 0) {
List<Integer> bannerIds=new ArrayList<>(); List<Integer> bannerIds = new ArrayList<>();
for (GoodBannerDTO bannerDTO:bannerList){ for (GoodBannerDTO bannerDTO : bannerList) {
Integer bannerId=bannerDTO.getId(); Integer bannerId = bannerDTO.getId();
TourGoodBanner goodBanner=new TourGoodBanner(); TourGoodBanner goodBanner = new TourGoodBanner();
BeanUtils.copyProperties(goodBanner,bannerDTO); BeanUtils.copyProperties(goodBanner, bannerDTO);
goodBanner.setGoodId(goodId); goodBanner.setGoodId(goodId);
if(bannerId==null||bannerId==0){ if (bannerId == null || bannerId == 0) {
bannerBiz.insertSelective(goodBanner); bannerBiz.insertSelective(goodBanner);
bannerId=goodBanner.getId(); bannerId = goodBanner.getId();
}else { } else {
bannerBiz.updateSelectiveById(goodBanner); bannerBiz.updateSelectiveById(goodBanner);
} }
bannerIds.add(bannerId); bannerIds.add(bannerId);
} }
if(bannerIds.size()>0){ if (bannerIds.size() > 0) {
bannerBiz.delGoodBanner(goodId,bannerIds); bannerBiz.delGoodBanner(goodId, bannerIds);
} }
}else{ } else {
bannerBiz.delGoodBanner(goodId,null); bannerBiz.delGoodBanner(goodId, null);
} }
List<GoodSiteDTO> siteDTOList=dto.getSiteDTOS(); List<GoodSiteDTO> siteDTOList = dto.getSiteDTOS();
List<Integer> sites=new ArrayList<>(); List<Integer> sites = new ArrayList<>();
if(siteDTOList.size()>0){ if (siteDTOList.size() > 0) {
List<Integer> siteIds=new ArrayList<>(); List<Integer> siteIds = new ArrayList<>();
for (GoodSiteDTO siteDTO:siteDTOList){ for (GoodSiteDTO siteDTO : siteDTOList) {
Integer siteId=siteDTO.getId(); Integer siteId = siteDTO.getId();
TourGoodSite site=new TourGoodSite(); TourGoodSite site = new TourGoodSite();
BeanUtils.copyProperties(site,siteDTO); BeanUtils.copyProperties(site, siteDTO);
site.setGoodId(goodId); site.setGoodId(goodId);
if(siteId==null||siteId==0){ if (siteId == null || siteId == 0) {
siteBiz.insertSelective(site); siteBiz.insertSelective(site);
siteId=site.getId(); siteId = site.getId();
}else { } else {
siteBiz.updateSelectiveById(site); siteBiz.updateSelectiveById(site);
} }
siteIds.add(siteId); siteIds.add(siteId);
if(site.getType()==0){ if (site.getType() == 0) {
sites.add(siteId); sites.add(siteId);
} }
} }
if(siteIds.size()>0){ if (siteIds.size() > 0) {
siteBiz.delGoodSite(goodId,siteIds); siteBiz.delGoodSite(goodId, siteIds);
} }
} }
List<GoodTagDTO> tagList=dto.getTagDTOS(); List<GoodTagDTO> tagList = dto.getTagDTOS();
if(tagList.size()>0){ if (tagList.size() > 0) {
List<Integer> tagIds=new ArrayList<>(); List<Integer> tagIds = new ArrayList<>();
for (GoodTagDTO tagDTO:tagList){ for (GoodTagDTO tagDTO : tagList) {
Integer tagId=tagDTO.getTagId(); Integer tagId = tagDTO.getTagId();
TourGoodTag tag=new TourGoodTag(); TourGoodTag tag = new TourGoodTag();
BeanUtils.copyProperties(tag,tagDTO); BeanUtils.copyProperties(tag, tagDTO);
tag.setGoodId(goodId); tag.setGoodId(goodId);
TourGoodTag tag1=tagBiz.selectOne(tag); TourGoodTag tag1 = tagBiz.selectOne(tag);
if(tag1==null){ if (tag1 == null) {
tagBiz.insertSelective(tag); tagBiz.insertSelective(tag);
tagId=tag.getId(); tagId = tag.getId();
}else { } else {
/* tag.setId(tag.getId()); /* tag.setId(tag.getId());
tagBiz.updateSelectiveById(tag);*/ tagBiz.updateSelectiveById(tag);*/
tagId=tag1.getId(); tagId = tag1.getId();
} }
tagIds.add(tagId); tagIds.add(tagId);
} }
if(tagIds.size()>0){ if (tagIds.size() > 0) {
tagBiz.delGoodTag(goodId,tagIds); tagBiz.delGoodTag(goodId, tagIds);
} }
}else{ } else {
tagBiz.delGoodTag(goodId,null); tagBiz.delGoodTag(goodId, null);
} }
List<GoodSpePriceDTO> priceDTOList=dto.getPriceDTOS(); List<GoodSpePriceDTO> priceDTOList = dto.getPriceDTOS();
List<Integer> prices=new ArrayList<>(); List<Integer> prices = new ArrayList<>();
if(siteDTOList.size()>0){ if (siteDTOList.size() > 0) {
for (GoodSpePriceDTO priceDTO:priceDTOList){ for (GoodSpePriceDTO priceDTO : priceDTOList) {
Integer priceId=priceDTO.getId(); Integer priceId = priceDTO.getId();
TourGoodSpePrice spePrice=new TourGoodSpePrice(); TourGoodSpePrice spePrice = new TourGoodSpePrice();
BeanUtils.copyProperties(spePrice,priceDTO); BeanUtils.copyProperties(spePrice, priceDTO);
BigDecimal price=good.getPrice(); BigDecimal price = good.getPrice();
BigDecimal childPrice=good.getChildPrice(); BigDecimal childPrice = good.getChildPrice();
spePrice.setPrice(price); spePrice.setPrice(price);
spePrice.setChildPrice(childPrice); spePrice.setChildPrice(childPrice);
spePrice.setGoodId(goodId); spePrice.setGoodId(goodId);
List<BaseUserMemberLevel> levelsList=userFeign.levels(); List<BaseUserMemberLevel> levelsList = userFeign.levels();
if(levelsList.size()>0){ if (levelsList.size() > 0) {
JSONArray array=new JSONArray(); JSONArray array = new JSONArray();
for(BaseUserMemberLevel memberLevel :levelsList){ for (BaseUserMemberLevel memberLevel : levelsList) {
JSONObject obj=new JSONObject(); JSONObject obj = new JSONObject();
Integer level=memberLevel.getLevel(); Integer level = memberLevel.getLevel();
Integer discount=memberLevel.getDiscount(); Integer discount = memberLevel.getDiscount();
BigDecimal price1=price.multiply(new BigDecimal(discount+"")).divide(new BigDecimal("100")) BigDecimal price1 = price.multiply(new BigDecimal(discount + "")).divide(new BigDecimal("100"))
.setScale(2, RoundingMode.HALF_UP); .setScale(2, RoundingMode.HALF_UP);
BigDecimal price2=childPrice.multiply(new BigDecimal(discount+"")).divide(new BigDecimal("100")) BigDecimal price2 = childPrice.multiply(new BigDecimal(discount + "")).divide(new BigDecimal("100"))
.setScale(2, RoundingMode.HALF_UP); .setScale(2, RoundingMode.HALF_UP);
obj.put("level",level); obj.put("level", level);
obj.put("price",price1); obj.put("price", price1);
obj.put("childPrice",price2); obj.put("childPrice", price2);
array.add(obj); array.add(obj);
} }
if(array.size()>0){ if (array.size() > 0) {
String json=array.toJSONString(); String json = array.toJSONString();
spePrice.setMemberPrice(json); spePrice.setMemberPrice(json);
} }
} }
if(priceId==null||priceId==0){ if (priceId == null || priceId == 0) {
speBiz.insertSelective(spePrice); speBiz.insertSelective(spePrice);
priceId=spePrice.getId(); priceId = spePrice.getId();
}else { } else {
speBiz.updateSelectiveById(spePrice); speBiz.updateSelectiveById(spePrice);
} }
prices.add(priceId); prices.add(priceId);
} }
if(prices.size()>0){ if (prices.size() > 0) {
speBiz.delGoodSpe(goodId,prices); speBiz.delGoodSpe(goodId, prices);
} }
} }
if(sites.size()>0){ if (sites.size() > 0) {
List<Integer> vids=new ArrayList<>(); List<Integer> vids = new ArrayList<>();
List<TourGoodVerification> verifications=new ArrayList<>(); List<TourGoodVerification> verifications = new ArrayList<>();
for (Integer siteId:sites){ for (Integer siteId : sites) {
if(prices.size()>0){ if (prices.size() > 0) {
for(Integer priceId:prices){ for (Integer priceId : prices) {
TourGoodVerification verification=new TourGoodVerification(); TourGoodVerification verification = new TourGoodVerification();
verification.setGoodId(goodId); verification.setGoodId(goodId);
verification.setSiteId(siteId); verification.setSiteId(siteId);
verification.setSpeId(priceId); verification.setSpeId(priceId);
verification.setIsDel(0); verification.setIsDel(0);
TourGoodVerification verification1=verificationBiz.selectOne(verification); TourGoodVerification verification1 = verificationBiz.selectOne(verification);
if(verification1==null){ if (verification1 == null) {
verification.setTotalPerson(0); verification.setTotalPerson(0);
verification.setVerificationPerson(0); verification.setVerificationPerson(0);
verification.setStatus(0); verification.setStatus(0);
verifications.add(verification); verifications.add(verification);
}else { } else {
vids.add(verification1.getId()); vids.add(verification1.getId());
} }
...@@ -269,20 +271,22 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> { ...@@ -269,20 +271,22 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
} }
if(vids.size()>0){ if (vids.size() > 0) {
verificationBiz.delGoodVerification(goodId,vids); verificationBiz.delGoodVerification(goodId, vids);
} }
if(verifications.size()>0){ if (verifications.size() > 0) {
for (TourGoodVerification verif:verifications) for (TourGoodVerification verif : verifications)
verificationBiz.insertSelective(verif); verificationBiz.insertSelective(verif);
} }
} }
} }
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
log.error(e.getMessage(), e);; log.error(e.getMessage(), e);
;
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
log.error(e.getMessage(), e);; log.error(e.getMessage(), e);
;
return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常"); return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
} }
return ObjectRestResponse.succ(); return ObjectRestResponse.succ();
...@@ -294,31 +298,33 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> { ...@@ -294,31 +298,33 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空"); return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
} }
try { try {
TourGood TourGood=new TourGood(); TourGood TourGood = new TourGood();
TourGood.setId(id); TourGood.setId(id);
TourGood.setIsDel(1); TourGood.setIsDel(1);
updateSelectiveById(TourGood); updateSelectiveById(TourGood);
return ObjectRestResponse.succ(); return ObjectRestResponse.succ();
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e);; log.error(e.getMessage(), e);
;
log.error("---商品详情---id=====" + id + "----异常---msg===" + e.getMessage()); log.error("---商品详情---id=====" + id + "----异常---msg===" + e.getMessage());
return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常"); return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
} }
} }
//上下架商品 //上下架商品
public ObjectRestResponse upStatusById(Integer id,Integer status) { public ObjectRestResponse upStatusById(Integer id, Integer status) {
if (id == null || id == 0||status == null) { if (id == null || id == 0 || status == null) {
return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空"); return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
} }
try { try {
TourGood TourGood=new TourGood(); TourGood TourGood = new TourGood();
TourGood.setId(id); TourGood.setId(id);
TourGood.setStatus(status); TourGood.setStatus(status);
updateSelectiveById(TourGood); updateSelectiveById(TourGood);
return ObjectRestResponse.succ(); return ObjectRestResponse.succ();
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e);; log.error(e.getMessage(), e);
;
log.error("---商品详情---id=====" + id + "----异常---msg===" + e.getMessage()); log.error("---商品详情---id=====" + id + "----异常---msg===" + e.getMessage());
return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常"); return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
} }
...@@ -326,16 +332,18 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> { ...@@ -326,16 +332,18 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
/** /**
* 首页旅游列表 * 首页旅游列表
*
* @param page * @param page
* @param limit * @param limit
* @return * @return
*/ */
public List<GoodDataVO> getAllByHome(Integer page, Integer limit){ public List<GoodDataVO> getAllByHome(Integer page, Integer limit) {
return mapper.findAllByHome((page-1)*limit,limit); return mapper.findAllByHome((page - 1) * limit, limit);
} }
/** /**
* 获取指定数量的随机旅游路线 * 获取指定数量的随机旅游路线
*
* @return * @return
*/ */
public ObjectRestResponse findRandomVehicle(Integer number) { public ObjectRestResponse findRandomVehicle(Integer number) {
...@@ -343,13 +351,13 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> { ...@@ -343,13 +351,13 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
Map<String, Object> param = new HashMap<>(); Map<String, Object> param = new HashMap<>();
List<TourGood> list = mapper.getCoordinateList(param); List<TourGood> list = mapper.getCoordinateList(param);
Set<TourGood> resultList = new HashSet<>(); Set<TourGood> resultList = new HashSet<>();
if(CollectionUtils.isNotEmpty(list)) { if (CollectionUtils.isNotEmpty(list)) {
if(number >= list.size()) { if (number >= list.size()) {
return ObjectRestResponse.succ(list); return ObjectRestResponse.succ(list);
} }
Set<Integer> set = new HashSet<>(); Set<Integer> set = new HashSet<>();
RandomUtil.randomSet(list.size(), number, set, number); RandomUtil.randomSet(list.size(), number, set, number);
for(Integer i : set) { for (Integer i : set) {
resultList.add(list.get(i)); resultList.add(list.get(i));
} }
} }
...@@ -357,22 +365,46 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> { ...@@ -357,22 +365,46 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
} }
public List homePageTour(WebsiteQuery query) { public List homePageTour(WebsiteQuery query) {
if (Objects.isNull(query)) { if (Objects.isNull(query)) {
return new ArrayList(); return new ArrayList();
} }
if (CollectionUtils.isEmpty(query.getTagIds())) {
setQueryTagIds(query); setQueryTagIds(query);
}
List<GoodDataVO> list = mapper.getList(query);
return handleResultList(list, query);
}
List<TourGood> list = mapper.getList(query); private List handleResultList(List<GoodDataVO> list, WebsiteQuery query) {
return CollectionUtils.isNotEmpty(list)?list:new ArrayList<>(); int size=0;
if (list != null) {
size = list.size();
}
if (size!= query.getLimit()) {
List<Integer> ids = list.parallelStream().map(GoodDataVO::getId).collect(Collectors.toList());
Example example =new Example(TourGood.class);
example.createCriteria().andNotIn("id",ids).andEqualTo("status",1).andEqualTo("isDel",0);
example.orderBy("rank").asc().orderBy("crtTime").desc();
PageHelper.startPage(1,query.getLimit()-size);
List<TourGood> tourGoods = mapper.selectByExample(example);
for (TourGood tourGood : tourGoods) {
GoodDataVO goodDataVO = new GoodDataVO();
goodDataVO.setId(tourGood.getId());
goodDataVO.setName(tourGood.getName());
goodDataVO.setImgUrl(tourGood.getCover());
goodDataVO.setPrice(tourGood.getPrice().toString());
}
}
return list;
} }
private void setQueryTagIds(WebsiteQuery query) { private void setQueryTagIds(WebsiteQuery query) {
if (CollectionUtils.isEmpty(query.getTagIds())) { if (CollectionUtils.isEmpty(query.getTagIds())) {
List<Integer> list=new ArrayList<>(); List<Integer> list = new ArrayList<>();
Integer type = query.getType(); Integer type = query.getType();
if (type==1) { if (type == 1) {
if (StringUtils.isNotBlank(popular)) { if (StringUtils.isNotBlank(popular)) {
String[] popularIds = popular.split(","); String[] popularIds = popular.split(",");
for (String id : popularIds) { for (String id : popularIds) {
...@@ -381,7 +413,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> { ...@@ -381,7 +413,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
} }
} }
if (type==2) { if (type == 2) {
if (StringUtils.isNotBlank(characteristic)) { if (StringUtils.isNotBlank(characteristic)) {
String[] characteristicIds = characteristic.split(","); String[] characteristicIds = characteristic.split(",");
for (String id : characteristicIds) { for (String id : characteristicIds) {
...@@ -395,7 +427,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> { ...@@ -395,7 +427,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
public List newTour(Integer limit) { public List newTour(Integer limit) {
List list = mapper.newTour(limit); List list = mapper.newTour(limit);
return CollectionUtils.isNotEmpty(list)?list:new ArrayList<>(); return CollectionUtils.isNotEmpty(list) ? list : new ArrayList<>();
} }
} }
......
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourGoodMapper.java
View file @ 10400fa7
...@@ -38,7 +38,7 @@ public interface TourGoodMapper extends Mapper<TourGood> { ...@@ -38,7 +38,7 @@ public interface TourGoodMapper extends Mapper<TourGood> {
*/ */
List<GoodDataVO> findAllByHome(@Param("start") Integer start, @Param("size") Integer size); List<GoodDataVO> findAllByHome(@Param("start") Integer start, @Param("size") Integer size);
List<TourGood> getList(WebsiteQuery query); List<GoodDataVO> getList(WebsiteQuery query);
List newTour(Integer limit); List newTour(Integer limit);
} }
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/officialWebsite/OfficialWebsiteTourController.java
View file @ 10400fa7
...@@ -14,19 +14,19 @@ import org.springframework.web.bind.annotation.*; ...@@ -14,19 +14,19 @@ import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("website") @RequestMapping("/website/app/unauth")
@IgnoreClientToken @IgnoreClientToken
@IgnoreUserToken @IgnoreUserToken
@Api(tags = {"官网"}) @Api(tags = {"官网"})
public class OfficialWebsiteTourController extends BaseController<TourGoodBiz, TourGood> { public class OfficialWebsiteTourController extends BaseController<TourGoodBiz, TourGood> {
@PostMapping("/app/unauth/tour") @PostMapping("/tour")
public ObjectRestResponse homePageTour(@RequestBody WebsiteQuery query) throws Exception { public ObjectRestResponse homePageTour(@RequestBody WebsiteQuery query) throws Exception {
return ObjectRestResponse.succ(baseBiz.homePageTour(query)); return ObjectRestResponse.succ(baseBiz.homePageTour(query));
} }
@GetMapping("/app/unauth/tour/new") @GetMapping("/tour/new")
public ObjectRestResponse newTour(@RequestParam(value = "limit", defaultValue = "6") Integer limit) { public ObjectRestResponse newTour(@RequestParam(value = "limit", defaultValue = "6") Integer limit) {
return ObjectRestResponse.succ(baseBiz.newTour(limit)); return ObjectRestResponse.succ(baseBiz.newTour(limit));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment