fix

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MemberPriceSettingsServiceImpl.java

@@ -365,9 +365,11 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
         }
 
         // 判断会员剩余天数是否改变
-        VipCardRecordWrapper.UserVip userVip = vipCardRecordService.UserVipInfo(orderGoodsInfo.getUserId(), orderGoodsInfo.getPaymentClient());
-        if (!userVip.getVipEndDays().equals(orderGoodsInfo.getVipEndDays())) {
-            throw new BizException(998,"您当前VIP天数更新，请刷新后尝试");
+        if (detail.getVipType() == EVipType.SVIP) {
+            VipCardRecordWrapper.UserVip userVip = vipCardRecordService.UserVipInfo(orderGoodsInfo.getUserId(), orderGoodsInfo.getPaymentClient());
+            if (!userVip.getVipEndDays().equals(orderGoodsInfo.getVipEndDays())) {
+                throw new BizException(998, "您当前VIP天数更新，请刷新后尝试");
+            }
         }
 
         BigDecimal couponAmount = BigDecimal.ZERO;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserPaymentCoreServiceImpl.java

@@ -548,6 +548,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
                 orderGoodsCreate.get(item.getGoodType()).accept(item);
                 UserOrderDetail userOrderDetail = item.getUserOrderDetail();
                 orderDetails.add(userOrderDetail);
+                couponAmount = userOrderDetail.getCouponAmount();
                 // 根据优惠券计算实际优惠金额
                 // 计算优惠券金额
                 {