From f735bea919a6bea096552ad5d7cc5a9e60b77fdc Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期四, 11 五月 2023 21:37:58 +0800
Subject: [PATCH] 修改订单报错
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java | 2 +-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index f3ec860..2d143b0 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -627,7 +627,11 @@
BigDecimal goodsTotalPrice;
BigDecimal goodsRealPrice;
List<AppUserCouponVo> appUserCouponVoList = remoteMemberService.listVoUserCouponByUserId(userId).getData();
- Map<Long,AppUserCouponVo> appUserCouponVoMap = appUserCouponVoList.stream().collect(Collectors.toMap(AppUserCouponVo::getUserCouponId, Function.identity()));
+ Map<Long,AppUserCouponVo> appUserCouponVoMap = new HashMap<>();
+ if(null != appUserCouponVoList){
+ appUserCouponVoMap = appUserCouponVoList.stream().collect(Collectors.toMap(AppUserCouponVo::getUserCouponId, Function.identity()));
+ }
+
AppUserCouponVo appUserCouponVo;
Integer couponType;
BigDecimal moneyThreshold;
@@ -660,7 +664,7 @@
goodsRealPrice = goodsTotalPrice;
if(userCouponId!=null){
appUserCouponVo = appUserCouponVoMap.get(userCouponId);
- if(StringUtils.isBlank(appUserCouponVo.getRelGoodsIds()) || appUserCouponVo.getRelGoodsIds().contains(goodsId)){
+ if(null != appUserCouponVo && (StringUtils.isBlank(appUserCouponVo.getRelGoodsIds()) || appUserCouponVo.getRelGoodsIds().contains(goodsId))){
couponType = appUserCouponVo.getCouponType();
if(couponType == 1 && appUserCouponVo.getMoneyThreshold()!=null && appUserCouponVo.getDiscountMoney()!=null){
moneyThreshold = appUserCouponVo.getMoneyThreshold();
@@ -696,7 +700,7 @@
orderGoods.setOrderId(orderId);
orderGoods.setGoodsId(goodsId);
orderGoods.setBuyNum(buyNum);
- if(StringUtils.isNotBlank(userCouponId.toString())){
+ if(null != userCouponId){
orderGoods.setCouponId(userCouponId.toString());
}
orderGoods.setGoodsPrice(goodsPrice);
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
index efea8ee..d5efe00 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
@@ -44,7 +44,7 @@
Long userId = SecurityUtils.getUserId();
log.info("userId"+userId);
Member member = memberService.getMember(userId).getData();
- log.info("member"+member);
+ log.info("member" + member);
appNearbyShopDto.setUserId(userId);
AppNearbyShopVo appNearbyShopVo = shopService.getNearbyShop(appNearbyShopDto,member);
return R.ok(appNearbyShopVo);
--
Gitblit v1.7.1