caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!77 修复获取拼团订单时，搜索条件默认锁定了当前会员id问题

Browse Source 
Merge pull request !77 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep 2021-12-13 06:50:50 +00:00 committed by Gitee
commit b719e96838
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
View File

@ -129,7 +129,7 @@ public class OrderSearchParams extends PageVO {
&& CharSequenceUtil.isNotEmpty(storeId), "o.store_id", storeId); && CharSequenceUtil.isNotEmpty(storeId), "o.store_id", storeId);
//按买家查询 //按买家查询
wrapper.eq(CharSequenceUtil.equals(currentUser.getRole().name(), UserEnums.MEMBER.name()), "o.member_id", currentUser.getId()); wrapper.eq(CharSequenceUtil.equals(currentUser.getRole().name(), UserEnums.MEMBER.name()) && CharSequenceUtil.isEmpty(memberId), "o.member_id", currentUser.getId());
} }
//按照买家查询 //按照买家查询
@ -203,7 +203,7 @@ public class OrderSearchParams extends PageVO {
} }
// 依赖订单 // 依赖订单
wrapper.eq(CharSequenceUtil.isNotEmpty(parentOrderSn), "o.parent_order_sn", parentOrderSn); wrapper.eq(parentOrderSn != null, "o.parent_order_sn", parentOrderSn);
// 促销活动id // 促销活动id
wrapper.eq(CharSequenceUtil.isNotEmpty(promotionId), "o.promotion_id", promotionId); wrapper.eq(CharSequenceUtil.isNotEmpty(promotionId), "o.promotion_id", promotionId);

4
framework/src/main/java/cn/lili/modules/promotion/entity/vos/kanjia/KanjiaActivityGoodsParams.java
View File

@ -5,6 +5,7 @@ import cn.hutool.core.text.CharSequenceUtil;
import cn.lili.common.security.context.UserContext; import cn.lili.common.security.context.UserContext;
import cn.lili.common.security.enums.UserEnums; import cn.lili.common.security.enums.UserEnums;
import cn.lili.modules.promotion.entity.enums.PromotionsStatusEnum; import cn.lili.modules.promotion.entity.enums.PromotionsStatusEnum;
import cn.lili.modules.promotion.tools.PromotionTools;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -48,7 +49,7 @@ public class KanjiaActivityGoodsParams implements Serializable {
queryWrapper.like("goods_name", goodsName); queryWrapper.like("goods_name", goodsName);
} }
if (promotionStatus != null) { if (promotionStatus != null) {
queryWrapper.eq("promotion_status", promotionStatus); queryWrapper.and(PromotionTools.queryPromotionStatus(PromotionsStatusEnum.valueOf(promotionStatus)));
} }
if (startTime != null) { if (startTime != null) {
queryWrapper.le("start_time", new Date(startTime)); queryWrapper.le("start_time", new Date(startTime));
@ -57,7 +58,6 @@ public class KanjiaActivityGoodsParams implements Serializable {
queryWrapper.ge("end_time", new Date(endTime)); queryWrapper.ge("end_time", new Date(endTime));
} }
if (UserContext.getCurrentUser() != null && UserContext.getCurrentUser().getRole().equals(UserEnums.MEMBER)) { if (UserContext.getCurrentUser() != null && UserContext.getCurrentUser().getRole().equals(UserEnums.MEMBER)) {
queryWrapper.gt("stock", 0); queryWrapper.gt("stock", 0);
} }
queryWrapper.eq("delete_flag", false); queryWrapper.eq("delete_flag", false);

1
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
View File

@ -87,6 +87,7 @@ public class PintuanServiceImpl extends AbstractPromotionsServiceImpl<PintuanMap
searchParams.setPromotionId(pintuanId); searchParams.setPromotionId(pintuanId);
searchParams.setOrderPromotionType(PromotionTypeEnum.PINTUAN.name()); searchParams.setOrderPromotionType(PromotionTypeEnum.PINTUAN.name());
searchParams.setParentOrderSn(""); searchParams.setParentOrderSn("");
searchParams.setMemberId("");
List<Order> orders = orderService.queryListByParams(searchParams); List<Order> orders = orderService.queryListByParams(searchParams);
//遍历订单状态为已支付，为团长的拼团订单 //遍历订单状态为已支付，为团长的拼团订单
for (Order order : orders) { for (Order order : orders) {