bugs fix

src/main/java/com/peanut/modules/book/controller/BuyOrderController.java

@@ -257,13 +257,13 @@ public class BuyOrderController {
         buyOrder.setProvince(vo.getProvince());
         buyOrder.setCity(vo.getCity());
         buyOrder.setDistrict(vo.getCounty());
-        buyOrder.setAddress(vo.getDetailAddress());
+        buyOrder.setAddress(userAddress.getDetailAddress());
         buyOrderService.save(buyOrder);
 
-        for (BuyOrderProduct buyOrderDetail : buyOrderProductList) {
+        for (BuyOrderProduct buyOrderProduct : buyOrderProductList) {
-            buyOrderDetail.setOrderId(buyOrder.getId());
+            buyOrderProduct.setOrderId(buyOrder.getId());
             if (Constants.BUY_TYPE_CART.equals(buyOrder.getBuyType())) {
-                handleBuyCart(buyOrder, buyOrderDetail);
+                handleBuyCart(buyOrder, buyOrderProduct);
             }
         }
         buyOrderProductService.saveBatch(buyOrderProductList);

src/main/java/com/peanut/modules/book/controller/ExpressController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.peanut.common.utils.R;
+import com.peanut.modules.book.entity.ExpressCompany;
 import com.peanut.modules.book.entity.ExpressOrder;
 import com.peanut.modules.book.service.ExpressCompanyService;
 import com.peanut.modules.book.service.ExpressOrderService;
@@ -52,14 +53,11 @@ public class ExpressController {
      * @return R
      */
     @RequestMapping(path = "/getPrintTemplateList", method = RequestMethod.GET)
-    public R getPrintTemplate(@RequestParam(value = "expressOrderSn", required = false) String expressOrderSn,
+    public R getPrintTemplate(@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                               @RequestParam(value = "currentPage", defaultValue = "1") Integer currentPage) {
         Page<ExpressOrder> expressOrderPage = new Page<>(currentPage, pageSize);
         QueryWrapper<ExpressOrder> expressOrderQueryWrapper = new QueryWrapper<>();
-        if (expressOrderSn != null) {
+
-            expressOrderQueryWrapper.eq("express_order_sn", expressOrderSn);
-        }
         int totalDataSize = expressOrderService.count(expressOrderQueryWrapper);
         int totalPage = totalDataSize / pageSize + 1;
         Page<ExpressOrder> page = expressOrderService.page(expressOrderPage, expressOrderQueryWrapper);
@@ -67,7 +65,10 @@ public class ExpressController {
         List<PrintTemplateVo> data = new ArrayList<>();
         for (ExpressOrder expressOrder : expressOrderList) {
             PrintTemplateVo vo = new PrintTemplateVo();
-            vo.setExpressCompanyCode(expressOrder.getExpressCompanyCode());
+            QueryWrapper<ExpressCompany> expressCompanyQueryWrapper = new QueryWrapper<>();
+            expressCompanyQueryWrapper.eq("code", expressOrder.getExpressCompanyCode());
+            ExpressCompany expressCompany = expressCompanyService.getOne(expressCompanyQueryWrapper);
+            vo.setExpressCompanyCode(expressCompany.getName());
             vo.setPrintTemplate(expressOrder.getPrintTemplate());
             vo.setExpressOrderSn(expressOrder.getExpressOrderSn());
             vo.setTemplatedPrinted(vo.getTemplatedPrinted());

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

@@ -20,6 +20,10 @@ public class ExpressOrder {
      * ID
      */
     private int id;
+    /**
+     * 订单Sn
+     */
+    private String orderSn;
     /**
      * 省份
      */

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

@@ -30,6 +30,8 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static org.apache.poi.hemf.hemfplus.record.HemfPlusRecordType.save;
+
 
 @Service("buyOrderService")
 public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> implements BuyOrderService {
@@ -320,6 +322,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.orderByDesc("create_time");
 
         Integer totalSize = list(buyOrderQueryWrapper).size();
         Integer totalPage = totalSize / requestVo.getPageSize() + 1;
@@ -374,6 +377,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         expressOrder.setCreateTime(new Date());
         expressOrder.setTotalWeight(totalWeight);
         expressOrder.setCommodity(commodityList);
+        expressOrder.setOrderSn(buyOrder.getOrderSn());
         expressOrder.setExpressCompanyCode(expressCompanyCode);
         expressOrder.setConsigneeName(buyOrder.getShippingUser());
         expressOrder.setConsigneeMobile(buyOrder.getUserPhone());
@@ -387,7 +391,11 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         String printTemplate = response.getPrintTemplate();
         expressOrder.setExpressOrderSn(expressOrderSn);
         expressOrder.setPrintTemplate(printTemplate);
-        expressOrderService.save(expressOrder);
+        int expressOrderId = expressOrderService.getBaseMapper().insert(expressOrder);
+        for (BuyOrderProduct buyOrderProduct : buyOrderProductList) {
+            buyOrderProduct.setExpressOrderId(expressOrderId);
+        }
+        buyOrderProductService.updateBatchById(buyOrderProductList);
     }
 
     @Override
@@ -406,6 +414,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
      */
     private BuyOrderResponseVo setBuyOrderInfo(BuyOrder buyOrder) {
         BuyOrderResponseVo responseVo = new BuyOrderResponseVo();
+        responseVo.setOrderId(buyOrder.getId());
         Integer userId = buyOrder.getUserId();
         QueryWrapper<MyUserEntity> userEntityQueryWrapper = new QueryWrapper<>();
         userEntityQueryWrapper.eq("id", userId);
@@ -462,16 +471,20 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
             QueryWrapper<ShopProduct> shopProductQueryWrapper = new QueryWrapper<>();
             shopProductQueryWrapper.eq("product_id", buyOrderProduct.getProductId());
             ShopProduct shopProduct = shopProductService.getOne(shopProductQueryWrapper);
+            goodsResponseVo.setBuyOrderProductId(buyOrderProduct.getId());
             goodsResponseVo.setProductName(shopProduct.getProductName());
             goodsResponseVo.setProductImage(shopProduct.getProductImages());
             goodsResponseVo.setProductPrice(shopProduct.getPrice());
+            goodsResponseVo.setQuantity(buyOrderProduct.getQuantity());
             QueryWrapper<ExpressOrder> expressOrderQueryWrapper = new QueryWrapper<>();
             expressOrderQueryWrapper.eq("id", buyOrderProduct.getExpressOrderId());
             ExpressOrder expressOrder = expressOrderService.getOne(expressOrderQueryWrapper);
             ExpressResponseVo expressResponseVo = new ExpressResponseVo();
-            expressResponseVo.setExpressCompany(expressOrder.getExpressCompanyCode());
+            if (expressOrder != null) {
-            expressResponseVo.setExpressOrderSn(expressOrder.getExpressOrderSn());
+                expressResponseVo.setExpressCompany(expressOrder.getExpressCompanyCode());
-            expressResponseVo.setPrintTemplate(expressOrder.getPrintTemplate());
+                expressResponseVo.setExpressOrderSn(expressOrder.getExpressOrderSn());
+                expressResponseVo.setPrintTemplate(expressOrder.getPrintTemplate());
+            }
             goodsResponseVo.setExpressInfo(expressResponseVo);
             goodsResponseVoList.add(goodsResponseVo);
         }

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

@@ -52,7 +52,7 @@ public class ExpressFeeServiceImpl extends ServiceImpl<ExpressFeeDao, ExpressFee
             additionalWeight = weight.subtract(new BigDecimal(15));
         }
         QueryWrapper<ExpressFee> queryWrapper = new QueryWrapper<>();
-        if(!regionCode.startsWith("11") && !regionCode.startsWith("12") && !regionCode.startsWith("31") && !regionCode.startsWith("50")){
+        if (!regionCode.startsWith("11") && !regionCode.startsWith("12") && !regionCode.startsWith("31") && !regionCode.startsWith("50")) {
             regionCode = regionCode.substring(0, 4).concat("00");
         }
         queryWrapper.eq("dest_code", regionCode);
@@ -72,7 +72,11 @@ public class ExpressFeeServiceImpl extends ServiceImpl<ExpressFeeDao, ExpressFee
      * @return 费用
      */
     private BigDecimal calculateYDExpressFee(BigDecimal weight, String regionCode) {
-        regionCode = regionCode.substring(0, 4).concat("00");
+        if (regionCode.startsWith("11") || regionCode.startsWith("12") || regionCode.startsWith("31") || regionCode.startsWith("50")) {
+            regionCode = regionCode.substring(0, 2).concat("0000");
+        } else {
+            regionCode = regionCode.substring(0, 4).concat("00");
+        }
         QueryWrapper<ExpressFee> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("dest_code", regionCode);
         queryWrapper.eq("express_code", "YD");

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.getOrderId().toString());
+        orderRequestVo.setOrderCode(expressOrder.getOrderSn());
         orderRequestVo.setIsReturnPrintTemplate(1);
         orderRequestVo.setShipperCode(expressOrder.getExpressCompanyCode());
         orderRequestVo.setPayType(3);

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

@@ -43,6 +43,7 @@ public class UserAddressServiceImpl extends ServiceImpl<UserAddressDao, UserAddr
         return new PageUtils(page);
     }
 
+    @Override
     public UserAddressVo getAddressName(UserAddressVo vo, String regionCode) {
         QueryWrapper<County> countyQueryWrapper = new QueryWrapper<>();
         countyQueryWrapper.eq("region_code", regionCode);

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

@@ -13,6 +13,7 @@ import java.util.List;
  */
 @Data
 public class BuyOrderResponseVo {
+    private Integer orderId;
     /**
      * 订单号
      */

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

@@ -11,6 +11,7 @@ import java.math.BigDecimal;
  */
 @Data
 public class GoodsResponseVo {
+    private Integer buyOrderProductId;
     /**
      * 商品名称
      */