hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-10-31 10:18:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

【代码评审】门店自提：相关代码的优化、以及 todo 评审

Browse Source
This commit is contained in:
YunaiV
2024-08-07 22:09:31 +08:00
parent 5b59ce5261
commit 8775472af7
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
View File

@@ -55,6 +55,7 @@ public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
if (param.getDeliveryType() == null) { if (param.getDeliveryType() == null) {
return; return;
} }
// TODO @puhui999：需要校验，是不是存在商品不能门店自提，或者不能快递发货的情况。就是说，配送方式不匹配哈
if (DeliveryTypeEnum.PICK_UP.getType().equals(param.getDeliveryType())) { if (DeliveryTypeEnum.PICK_UP.getType().equals(param.getDeliveryType())) {
calculateByPickUp(param); calculateByPickUp(param);
} else if (DeliveryTypeEnum.EXPRESS.getType().equals(param.getDeliveryType())) { } else if (DeliveryTypeEnum.EXPRESS.getType().equals(param.getDeliveryType())) {

6
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointUsePriceCalculator.java
View File

@@ -37,14 +37,12 @@ public class TradePointUsePriceCalculator implements TradePriceCalculator {
@Override @Override
public void calculate(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) { public void calculate(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
// 默认使用积分为 0 // 0. 初始化积分
result.setUsePoint(0);
MemberUserRespDTO user = memberUserApi.getUser(param.getUserId()); MemberUserRespDTO user = memberUserApi.getUser(param.getUserId());
result.setTotalPoint(user.getPoint()); // 设置会员总积分 result.setTotalPoint(user.getPoint()).setUsePoint(0);
// 1.1 校验是否使用积分 // 1.1 校验是否使用积分
if (!BooleanUtil.isTrue(param.getPointStatus())) { if (!BooleanUtil.isTrue(param.getPointStatus())) {
result.setUsePoint(0);
return; return;
} }
// 1.2 校验积分抵扣是否开启 // 1.2 校验积分抵扣是否开启

5
yudao-module-system/yudao-module-system-biz/pom.xml
View File

@@ -110,11 +110,6 @@
<artifactId>wx-java-miniapp-spring-boot-starter</artifactId> <!-- 微信登录（小程序） --> <artifactId>wx-java-miniapp-spring-boot-starter</artifactId> <!-- 微信登录（小程序） -->
</dependency> </dependency>
<dependency>
<groupId>com.tencentcloudapi</groupId>
<artifactId>tencentcloud-sdk-java-sms</artifactId> <!-- 短信（腾讯云） -->
</dependency>
<dependency> <dependency>
<groupId>com.xingyuv</groupId> <groupId>com.xingyuv</groupId>
<artifactId>spring-boot-starter-captcha-plus</artifactId> <!-- 验证码，一般用于登录使用 --> <artifactId>spring-boot-starter-captcha-plus</artifactId> <!-- 验证码，一般用于登录使用 -->