修复

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);
+        BigDecimal expressFee = new BigDecimal(0);
-        QueryWrapper<SysConfigEntity> configQueryWrapper = new QueryWrapper<>();
+        if(totalWeight.compareTo(BigDecimal.ZERO)!=0){
-        configQueryWrapper.eq("param_key", "DEFAULT_EXPRESS");
+            totalWeight = totalWeight.setScale(0, RoundingMode.UP);
-        SysConfigEntity config = sysConfigService.getOne(configQueryWrapper);
+            QueryWrapper<SysConfigEntity> configQueryWrapper = new QueryWrapper<>();
-        BigDecimal expressFee = expressFeeService.calculateExpressFee(config.getParamValue(), totalWeight, regionCode);
+            configQueryWrapper.eq("param_key", "DEFAULT_EXPRESS");
+            SysConfigEntity config = sysConfigService.getOne(configQueryWrapper);
+            expressFee = expressFeeService.calculateExpressFee(config.getParamValue(), totalWeight, regionCode);
+        }
+
         return R.ok().put("result", expressFee);
     }
 

src/main/java/com/peanut/modules/book/entity/ExpressOrder.java

@@ -27,7 +27,7 @@ public class ExpressOrder {
     /**
      * 订单Sn
      */
-    private String orderSn;
+//    private String orderSn;
     /**
      * 省份
      */

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,

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<BuyOrderDao, BuyOrder> 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<BuyOrderDao, BuyOrder> 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<BuyOrderDao, BuyOrder> impl
     private BuyOrderResponseVo setBuyOrderInfo(BuyOrder buyOrder) {
         BuyOrderResponseVo responseVo = new BuyOrderResponseVo();
         responseVo.setOrderId(buyOrder.getOrderId());
+        responseVo.setTimestamp(buyOrder.getCreateTime().getTime());
         Integer userId = buyOrder.getUserId();
         QueryWrapper<MyUserEntity> userEntityQueryWrapper = new QueryWrapper<>();
         userEntityQueryWrapper.eq("id", userId);
@@ -463,6 +466,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> 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());

src/main/java/com/peanut/modules/book/service/impl/ExpressOrderServiceImpl.java

@@ -43,7 +43,7 @@ public class ExpressOrderServiceImpl extends ServiceImpl<ExpressOrderDao, Expres
     public ExpressOrderResponseVo placeExpressOrder(ExpressOrder expressOrder) {
         ExpressOrderRequestVo orderRequestVo = new ExpressOrderRequestVo();
         // 订单号
-        orderRequestVo.setOrderCode(expressOrder.getOrderSn());
+//        orderRequestVo.setOrderCode(expressOrder.getOrderSn());
         orderRequestVo.setIsReturnPrintTemplate(1);
         orderRequestVo.setShipperCode(expressOrder.getExpressCompanyCode());
         orderRequestVo.setPayType(3);

src/main/java/com/peanut/modules/book/vo/response/BuyOrderResponseVo.java

@@ -3,6 +3,7 @@ package com.peanut.modules.book.vo.response;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
 
@@ -74,6 +75,8 @@ public class BuyOrderResponseVo {
      * 创建时间
      */
     private Date createTime;
+
+    private Long timestamp;
     /**
      * 发货时间
      */

src/main/java/com/peanut/modules/book/vo/response/CouponResponseVo.java

@@ -19,4 +19,6 @@ public class CouponResponseVo {
      * 优惠券金额
      */
     Integer couponId;
+
+    BigDecimal couponAmount;
 }

src/main/resources/application-dev.yml

@@ -19,7 +19,7 @@ spring:
       driver-class-name: com.mysql.cj.jdbc.Driver
       url: jdbc:mysql://59.110.212.44:3306/e_book_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
       username: root
-      password: HSXY1234hsxy
+      password: Jgll2023Nutty
       initial-size: 10
       max-active: 100
       min-idle: 10

src/main/resources/application.yml

@@ -11,7 +11,7 @@ connection-timeout: 6000000ms
 spring:
   # 环境 dev|test|prod
   profiles:
-    active: dev-wcl
+    active: dev
   # jackson时间格式化
   jackson:
     time-zone: GMT+8