gitee/mall4j
1
1
Fork 0
mirror of https://gitee.com/gz-yami/mall4j.git synced 2025-12-26 07:56:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复订单金额计算错误

Browse Source
This commit is contained in:
chendt 2022-04-25 10:05:55 +08:00
parent f120dc0c55
commit 6aa41a4ea5
3 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yami-shop-api/src/main/java/com/yami/shop/api/listener/ConfirmOrderListener.java
View File

@ -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);

4
yami-shop-service/src/main/java/com/yami/shop/service/impl/SmsLogServiceImpl.java
View File

@ -48,9 +48,9 @@ import java.util.Map.Entry;
@AllArgsConstructor
public class SmsLogServiceImpl extends ServiceImpl<SmsLogMapper, SmsLog> implements SmsLogService {
private SmsLogMapper smsLogMapper;
private final SmsLogMapper smsLogMapper;
private ALiDaYu aLiDaYu;
private final ALiDaYu aLiDaYu;
/**
* 产品名称:云通信短信API产品,开发者无需替换

33
yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportManagerServiceImpl.java
View File

@ -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) {