订单

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

@@ -91,14 +91,23 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
         if (null == detail) {
             return HttpResponseResult.failed("未找到会员卡信息");
         }
+
+        if (!orderReqInfo.getOrderType().name().equals(detail.getVipType().getName())) {
+            return HttpResponseResult.failed("会员卡类型不匹配");
+        }
+
         if (Boolean.FALSE.equals(detail.getStatus())) {
             return HttpResponseResult.failed("会员卡已下架");
         }
 
+
+
         // 判断会员剩余天数是否改变
-        VipCardRecordWrapper.UserVip userVip = vipCardRecordService.UserVipInfo(orderReqInfo.getUserId(), orderReqInfo.getOrderClient());
-        if (!userVip.getVipEndDays().equals(orderReqInfo.getVipEndDays())) {
-            return HttpResponseResult.failed(999,null,"您当前VIP天数更新，请刷新后尝试");
+        if (detail.getVipType() == EVipType.SVIP) {
+            VipCardRecordWrapper.UserVip userVip = vipCardRecordService.UserVipInfo(orderReqInfo.getUserId(), orderReqInfo.getOrderClient());
+            if (!userVip.getVipEndDays().equals(orderReqInfo.getVipEndDays())) {
+                return HttpResponseResult.failed(999, null, "您当前VIP天数更新，请刷新后尝试");
+            }
         }
 
         OrderCreateRes orderCreateRes = new OrderCreateRes();
@@ -276,6 +285,9 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
             throw new BizException("未找到会员卡信息");
         }
 
+        if (!orderGoodsInfo.getGoodType().name().equals(detail.getVipType().getName())) {
+            throw new BizException("会员卡类型不匹配");
+        }
         if (Boolean.FALSE.equals(detail.getStatus())) {
             throw new BizException("会员卡已下架");
         }

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

@@ -196,6 +196,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         /**********订单完成后******************/
         //vip开通缴费
         orderSuccess.put(GoodTypeEnum.VIP, memberPriceSettingsService::orderSuccess);
+        orderSuccess.put(GoodTypeEnum.SVIP, memberPriceSettingsService::orderSuccess);
         //直播课程购买
         orderSuccess.put(GoodTypeEnum.LIVE, courseGroupService::buyLiveCourseSuccess);
         //陪练课购买