合并代码

puzhibing

2024-12-10 6a9a7a8ec19e967ca521af5e6f0d8f4f59cc48a2

合并代码

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java

@@ -412,6 +412,7 @@
        confirmOrderVo.setResidualPoint(appUser.getLavePoint().intValue());
        //获取默认收货地址
        UserAddress userAddress = userAddressClient.getDefaultUserAddress(userid).getData();
        userAddress.setIdStr(userAddress.getId().toString());
        confirmOrderVo.setUserAddress(userAddress);
        confirmOrderVo.setPaymentType(confirmOrder.getPaymentType());
        //获取用户优惠券，用户全部优惠券，不能使用的需要标识出来置灰展示