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

cooleshow-common/src/main/java/com/yonge/cooleshow/common/constant/SysConfigConstant.java

@@ -110,6 +110,7 @@ public interface SysConfigConstant {
      * @updateTime 2022/4/20 11:43
      */
     String GOOD_LOGO_VIP = "good_logo_vip";
+    String GOOD_LOGO_SVIP = "good_logo_svip";
     /***
      * 商品视频课图片
      * @author liweifan

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/payment/EPaymentType.java

@@ -10,6 +10,7 @@ import lombok.Getter;
 public enum EPaymentType {
 
     VIP("开通会员"),
+    SVIP("开通会员 SVIP"),
     PRACTICE("陪练课购买"),
     LIVE("直播课购买"),
     VIDEO("视频课购买"),

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

@@ -162,14 +162,15 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
         addVipCardRecord.setClientType(orderDetailVo.getOrderClient());
         addVipCardRecord.setStatus(EVipRecordStatus.ADD);
         addVipCardRecord.setVipType(detail.getVipType());
-        if (detail.getPeriod() == PeriodEnum.PERPETUAL) {
-            addVipCardRecord.setVipType(EVipType.PERMANENT_SVIP);
-        }
         addVipCardRecord.setType(detail.getPeriod());
         addVipCardRecord.setTimes(orderDetailVo.getGoodNum());
         addVipCardRecord.setSendMsg(false);
         addVipCardRecord.setSourceType(SourceTypeEnum.ORDER);
         addVipCardRecord.setCreateBy(orderDetailVo.getUserId());
+        addVipCardRecord.setOrderNo(orderDetailVo.getOrderNo());
+        addVipCardRecord.setSubOrderNo(orderDetailVo.getSubOrderNo());
+        addVipCardRecord.setVipCardId(orderDetailVo.getBizId());
+        addVipCardRecord.setReason("会员购买");
         vipCardRecordService.add(addVipCardRecord);
 
         //会员购买消息推送

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

@@ -1041,7 +1041,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         } else if (GoodTypeEnum.ALBUM.equals(goodTypeEnum)) {
             configValue = sysConfigService.findConfigValue(SysConfigConstant.GOOD_LOGO_ALBUM);
         } else if (GoodTypeEnum.SVIP.equals(goodTypeEnum)) {
-            configValue = sysConfigService.findConfigValue(SysConfigConstant.GOOD_LOGO_VIP);
+            configValue = sysConfigService.findConfigValue(SysConfigConstant.GOOD_LOGO_SVIP);
         }
         return configValue;
     }

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

@@ -304,7 +304,7 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
             if (CollectionUtils.isNotEmpty(svipList)) {
                 userVip.setVipType(EVipType.SVIP);
 
-                Optional<VipCardRecord> first = svipList.stream().filter(o -> o.getEndTime() == null && o.getType()==PeriodEnum.PERPETUAL).findFirst();
+                Optional<VipCardRecord> first = svipList.stream().filter(o ->o.getType()==PeriodEnum.PERPETUAL).findFirst();
                 if (first.isPresent()) {
                     userVip.setVipType(EVipType.PERMANENT_SVIP);
                 } else {
@@ -456,7 +456,7 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
             Date endDate = plusDate(startTime, period, Long.valueOf(addVipCardRecord.getTimes()));
 
             VipCardRecord addRecord = JSON.parseObject(JSON.toJSONString(addVipCardRecord), VipCardRecord.class);
-            addRecord.setSourceType(SourceTypeEnum.BACKEND_GIVE);
+            addRecord.setSourceType(addVipCardRecord.getSourceType() !=null?addVipCardRecord.getSourceType():SourceTypeEnum.BACKEND_GIVE);
             addRecord.setStatus(EVipRecordStatus.ADD);
             addRecord.setDisplayFlag(true);
             addRecord.setEfficientFlag(true);
@@ -488,7 +488,7 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
         }
         Date endDate = plusDate(startTime, addVipCardRecord.getType(), Long.valueOf(addVipCardRecord.getTimes()));
         VipCardRecord newRecord = JSON.parseObject(JSON.toJSONString(addVipCardRecord), VipCardRecord.class);
-        newRecord.setSourceType(SourceTypeEnum.BACKEND_GIVE);
+        newRecord.setSourceType(addVipCardRecord.getSourceType() !=null?addVipCardRecord.getSourceType():SourceTypeEnum.BACKEND_GIVE);
         newRecord.setStatus(EVipRecordStatus.ADD);
         if (index > 0) {
             newRecord.setStartTime(new Date(startTime.getTime() + 1000));

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/VipCardRecordWrapper.java

@@ -86,5 +86,9 @@ public class VipCardRecordWrapper {
 
         @ApiModelProperty("来源类型 ： ACTIVITY ：活动 ，ORDER:订单")
         private SourceTypeEnum sourceType;
+
+        private String orderNo;
+        private Long vipCardId;
+        private String subOrderNo;
     }
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/MemberPriceSettingsMapper.xml

@@ -69,6 +69,6 @@
 			<include refid="baseColumns"/>
 		FROM user_order_detail d
 		left join member_price_settings t on d.biz_id_ = t.id_
-		where d.good_type_ = 'VIP' and  d.id_ = #{orderDetilId}
+		where d.good_type_ in ('VIP','SVIP') and  d.id_ = #{orderDetilId}
 	</select>
 </mapper>