From fd7b8fb7c89832c28a838b0449bbb8a392433ee2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 四月 2025 14:33:02 +0800
Subject: [PATCH] 将华为云短信替换成阿里云短信
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
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 a6dc9fb..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;
@@ -1099,11 +1101,6 @@
}
//开始构建支付数据
- //现金支付
- paymentMoney = paymentMoney.add(expressFee).setScale(2, RoundingMode.HALF_EVEN);
- if(BigDecimal.ZERO.compareTo(paymentMoney) > 0){
- paymentMoney = BigDecimal.ZERO;
- }
if(1 == shoppingCartPayment.getPaymentType()){
if(BigDecimal.ZERO.compareTo(paymentMoney) < 0){
//调起微信支付
--
Gitblit v1.7.1