From c23bb86aca62db07e1fc4f57ebef51cb1bb404b2 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 8 Dec 2023 17:24:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/book/entity/BuyOrderProduct.java | 2 + .../service/impl/BuyOrderServiceImpl.java | 55 ++++++++++--------- .../book/service/impl/PointServiceImpl.java | 20 ++++++- 3 files changed, 48 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/entity/BuyOrderProduct.java b/src/main/java/com/peanut/modules/book/entity/BuyOrderProduct.java index 777419ec..3a58b3dc 100644 --- a/src/main/java/com/peanut/modules/book/entity/BuyOrderProduct.java +++ b/src/main/java/com/peanut/modules/book/entity/BuyOrderProduct.java @@ -53,4 +53,6 @@ public class BuyOrderProduct { @TableField(exist = false) private ShopProduct product; + @TableField(exist = false) + private ExpressOrder expressOrder; } 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 357d3b19..e87f99f9 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 @@ -383,36 +383,37 @@ public class BuyOrderServiceImpl extends ServiceImpl impl ShopProduct byId = shopProductService.getById(b1.getProductId()); byId.setBooks(shopProductBookService.getBookByProductId(byId.getProductId())); b1.setProduct(byId); + b1.setExpressOrder(expressOrderDao.selectById(b1.getExpressOrderId())); } b.setProductList(buyOrderProducts); //添加快递包裹信息 - LambdaQueryWrapper b_wrapper = new LambdaQueryWrapper<>(); - b_wrapper.eq(BuyOrderProduct::getOrderId,b.getOrderId()); - b_wrapper.gt(BuyOrderProduct::getExpressOrderId,0); - List collect = buyOrderProductService.getBaseMapper().selectList(b_wrapper).stream().map(BuyOrderProduct::getExpressOrderId).collect(Collectors.toList()); - if(collect.size()>0){ - List expressOrders = expressOrderService.getBaseMapper().selectList(new LambdaQueryWrapper().in(ExpressOrder::getId, collect)); - for (ExpressOrder e : expressOrders){ - MPJLambdaWrapper buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>(); - buyOrderProductMPJLambdaWrapper.selectAll(ShopProduct.class); - buyOrderProductMPJLambdaWrapper.select(BuyOrderProduct::getQuantity); - buyOrderProductMPJLambdaWrapper.select(BuyOrder::getOrderSn); - buyOrderProductMPJLambdaWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId); - buyOrderProductMPJLambdaWrapper.leftJoin(BuyOrder.class,BuyOrder::getOrderId,BuyOrderProduct::getOrderId); - buyOrderProductMPJLambdaWrapper.eq(BuyOrderProduct::getExpressOrderId,e.getId()); - List shopProducts = buyOrderProductDao.selectJoinList(ShopProduct.class, buyOrderProductMPJLambdaWrapper); - for(ShopProduct s : shopProducts){ - MPJLambdaWrapper shopProductBookEntityMPJLambdaWrapper = new MPJLambdaWrapper<>(); - shopProductBookEntityMPJLambdaWrapper.selectAll(BookEntity.class); - shopProductBookEntityMPJLambdaWrapper.leftJoin(BookEntity.class,BookEntity::getId,ShopProductBookEntity::getBookId); - shopProductBookEntityMPJLambdaWrapper.eq(ShopProductBookEntity::getProductId,s.getProductId()); - List bookEntities = shopProductBookDao.selectJoinList(BookEntity.class, shopProductBookEntityMPJLambdaWrapper); - s.setBooks(bookEntities); - } - e.setProducts(shopProducts); - } - b.setExpressList(expressOrders); - } +// LambdaQueryWrapper b_wrapper = new LambdaQueryWrapper<>(); +// b_wrapper.eq(BuyOrderProduct::getOrderId,b.getOrderId()); +// b_wrapper.gt(BuyOrderProduct::getExpressOrderId,0); +// List collect = buyOrderProductService.getBaseMapper().selectList(b_wrapper).stream().map(BuyOrderProduct::getExpressOrderId).collect(Collectors.toList()); +// if(collect.size()>0){ +// List expressOrders = expressOrderService.getBaseMapper().selectList(new LambdaQueryWrapper().in(ExpressOrder::getId, collect)); +// for (ExpressOrder e : expressOrders){ +// MPJLambdaWrapper buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>(); +// buyOrderProductMPJLambdaWrapper.selectAll(ShopProduct.class); +// buyOrderProductMPJLambdaWrapper.select(BuyOrderProduct::getQuantity); +// buyOrderProductMPJLambdaWrapper.select(BuyOrder::getOrderSn); +// buyOrderProductMPJLambdaWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId); +// buyOrderProductMPJLambdaWrapper.leftJoin(BuyOrder.class,BuyOrder::getOrderId,BuyOrderProduct::getOrderId); +// buyOrderProductMPJLambdaWrapper.eq(BuyOrderProduct::getExpressOrderId,e.getId()); +// List shopProducts = buyOrderProductDao.selectJoinList(ShopProduct.class, buyOrderProductMPJLambdaWrapper); +// for(ShopProduct s : shopProducts){ +// MPJLambdaWrapper shopProductBookEntityMPJLambdaWrapper = new MPJLambdaWrapper<>(); +// shopProductBookEntityMPJLambdaWrapper.selectAll(BookEntity.class); +// shopProductBookEntityMPJLambdaWrapper.leftJoin(BookEntity.class,BookEntity::getId,ShopProductBookEntity::getBookId); +// shopProductBookEntityMPJLambdaWrapper.eq(ShopProductBookEntity::getProductId,s.getProductId()); +// List bookEntities = shopProductBookDao.selectJoinList(BookEntity.class, shopProductBookEntityMPJLambdaWrapper); +// s.setBooks(bookEntities); +// } +// e.setProducts(shopProducts); +// } +// b.setExpressList(expressOrders); +// } } return buyOrderPage; } diff --git a/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java index be1bdd47..2f51b609 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java @@ -162,7 +162,15 @@ public class PointServiceImpl extends ServiceImpl impleme k="列缺"; } else if (s=="临泣") { k="外关"; - }else{ + }else if (s=="内关") { + k="公孙"; + }else if (s=="后溪") { + k="申脉"; + }else if (s=="列缺") { + k="照海"; + }else if (s=="外关") { + k="临泣"; + } else{ k=""; } HashMap flag = new HashMap<>(); @@ -208,7 +216,15 @@ public class PointServiceImpl extends ServiceImpl impleme k="列缺"; } else if (s=="临泣") { k="外关"; - }else{ + }else if (s=="内关") { + k="公孙"; + }else if (s=="后溪") { + k="申脉"; + }else if (s=="列缺") { + k="照海"; + }else if (s=="外关") { + k="临泣"; + } else{ k=""; } HashMap flag = new HashMap<>(); From 1243d49c50f196e0a88cddb45c68648f43bb82c2 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 8 Dec 2023 17:51:37 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/peanut/config/TGDZ.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/peanut/config/TGDZ.java b/src/main/java/com/peanut/config/TGDZ.java index b40052bf..e2d5e9cf 100644 --- a/src/main/java/com/peanut/config/TGDZ.java +++ b/src/main/java/com/peanut/config/TGDZ.java @@ -21,7 +21,7 @@ public class TGDZ { public static final Map ftbf_d= new HashMap(){{ put("甲","公孙"); - put("乙","坤传"); + put("乙","申脉"); put("丙","内关"); put("丁","照海"); put("戊","临泣"); @@ -29,7 +29,7 @@ public class TGDZ { put("庚","外关"); put("辛","后溪"); put("壬","公孙"); - put("癸","坤传"); + put("癸","申脉"); }}; public static final String[] lq = {"厥阴","少阴","太阴","少阳","阳明","太阳"}; @@ -45,7 +45,7 @@ public class TGDZ { put("己寅",Arrays.asList("小海")); put("己辰",Arrays.asList("支沟")); put("己巳",Arrays.asList("隐白")); - put("己午",Arrays.asList("(阳溪)")); + put("己午",Arrays.asList("阳溪")); put("己未",Arrays.asList("鱼际")); put("己酉",Arrays.asList("太溪","太白*")); put("己亥",Arrays.asList("中封")); @@ -72,7 +72,7 @@ public class TGDZ { put("辛寅",Arrays.asList("天井")); put("辛卯",Arrays.asList("少商")); put("辛巳",Arrays.asList("然谷")); - put("辛午",Arrays.asList("(临泣)")); + put("辛午",Arrays.asList("临泣")); put("辛未",Arrays.asList("太冲","太渊*")); put("辛酉",Arrays.asList("灵道")); put("辛亥",Arrays.asList("阴陵泉")); @@ -86,7 +86,7 @@ public class TGDZ { put("壬丑",Arrays.asList("曲泽")); put("壬寅",Arrays.asList("至阴")); put("壬辰",Arrays.asList("侠溪")); - put("壬巳",Arrays.asList("(太冲)")); + put("壬巳",Arrays.asList("太冲")); put("壬午",Arrays.asList("后溪","京骨*","阳池*")); put("壬申",Arrays.asList("解溪")); put("壬戍",Arrays.asList("曲池")); From 3c9b701553668a85a7069ea73d60839c0ea7ea4b Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Mon, 11 Dec 2023 14:37:26 +0800 Subject: [PATCH 3/6] =?UTF-8?q?alipay=E5=9B=9E=E8=B0=83=EF=BC=8C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/book/service/impl/BuyOrderServiceImpl.java | 3 ++- .../pay/alipay/service/impl/AliPayServiceImpl.java | 6 +----- src/main/resources/logback-spring.xml | 8 ++++++-- 3 files changed, 9 insertions(+), 8 deletions(-) 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 e87f99f9..dde74f0c 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 @@ -365,7 +365,8 @@ public class BuyOrderServiceImpl extends ServiceImpl impl wrapper.eq(StringUtils.isNotBlank(requestVo.getOrderStatus()),BuyOrder::getOrderStatus,requestVo.getOrderStatus()); wrapper.gt(requestVo.getStartTime()!=null,BuyOrder::getCreateTime,requestVo.getStartTime()); wrapper.lt(requestVo.getEndTime()!=null,BuyOrder::getCreateTime,requestVo.getEndTime()); - wrapper.and(StringUtils.isNotBlank(requestVo.getSearchKeyWord()),t->t.like(BuyOrder::getOrderSn,requestVo.getSearchKeyWord()).or().like(MyUserEntity::getTel,requestVo.getSearchKeyWord()).or().like(MyUserEntity::getName,requestVo.getSearchKeyWord())); + wrapper.orderByDesc(BuyOrder::getCreateTime); + wrapper.and(StringUtils.isNotBlank(requestVo.getSearchKeyWord()),t->t.like(BuyOrder::getOrderSn,requestVo.getSearchKeyWord()).or().like(MyUserEntity::getTel,requestVo.getSearchKeyWord()).or().like(MyUserEntity::getName,requestVo.getSearchKeyWord()).or().like(BuyOrder::getShippingUser,requestVo.getSearchKeyWord()).or().like(BuyOrder::getUserPhone,requestVo.getSearchKeyWord())); if(StringUtils.isNotBlank(requestVo.getProductName())){ MPJLambdaWrapper buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>(); buyOrderProductMPJLambdaWrapper.selectAll(BuyOrderProduct.class); diff --git a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java index 1fdba331..6444591c 100644 --- a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java +++ b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java @@ -189,12 +189,8 @@ public class AliPayServiceImpl implements AliPayService { if ("order".equals(subject)) { BuyOrder orderEntity = buyOrderService.getBaseMapper().selectOne(new QueryWrapper().eq("order_sn", oldPayZfbOrderEntity.getRelevanceoid())); - BigDecimal realMoney = orderEntity.getRealMoney(); - BigDecimal bigDecimal = new BigDecimal(oldPayZfbOrderEntity.getBuyerPayAmount()); //更新 订单 记录 - if (bigDecimal.compareTo(realMoney) == 0) { - buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"0"); - } + buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"0"); /* 记录用户购买的书籍 */ // 查询订单的所有 book_id diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index d39ed691..60658dea 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -67,7 +67,7 @@ 100MB - 15 + 5 @@ -94,7 +94,7 @@ 100MB - 15 + 5 @@ -210,6 +210,10 @@ + + + + From ff66db0701fd729121ebe544192ffc41cc40e300 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Mon, 11 Dec 2023 18:11:18 +0800 Subject: [PATCH 4/6] =?UTF-8?q?alipay=E5=9B=9E=E8=B0=83=EF=BC=8C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../book/controller/BuyOrderController.java | 80 ------------------- 1 file changed, 80 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 e0cd0935..05f19a74 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -184,86 +184,6 @@ public class BuyOrderController { public R buySave(@RequestBody BuyOrder buyOrder) throws IOException { return R.error("app版本太低请升级后再购买！！"); - // 获取订单详情 -// List buyOrderDetails = buyOrder.getProducts(); -// // 订单总金额 -// BigDecimal totalPrice = new BigDecimal(0); -// // 遍历商品总价计算 -// for (BuyOrderDetail buyOrderDetail : buyOrderDetails) { -// Integer productId = buyOrderDetail.getProductId(); -// int quantity = buyOrderDetail.getQuantity(); -// ShopProduct product = shopProductService.getById(productId); -// BigDecimal price = getRealPrice(product); -// if (!handleStock(buyOrderDetail, product)) { -// return R.error(500, "库存不足"); -// } -// totalPrice = totalPrice.add(price.multiply(BigDecimal.valueOf(quantity))); -// buyOrderDetail.setProductName(product.getProductName()); -// buyOrderDetail.setProductPrice(product.getPrice()); -// int originWeight = product.getWeight(); -// int originWeightIntValue = originWeight / 100; -// int originWeightDecimalValue = originWeightIntValue % 100; -// buyOrderDetail.setWeight(BigDecimal.valueOf(originWeightIntValue).add(BigDecimal.valueOf(originWeightDecimalValue).divide(new BigDecimal(100), -// MathContext.DECIMAL64))); -// buyOrderDetail.setProductUrl(product.getProductImages()); -// buyOrderDetail.setOrderStatus(Constants.ORDER_STATUS_TO_BE_PAID); -// } -// -// totalPrice = totalPrice.subtract(useCouponAmount(buyOrder)); -// totalPrice = totalPrice.add(getShoppingAmount(buyOrder)); -// String orderSn = IdWorker.getTimeId().substring(0, 32); -// buyOrder.setOrderSn(orderSn); -// buyOrder.setPaymentDate(new Date()); -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.eq("id", buyOrder.getAddressId()); -// UserAddress userAddress = userAddressService.getOne(queryWrapper); -// UserAddressVo vo = new UserAddressVo(); -// vo = userAddressService.getAddressName(vo, userAddress.getRegionCode()); -// buyOrder.setProvince(vo.getProvince()); -// buyOrder.setCity(vo.getCity()); -// buyOrder.setDistrict(vo.getCounty()); -// buyOrder.setAddress(vo.getDetailAddress()); -// buyOrderService.save(buyOrder); -// -// for (BuyOrderDetail buyOrderDetail : buyOrderDetails) { -// buyOrderDetail.setOrderId(buyOrder.getOrderId()); -// buyOrderDetail.setUserId(buyOrder.getUserId()); -// if (Constants.BUY_TYPE_CART.equals(buyOrder.getBuyType())) { -// handleBuyCart(buyOrder, buyOrderDetail); -// } -// } -// buyOrderDetailService.saveBatch(buyOrderDetails); -// // 1. 虚拟币支付 -// if (Constants.PAYMENT_METHOD_VIRTUAL.equals(buyOrder.getPaymentMethod())) { -// buyOrder.setOrderStatus(Constants.ORDER_STATUS_TO_BE_SHIPPED); -// MyUserEntity user = this.myUserService.getById(buyOrder.getUserId()); -// if (usePeanutCoin(user, totalPrice)) { -// // 更新订单状态 -// buyOrderService.updateOrderStatus(user.getId(), buyOrder.getOrderSn(), "0"); -// recordTransaction(buyOrder, user, totalPrice); -// addEbookToUser(buyOrderDetails, buyOrder); -// } else { -// return R.error(500, "花生币余额不足！"); -// } -// } -// // 2. 微信支付 -// if (Constants.PAYMENT_METHOD_WECHAT_PAY.equals(buyOrder.getPaymentMethod())) { -// rabbitTemplate.convertAndSend( -// DelayQueueConfig.ORDER_TO_BE_PAY_EXCHANGE, -// DelayQueueConfig.ORDER_TO_BE_PAY_ROUTING_KEY, -// buyOrder.getOrderId(), -// messagePostProcessor() -// ); -// WechatPaymentInfo paymentInfo = new WechatPaymentInfo(); -// paymentInfo.setOrderSn(orderSn); -// paymentInfo.setBuyOrderId(buyOrder.getOrderId()); -// paymentInfo.setTotalAmount(totalPrice); -// wxpayService.prepay(paymentInfo); -// } -// Map result = new HashMap<>(); -// result.put("orderSn", buyOrder.getOrderSn()); -// result.put("money", totalPrice); -// return R.ok(result); } /** From 0376420aca5181c94a3d75812e3abc8e42cc4059 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Tue, 12 Dec 2023 10:58:55 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/peanut/modules/book/entity/BuyOrder.java | 4 ++++ .../book/service/impl/BuyOrderServiceImpl.java | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/src/main/java/com/peanut/modules/book/entity/BuyOrder.java b/src/main/java/com/peanut/modules/book/entity/BuyOrder.java index 2e108c2f..b9e033a1 100644 --- a/src/main/java/com/peanut/modules/book/entity/BuyOrder.java +++ b/src/main/java/com/peanut/modules/book/entity/BuyOrder.java @@ -7,6 +7,7 @@ import java.io.Serializable; import java.util.Date; import java.util.List; +import com.peanut.modules.book.vo.response.ConsigneeVo; import lombok.Data; /** @@ -185,4 +186,7 @@ public class BuyOrder implements Serializable { private List expressList; private int addressModified; + + @TableField(exist = false) + private ConsigneeVo consigneeVo; } 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 dde74f0c..4ced8646 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 @@ -387,6 +387,20 @@ public class BuyOrderServiceImpl extends ServiceImpl impl b1.setExpressOrder(expressOrderDao.selectById(b1.getExpressOrderId())); } b.setProductList(buyOrderProducts); + //设置快递信息传递给前端 + ConsigneeVo consigneeVo = new ConsigneeVo(); + consigneeVo.setConsigneeName(b.getShippingUser()); + consigneeVo.setConsigneeMobile(b.getUserPhone()); + County county = countyService.getOne(new LambdaQueryWrapper().eq(County::getCountyName, b.getDistrict())); + consigneeVo.setCounty(county.getCountyName()); + consigneeVo.setCountyCode(county.getRegionCode()); + City city = cityService.getOne(new LambdaQueryWrapper().eq(City::getCityId, county.getCityId())); + consigneeVo.setCity(city.getCityName()); + consigneeVo.setCityCode(city.getRegionCode()); + Province province = provinceService.getOne(new LambdaQueryWrapper().eq(Province::getProvId, city.getProvId())); + consigneeVo.setProvince(province.getProvName()); + consigneeVo.setProvinceCode(province.getRegionCode()); + b.setConsigneeVo(consigneeVo); //添加快递包裹信息 // LambdaQueryWrapper b_wrapper = new LambdaQueryWrapper<>(); // b_wrapper.eq(BuyOrderProduct::getOrderId,b.getOrderId()); From c3453e3aa50160d0fb5b04ed48a9eccf9c867c45 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Tue, 12 Dec 2023 11:29:01 +0800 Subject: [PATCH 6/6] bug --- .../modules/book/service/impl/BuyOrderServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 4ced8646..e83137e8 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 @@ -391,12 +391,12 @@ public class BuyOrderServiceImpl extends ServiceImpl impl ConsigneeVo consigneeVo = new ConsigneeVo(); consigneeVo.setConsigneeName(b.getShippingUser()); consigneeVo.setConsigneeMobile(b.getUserPhone()); - County county = countyService.getOne(new LambdaQueryWrapper().eq(County::getCountyName, b.getDistrict())); - consigneeVo.setCounty(county.getCountyName()); - consigneeVo.setCountyCode(county.getRegionCode()); - City city = cityService.getOne(new LambdaQueryWrapper().eq(City::getCityId, county.getCityId())); + City city = cityService.getOne(new LambdaQueryWrapper().eq(City::getCityName, b.getCity())); consigneeVo.setCity(city.getCityName()); consigneeVo.setCityCode(city.getRegionCode()); + County county = countyService.getOne(new LambdaQueryWrapper().eq(County::getCountyName,b.getDistrict()).eq(County::getCityId,city.getCityId())); + consigneeVo.setCounty(county.getCountyName()); + consigneeVo.setCountyCode(county.getRegionCode()); Province province = provinceService.getOne(new LambdaQueryWrapper().eq(Province::getProvId, city.getProvId())); consigneeVo.setProvince(province.getProvName()); consigneeVo.setProvinceCode(province.getRegionCode());