拼团 订单
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package com.czg.service.market.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.czg.account.service.ShopInfoService;
|
||||
import com.czg.exception.CzgException;
|
||||
import com.czg.market.dto.GbWareDTO;
|
||||
@@ -32,20 +33,20 @@ public class GbWareServiceImpl extends ServiceImpl<GbWareMapper, GbWare> impleme
|
||||
public Page<GbWare> getGbWarePage(GbWareQueryParamDTO param, Long shopId) {
|
||||
Long mainShopId = shopInfoService.getMainIdByShopId(shopId);
|
||||
QueryWrapper queryWrapper = new QueryWrapper();
|
||||
queryWrapper.eq(GbWare::getShopId, mainShopId)
|
||||
.eq(GbWare::getIsDel, 0)
|
||||
queryWrapper.eq(GbWare::getIsDel, 0)
|
||||
.eq(GbWare::getOnlineStatus, param.getOnlineStatus())
|
||||
.like(GbWare::getWareName, CzgStrUtils.getStrOrNull(param.getWareName()))
|
||||
.between(GbWare::getCreateTime, param.getStartTime(), param.getEndTime())
|
||||
.orderBy(GbWare::getCreateTime).desc();
|
||||
.eq(GbWare::getGroupPeopleNum, param.getGroupPeopleNum())
|
||||
.like(GbWare::getWareName, param.getWareName())
|
||||
.orderBy(GbWare::getCreateTime).asc();
|
||||
if (StrUtil.isNotBlank(param.getStartTime()) || StrUtil.isNotBlank(param.getEndTime())) {
|
||||
queryWrapper.between(GbWare::getCreateTime, param.getStartTime(), param.getEndTime());
|
||||
}
|
||||
|
||||
queryWrapper.and(q -> {
|
||||
q.eq(GbWare::getUseShopType, "all").or(q1 -> {
|
||||
q1.eq(GbWare::getUseShopType, "only").eq(GbWare::getShopId, shopId);
|
||||
q.eq(GbWare::getShopId, shopId).or(q1 -> {
|
||||
q1.eq(GbWare::getUseShopType, "all").eq(GbWare::getShopId, mainShopId);
|
||||
}).or(q2 -> {
|
||||
q2.eq(GbWare::getUseShopType, "custom").and(q3 -> {
|
||||
q3.eq(GbWare::getShopId, shopId).or("FIND_IN_SET( " + shopId + ", use_shops ) > 0");
|
||||
});
|
||||
q2.eq(GbWare::getUseShopType, "custom").and("FIND_IN_SET( " + shopId + ", use_shops ) > 0");
|
||||
});
|
||||
});
|
||||
return page(Page.of(param.getPage(), param.getSize()), queryWrapper);
|
||||
|
||||
@@ -49,20 +49,17 @@ public class MkLimitTimeDiscountServiceImpl extends ServiceImpl<MkLimitTimeDisco
|
||||
public Page<MkLimitTimeDiscountDTO> getLimitTimeDiscountPage(TimeQueryParam param, Long shopId) {
|
||||
Long mainShopId = shopInfoService.getMainIdByShopId(shopId);
|
||||
QueryWrapper queryWrapper = new QueryWrapper();
|
||||
queryWrapper.eq(MkLimitTimeDiscount::getShopId, mainShopId)
|
||||
.eq(MkLimitTimeDiscount::getIsDel, 0)
|
||||
queryWrapper.eq(MkLimitTimeDiscount::getIsDel, 0)
|
||||
.lt(MkLimitTimeDiscount::getValidStartTime, CzgStrUtils.getStrOrNull(param.getStartTime()))
|
||||
.le(MkLimitTimeDiscount::getValidEndTime, CzgStrUtils.getStrOrNull(param.getEndTime()))
|
||||
.orderBy(MkLimitTimeDiscount::getSort).desc()
|
||||
.orderBy(MkLimitTimeDiscount::getUpdateTime).desc();
|
||||
|
||||
queryWrapper.and(q -> {
|
||||
q.eq(MkLimitTimeDiscount::getUseShopType, "all").or(q1 -> {
|
||||
q1.eq(MkLimitTimeDiscount::getUseShopType, "only").eq(MkLimitTimeDiscount::getShopId, shopId);
|
||||
q.eq(MkLimitTimeDiscount::getShopId, shopId).or(q1 -> {
|
||||
q1.eq(MkLimitTimeDiscount::getUseShopType, "all").eq(MkLimitTimeDiscount::getShopId, mainShopId);
|
||||
}).or(q2 -> {
|
||||
q2.eq(MkLimitTimeDiscount::getUseShopType, "custom").and(q3 -> {
|
||||
q3.eq(MkLimitTimeDiscount::getShopId, shopId).or("FIND_IN_SET( " + shopId + ", use_shops ) > 0");
|
||||
});
|
||||
q2.eq(MkLimitTimeDiscount::getUseShopType, "custom").and("FIND_IN_SET( " + shopId + ", use_shops ) > 0");
|
||||
});
|
||||
});
|
||||
Page<MkLimitTimeDiscountDTO> page = pageAs(PageUtil.buildPage(), queryWrapper, MkLimitTimeDiscountDTO.class);
|
||||
|
||||
Reference in New Issue
Block a user