diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/listener/ConfirmOrderListener.java b/yami-shop-api/src/main/java/com/yami/shop/api/listener/ConfirmOrderListener.java index 4b0ded8..c7f11c7 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/listener/ConfirmOrderListener.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/listener/ConfirmOrderListener.java @@ -90,7 +90,7 @@ public class ConfirmOrderListener { } shopCartItem.setActualTotal(shopCartItem.getProductTotalAmount()); - shopCartOrderDto.setActualTotal(Arith.sub(total, transfee)); + shopCartOrderDto.setActualTotal(Arith.add(total, transfee)); shopCartOrderDto.setTotal(total); shopCartOrderDto.setTotalCount(totalCount); shopCartOrderDto.setTransfee(transfee); diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/SmsLogServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/SmsLogServiceImpl.java index c5a830e..92ef6cf 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/SmsLogServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/SmsLogServiceImpl.java @@ -48,9 +48,9 @@ import java.util.Map.Entry; @AllArgsConstructor public class SmsLogServiceImpl extends ServiceImpl implements SmsLogService { - private SmsLogMapper smsLogMapper; + private final SmsLogMapper smsLogMapper; - private ALiDaYu aLiDaYu; + private final ALiDaYu aLiDaYu; /** * 产品名称:云通信短信API产品,开发者无需替换 diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportManagerServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportManagerServiceImpl.java index 172f59d..cf0ec91 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportManagerServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportManagerServiceImpl.java @@ -10,34 +10,21 @@ package com.yami.shop.service.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; +import cn.hutool.core.collection.CollectionUtil; import com.yami.shop.bean.app.dto.ProductItemDto; import com.yami.shop.bean.enums.TransportChargeType; +import com.yami.shop.bean.model.*; +import com.yami.shop.common.util.Arith; import com.yami.shop.common.util.Json; -import com.yami.shop.service.*; -import org.apache.commons.lang3.StringUtils; +import com.yami.shop.service.ProductService; +import com.yami.shop.service.SkuService; +import com.yami.shop.service.TransportManagerService; +import com.yami.shop.service.TransportService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.SpringApplication; import org.springframework.stereotype.Service; -import com.yami.shop.bean.app.dto.OrderItemDto; -import com.yami.shop.bean.model.Area; -import com.yami.shop.bean.model.Product; -import com.yami.shop.bean.model.Sku; -import com.yami.shop.bean.model.Transfee; -import com.yami.shop.bean.model.TransfeeFree; -import com.yami.shop.bean.model.Transport; -import com.yami.shop.bean.model.UserAddr; -import com.yami.shop.common.util.Arith; - -import cn.hutool.core.collection.CollectionUtil; +import java.util.List; +import java.util.Objects; @Service public class TransportManagerServiceImpl implements TransportManagerService { @@ -58,7 +45,7 @@ public class TransportManagerServiceImpl implements TransportManagerService { Product.DeliveryModeVO deliveryModeVO = Json.parseObject(product.getDeliveryMode(), Product.DeliveryModeVO.class); // 没有店铺配送的方式 - if (deliveryModeVO.getHasShopDelivery()) { + if (!deliveryModeVO.getHasShopDelivery()) { return 0.0; } if (product.getDeliveryTemplateId() == null) {