mirror of
https://gitee.com/hhyykk/ipms-sjy.git
synced 2025-08-12 17:21:52 +08:00
code review:积分、优惠劵、佣金等逻辑
This commit is contained in:
@@ -109,8 +109,8 @@ public class TradeOrderDO extends BaseDO {
|
||||
|
||||
/**
|
||||
* 推广人编号
|
||||
* {@link BrokerageUserDO#getId()}
|
||||
* {@link MemberUserRespDTO#getId()}
|
||||
*
|
||||
* 关联 {@link BrokerageUserDO#getId()} 字段,即 {@link MemberUserRespDTO#getId()} 字段
|
||||
*/
|
||||
private Long brokerageUserId;
|
||||
|
||||
|
@@ -229,6 +229,10 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
|
||||
// 生成推广员编号列表
|
||||
List<Long> bindUserIds = buildBindUserIdsByLevel(userId, pageReqVO.getLevel());
|
||||
|
||||
// TODO @疯狂:情况一和情况二,可以合并哈;
|
||||
// 如果有 nickname 的时候,相当于提前查询 users,然后 nickname 过滤掉 bindUserIds;
|
||||
// 之后,继续使用 selectSummaryPageByUserId 里面 in bindUserIds 查询;
|
||||
|
||||
// 情况一:没有昵称过滤条件时,直接使用数据库的分页查询
|
||||
if (StrUtil.isBlank(pageReqVO.getNickname())) {
|
||||
// 1.1 分页查询
|
||||
|
@@ -236,6 +236,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
|
||||
order.setReceiverName(createReqVO.getReceiverName()).setReceiverMobile(createReqVO.getReceiverMobile());
|
||||
order.setPickUpVerifyCode(RandomUtil.randomNumbers(8)); // 随机一个核销码,长度为 8 位
|
||||
}
|
||||
// TODO @疯狂:是不是可以在这里设置下推广人哈;
|
||||
tradeOrderMapper.insert(order);
|
||||
return order;
|
||||
}
|
||||
|
@@ -82,7 +82,7 @@ public class TradePriceServiceImpl implements TradePriceService {
|
||||
|
||||
private List<ProductSpuRespDTO> checkSpuList(List<ProductSkuRespDTO> skuList) {
|
||||
// 获得商品 SPU 数组
|
||||
return productSpuApi.getSpuListAndValidate(convertSet(skuList, ProductSkuRespDTO::getSpuId));
|
||||
return productSpuApi.validateSpuList(convertSet(skuList, ProductSkuRespDTO::getSpuId));
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -17,6 +17,7 @@ import static java.util.Arrays.asList;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
// TODO 芋艿:晚点 review
|
||||
/**
|
||||
* {@link TradePointGiveCalculator} 的单元测试类
|
||||
*
|
||||
@@ -95,4 +96,4 @@ public class TradePointGiveCalculatorTest extends BaseMockitoUnitTest {
|
||||
assertEquals(orderItem04.getPrice(), 60);
|
||||
assertEquals(orderItem04.getGivePoint(), 100); // 全局积分 + SKU 积分,但是未选中
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
// TODO 芋艿:晚点 review
|
||||
/**
|
||||
* {@link TradePointUsePriceCalculator } 的单元测试类
|
||||
*
|
||||
@@ -329,4 +330,4 @@ public class TradePointUsePriceCalculatorTest extends BaseMockitoUnitTest {
|
||||
// 断言:Promotion 部分
|
||||
assertEquals(result.getPromotions().size(), 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user