From c5e6cfdc89327a4abb57bb32e9477b0b52d87a14 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Thu, 26 Oct 2023 17:52:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../book/controller/BuyOrderController.java | 17 ++++++++++++----- .../modules/book/entity/ExpressOrder.java | 2 +- .../peanut/modules/book/entity/ShopProduct.java | 2 +- .../book/service/impl/BuyOrderServiceImpl.java | 6 +++++- .../service/impl/ExpressOrderServiceImpl.java | 2 +- .../book/vo/response/BuyOrderResponseVo.java | 3 +++ .../book/vo/response/CouponResponseVo.java | 2 ++ src/main/resources/application-dev.yml | 2 +- src/main/resources/application.yml | 2 +- 9 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java index f082a366..65845e4f 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -313,14 +313,21 @@ public class BuyOrderController { BigDecimal totalWeight = new BigDecimal(0); for (ProductRequestVo product : products) { ShopProduct shopProduct = shopProductService.getById(product.getProductId()); + if(shopProduct.getIsFreeMail()==0){ + continue; + } BigDecimal weight = BigDecimal.valueOf(Double.valueOf(shopProduct.getWeight()) / 1000.0); totalWeight = totalWeight.add(weight.multiply(new BigDecimal(product.getQuantity()))); } - totalWeight = totalWeight.setScale(0, RoundingMode.UP); - QueryWrapper configQueryWrapper = new QueryWrapper<>(); - configQueryWrapper.eq("param_key", "DEFAULT_EXPRESS"); - SysConfigEntity config = sysConfigService.getOne(configQueryWrapper); - BigDecimal expressFee = expressFeeService.calculateExpressFee(config.getParamValue(), totalWeight, regionCode); + BigDecimal expressFee = new BigDecimal(0); + if(totalWeight.compareTo(BigDecimal.ZERO)!=0){ + totalWeight = totalWeight.setScale(0, RoundingMode.UP); + QueryWrapper configQueryWrapper = new QueryWrapper<>(); + configQueryWrapper.eq("param_key", "DEFAULT_EXPRESS"); + SysConfigEntity config = sysConfigService.getOne(configQueryWrapper); + expressFee = expressFeeService.calculateExpressFee(config.getParamValue(), totalWeight, regionCode); + } + return R.ok().put("result", expressFee); } diff --git a/src/main/java/com/peanut/modules/book/entity/ExpressOrder.java b/src/main/java/com/peanut/modules/book/entity/ExpressOrder.java index aeaab793..4f54c7da 100644 --- a/src/main/java/com/peanut/modules/book/entity/ExpressOrder.java +++ b/src/main/java/com/peanut/modules/book/entity/ExpressOrder.java @@ -27,7 +27,7 @@ public class ExpressOrder { /** * 订单Sn */ - private String orderSn; +// private String orderSn; /** * 省份 */ diff --git a/src/main/java/com/peanut/modules/book/entity/ShopProduct.java b/src/main/java/com/peanut/modules/book/entity/ShopProduct.java index f9633996..7bcf239c 100644 --- a/src/main/java/com/peanut/modules/book/entity/ShopProduct.java +++ b/src/main/java/com/peanut/modules/book/entity/ShopProduct.java @@ -138,7 +138,7 @@ public class ShopProduct implements Serializable { /** * 是否包邮 0：包邮 ，1：不包邮 */ - private Object isFreeMail; + private Integer isFreeMail; /** * 绑定电子书id, diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java index 6f6b24e5..2e4bf5f6 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java @@ -27,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.RoundingMode; +import java.security.Timestamp; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -336,6 +337,7 @@ public class BuyOrderServiceImpl extends ServiceImpl impl buyOrderQueryWrapper.eq(StringUtils.isNotBlank(requestVo.getOrderStatus()), "order_status", requestVo.getOrderStatus()); buyOrderQueryWrapper.gt(requestVo.getStartTime() != null, "create_time", requestVo.getStartTime()); buyOrderQueryWrapper.lt(requestVo.getEndTime() != null, "create_time", requestVo.getStartTime()); + buyOrderQueryWrapper.eq("order_type","order"); buyOrderQueryWrapper.orderByDesc("create_time"); Integer totalSize = list(buyOrderQueryWrapper).size(); @@ -393,7 +395,7 @@ public class BuyOrderServiceImpl extends ServiceImpl impl expressOrder.setCreateTime(new Date()); expressOrder.setTotalWeight(totalWeight); expressOrder.setCommodity(commodityList); - expressOrder.setOrderSn(buyOrder.getOrderSn()); +// expressOrder.setOrderSn(buyOrder.getOrderSn()); expressOrder.setExpressCompanyCode(expressCompanyCode); expressOrder.setConsigneeName(buyOrder.getShippingUser()); expressOrder.setConsigneeMobile(buyOrder.getUserPhone()); @@ -446,6 +448,7 @@ public class BuyOrderServiceImpl extends ServiceImpl impl private BuyOrderResponseVo setBuyOrderInfo(BuyOrder buyOrder) { BuyOrderResponseVo responseVo = new BuyOrderResponseVo(); responseVo.setOrderId(buyOrder.getOrderId()); + responseVo.setTimestamp(buyOrder.getCreateTime().getTime()); Integer userId = buyOrder.getUserId(); QueryWrapper userEntityQueryWrapper = new QueryWrapper<>(); userEntityQueryWrapper.eq("id", userId); @@ -463,6 +466,7 @@ public class BuyOrderServiceImpl extends ServiceImpl impl if (buyOrder.getCouponId() != null) { couponResponseVo.setCouponName(buyOrder.getCouponName()); couponResponseVo.setCouponId(buyOrder.getCouponId()); + couponResponseVo.setCouponAmount(new BigDecimal(0)); } responseVo.setCoupon(couponResponseVo); responseVo.setOrderPrice(buyOrder.getOrderMoney()); diff --git a/src/main/java/com/peanut/modules/book/service/impl/ExpressOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/ExpressOrderServiceImpl.java index 27e727a6..cd771f3f 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/ExpressOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/ExpressOrderServiceImpl.java @@ -43,7 +43,7 @@ public class ExpressOrderServiceImpl extends ServiceImpl