From f62b8d5fc74db2391c7769e024e65c2bb51ac6bc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 11 四月 2025 11:51:12 +0800
Subject: [PATCH] 修改反馈bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 8 +++++---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 2 +-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
index 7abd8c9..4b16e40 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
@@ -52,13 +52,13 @@
@ResponseBody
- @GetMapping("/getMyShoppingCart/{type}/{shopId}")
+ @GetMapping("/getMyShoppingCart")
@ApiOperation(value = "获取购物车列表", tags = {"商城-购物车-小程序"})
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "商品类型（1=服务商品，2=单品商品）", required = true, dataType = "int"),
@ApiImplicitParam(name = "shopId", value = "核销门店id", required = true, dataType = "int")
})
- public TableDataInfo<MyShoppingCartVo> getMyShoppingCart(@PathVariable("type") Integer type, @PathVariable("shopId") Integer shopId){
+ public TableDataInfo<MyShoppingCartVo> getMyShoppingCart(Integer type, Integer shopId){
startPage();
return getDataTable(shoppingCartService.getMyShoppingCart(type, shopId));
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index e0c937f..49e2728 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -495,7 +495,7 @@
//开始退款
Integer payMethod = order.getPayMethod();
BigDecimal expressAmount = order.getExpressAmount() == null ? BigDecimal.ZERO : order.getExpressAmount();
- BigDecimal paymentAmount = order.getPaymentAmount().add(expressAmount);
+ BigDecimal paymentAmount = order.getPaymentAmount();
AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
if (1 == payMethod) {
//微信退款
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index bf68ed6..4b500f2 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -430,7 +430,6 @@
}
AppUser appUser = appUserClient.getAppUserById(userid);
Integer shopId = confirmOrder.getShopId();
- Shop shop = shopClient.getShopById(shopId).getData();
String goodsJson = confirmOrder.getGoodsJson();
List<Long> ids = new ArrayList<>();
JSONArray objects = JSON.parseArray(goodsJson);
@@ -443,8 +442,11 @@
//构建商品明细列表
List<MyShoppingCartVo> goodsList = buildDetail(appUser, shopId, list, objects);
confirmOrderVo.setGoodsList(goodsList);
- confirmOrderVo.setShopId(confirmOrder.getShopId());
- confirmOrderVo.setShopName(shop.getName());
+ if(null != confirmOrder.getShopId()){
+ Shop shop = shopClient.getShopById(shopId).getData();
+ confirmOrderVo.setShopId(confirmOrder.getShopId());
+ confirmOrderVo.setShopName(null == shop ? "" : shop.getName());
+ }
//现金支付
if(confirmOrder.getPaymentType() == 1){
BigDecimal bigDecimal = BigDecimal.ZERO;
--
Gitblit v1.7.1