Merge branch 'feature/0712_vip' into develop-new

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

@@ -93,7 +93,7 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
             return HttpResponseResult.failed("未找到会员卡信息");
         }
 
-        if (!orderReqInfo.getOrderType().name().equals(detail.getVipType().getName())) {
+        if (!orderReqInfo.getOrderType().name().equals(detail.getVipType().name())) {
             return HttpResponseResult.failed("会员卡类型不匹配");
         }
 
@@ -353,7 +353,7 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
             throw new BizException("未找到会员卡信息");
         }
 
-        if (!orderGoodsInfo.getGoodType().name().equals(detail.getVipType().getName())) {
+        if (!orderGoodsInfo.getGoodType().name().equals(detail.getVipType().name())) {
             throw new BizException("会员卡类型不匹配");
         }
         if (Boolean.FALSE.equals(detail.getStatus())) {