From fcc1ced7adbaf3338c1e68b0c90275dfae14b4f8 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 17 Feb 2025 10:45:57 +0800
Subject: [PATCH] test: 更新测试用例中的运单编号
---
src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java
index a84321d..ecc1d42 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java
@@ -55,6 +55,7 @@
if(ObjectUtil.isNotEmpty(state)){
mallActivityLambdaQueryWrapper.eq(MallActivity::getState,state);
}
+ mallActivityLambdaQueryWrapper.orderByDesc(MallActivity::getCreatedTime);
Page<MallActivity> mallActivityPage = this.baseMapper.selectPage(page, mallActivityLambdaQueryWrapper);
return mallActivityPage;
}
@@ -146,7 +147,7 @@
private Long addGoodsEntity(MallActivity mallActivity,BigDecimal discountSize,MallGoods mallGoodsItem){
mallGoodsItem.setIsNormal(GoodsTypeEnum.HUO_DONG.getValue());
mallGoodsItem.setGoodsName(mallActivity.getName()+"-"+(StrUtil.isEmpty(mallGoodsItem.getGoodsName()) ? "":mallGoodsItem.getGoodsName()));
- mallGoodsItem.setGoodsNo(mallGoodsItem.getGoodsNo()+"-"+mallActivity.getCode());
+ mallGoodsItem.setGoodsNo("HD"+mallActivity.getId()+"-"+mallGoodsItem.getGoodsNo());
mallGoodsItem.setActivityId(mallActivity.getId());
BigDecimal presentPrice = new BigDecimal(mallGoodsItem.getPresentPrice()).multiply(discountSize).setScale(2, RoundingMode.DOWN);
mallGoodsItem.setPresentPrice(presentPrice.toString());
@@ -200,14 +201,14 @@
List<MallActivity> mallActivities = this.baseMapper.selectList(
new LambdaQueryWrapper<MallActivity>()
- .select(MallActivity::getId, MallActivity::getName)
+ .select(MallActivity::getId, MallActivity::getName, MallActivity::getState, MallActivity::getType)
);
if(CollUtil.isNotEmpty(mallActivities)){
for (MallActivity mallActivity : mallActivities) {
AdminMallActivityListVo adminMallActivityListVo = new AdminMallActivityListVo();
adminMallActivityListVo.setId(mallActivity.getId());
- String desc = YesOrNoOrIngEnum.getEnum(mallActivity.getState()).getDesc();
- String desc1 = ActivityTypeEnum.getEnum(mallActivity.getType()).getDesc();
+ String desc = YesOrNoOrIngEnum.YES.getActivityDesc(mallActivity.getState());
+ String desc1 = ActivityTypeEnum.ZHE_KOU.getActivityType(mallActivity.getType());
adminMallActivityListVo.setName(mallActivity.getName()+desc+desc1);
mallActivityList.add(adminMallActivityListVo);
}
@@ -227,9 +228,11 @@
.eq(MallGoods::getActivityId, id)
);
if(CollUtil.isNotEmpty(mallGoods)){
- mallGoodsMapper.update(null,
+ MallGoods goods = new MallGoods();
+ goods.setIsSale(MallGoods.ISSALE_STATUS_DISABLED);
+ mallGoodsMapper.update(goods,
new LambdaQueryWrapper<MallGoods>()
- .eq(MallGoods::getIsSale, MallGoods.ISSALE_STATUS_DISABLED)
+ .eq(MallGoods::getIsSale, MallGoods.ISSALE_STATUS_ENABLE)
.eq(MallGoods::getActivityId, id)
);
}
@@ -249,14 +252,14 @@
List<AdminMallActivityListVo> mallActivityList = new ArrayList<>();
List<MallActivity> mallActivities = this.baseMapper.selectList(
new LambdaQueryWrapper<MallActivity>()
- .select(MallActivity::getId, MallActivity::getName)
+ .select(MallActivity::getId, MallActivity::getName, MallActivity::getState)
.eq(MallActivity::getType, type)
);
if(CollUtil.isNotEmpty(mallActivities)){
for (MallActivity mallActivity : mallActivities) {
AdminMallActivityListVo adminMallActivityListVo = new AdminMallActivityListVo();
adminMallActivityListVo.setId(mallActivity.getId());
- String desc = YesOrNoOrIngEnum.getEnum(mallActivity.getState()).getDesc();
+ String desc = YesOrNoOrIngEnum.YES.getActivityDesc(mallActivity.getState());
adminMallActivityListVo.setName(mallActivity.getName()+desc);
mallActivityList.add(adminMallActivityListVo);
}
--
Gitblit v1.9.1