Merge remote-tracking branch 'origin/0727RecommendActive' into 0727RecommendActive

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/KylinRecommendActiveParam.java

@@ -85,6 +85,7 @@ public class KylinRecommendActiveParam implements Serializable {
     @ApiModelProperty(value = "0开启，1未开启")
     private Integer status;
 
+
     private List<KylinRecommendActiveRelationParam> list;
 
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/KylinRecommendActiveRelationParam.java

@@ -45,7 +45,7 @@ public class KylinRecommendActiveRelationParam implements Serializable {
     /**
      * 推荐活动id(关联id)
      */
-    @ApiModelProperty(value = "推荐活动id(关联id)")
+
     private String recommendActiveId;
 
     /**
@@ -57,6 +57,11 @@ public class KylinRecommendActiveRelationParam implements Serializable {
      * 修改时间
      */
     private LocalDateTime updatedAt;
+    /**
+     *
+     */
+    @ApiModelProperty(value = "排序")
+    private Integer indexs;
 
 
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinRecommendActiveRelationVo.java

+package com.liquidnet.service.kylin.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 推荐活动关联表
+ * </p>
+ * @since 2022-07-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class KylinRecommendActiveRelationVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "mid")
+    private Long mid;
+
+    /**
+     * 推荐活动关系id
+     */
+    @ApiModelProperty(value = "推荐活动关系id")
+    private String recommendRelationId;
+
+    /**
+     * 推荐商品id
+     */
+    @ApiModelProperty(value = "推荐商品id")
+    private String recommendBindId;
+
+    /**
+     * 1NFT2组合购3演出4商品
+     */
+    @ApiModelProperty(value = "1NFT2组合购3演出4商品")
+    private Integer type;
+
+    /**
+     * 推荐活动id(关联id)
+     */
+    @ApiModelProperty(value = "推荐活动id(关联id)")
+    private String recommendActiveId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "推荐活动id(关联id)")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime createdAt;
+
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "推荐活动id(关联id)")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime updatedAt;
+    /**
+     * 0未删除1已删除
+     */
+    @ApiModelProperty(value = "0未删除1已删除")
+    private Integer delTag;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    private Integer indexs;
+
+    @ApiModelProperty(value = "演出的vo")
+    private KylinPerformanceVo kylinPerformanceVo;
+
+    private static final KylinRecommendActiveRelationVo obj = new KylinRecommendActiveRelationVo();
+    public static KylinRecommendActiveRelationVo getNew() {
+        try {
+            return (KylinRecommendActiveRelationVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new KylinRecommendActiveRelationVo();
+        }
+    }
+
+
+
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinRecommendActiveVo.java

+package com.liquidnet.service.kylin.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 推荐活动表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-07-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class KylinRecommendActiveVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long mid;
+
+    /**
+     * 推荐活动id
+     */
+    @ApiModelProperty(value = "推荐活动id")
+    private String recommendId;
+
+    /**
+     * 开启时间
+     */
+    @ApiModelProperty(value = "开启时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    @ApiModelProperty(value = "结束时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime endTime;
+
+    /**
+     * 1NFT2组合购3演出4商品
+     */
+    @ApiModelProperty(value = "1NFT2组合购3演出4商品")
+    private Integer activeType;
+
+    /**
+     * 活动绑定id
+     */
+    @ApiModelProperty(value = "活动绑定id")
+    private String activeBindId;
+
+    /**
+     * 0未删除1已删除
+     */
+    @ApiModelProperty(value = "0未删除1已删除")
+    private Integer delTag;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "0未删除1已删除")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime createdAt;
+
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "0未删除1已删除")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime updatedAt;
+
+    /**
+     * 0开启，1未开启
+     */
+    @ApiModelProperty(value = "0开启，1未开启")
+    private Integer status;
+
+
+    @ApiModelProperty(value = "推荐活动")
+    private List<KylinRecommendActiveRelationVo> list;
+
+    private String name;
+    private static final KylinRecommendActiveVo obj = new KylinRecommendActiveVo();
+    public static KylinRecommendActiveVo getNew() {
+        try {
+            return (KylinRecommendActiveVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new KylinRecommendActiveVo();
+        }
+    }
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinRecommendActiveService.java

+package com.liquidnet.service.kylin.service;
+
+import com.liquidnet.service.kylin.dto.vo.KylinRecommendActiveVo;
+import com.liquidnet.service.kylin.entity.KylinRecommendActive;
+
+import java.util.List;
+
+/**
+ * 推荐活动接口
+ */
+public interface IKylinRecommendActiveService {
+    List<KylinRecommendActiveVo> getRecommendById(List<KylinRecommendActive> list);
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRecommendActiveServiceImpl.java

@@ -145,6 +145,6 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA
             //查推荐商品
             redisList.add( this.getKylinRecommendActiveById(r.getMid().intValue()));
         });
-        redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.RECOMMEND_ACTIVE, redisList);
+        redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.RECOMMEND_ACTIVE+kylinRecommendActive.getActiveBindId(), redisList);
     }
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinRecommendActive.java

@@ -72,10 +72,20 @@ public class KylinRecommendActive implements Serializable {
      */
     private Integer status;
 
+
     @TableField(exist = false)
     private List<KylinRecommendActiveRelation> list;
 
     @TableField(exist = false)
     private String name;
 
+    private static final KylinRecommendActive obj = new KylinRecommendActive();
+    public static KylinRecommendActive getNew() {
+        try {
+            return (KylinRecommendActive) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new KylinRecommendActive();
+        }
+    }
+
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinRecommendActiveRelation.java

@@ -59,5 +59,19 @@ public class KylinRecommendActiveRelation implements Serializable {
      */
     private Integer delTag;
 
+    /**
+     * 排序
+     */
+    private Integer indexs;
+
+    private static final KylinRecommendActiveRelation obj = new KylinRecommendActiveRelation();
+    public static KylinRecommendActiveRelation getNew() {
+        try {
+            return (KylinRecommendActiveRelation) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new KylinRecommendActiveRelation();
+        }
+    }
+
 
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/kylinRecommendActiveMapper.xml

@@ -21,7 +21,8 @@
     </select>
 
     <select id="getBybindId"  resultMap="BaseResultMap">
-    select * from kylin_recommend_active where active_type=#{type} and active_bind_id=#{bindId} and del_tag=0 and `status`=0 ORDER BY start_time asc
+    select * from kylin_recommend_active where active_type=#{type} and active_bind_id=#{bindId} and del_tag=0 and `status`=0 and end_time>=NOW()
+     ORDER BY start_time asc
     </select>
 
 </mapper>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinRecommendActiveController.java

+package com.liquidnet.service.kylin.controller;
+
+
+import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.entity.KylinRecommendActive;
+import com.liquidnet.service.kylin.service.impl.KylinRecommendActiveServiceImpl;
+import com.liquidnet.service.kylin.utils.DataUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ *   推荐活动
+ * </p>
+ *
+ */
+
+@Api(tags = "推荐活动有关接口")
+@RestController
+@RequestMapping("recommendActive")
+@Slf4j
+public class KylinRecommendActiveController {
+    @Autowired
+    private KylinRecommendActiveServiceImpl kylinRecommendActiveService;
+    @Autowired
+    private DataUtils dataUtils;
+
+    @PostMapping("getRecommendById")
+    @ApiOperation("获取推荐活动详情")
+    public ResponseDto<List<KylinRecommendActive>> getRecommendById(@RequestParam(value = "bindId")String bindId) {
+        String uid = CurrentUtil.getCurrentUid();
+        List<KylinRecommendActive> list= dataUtils.getRecommendActive(bindId);
+        if(null==list){
+            return null;
+        }else{
+            //循环遍历，查到绑定的详情
+            kylinRecommendActiveService.getRecommendById(list);
+        }
+        return null;
+    }
+
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinRecommendActiveServiceImpl.java

+package com.liquidnet.service.kylin.service.impl;
+
+import com.liquidnet.commons.lang.util.StringUtil;
+import com.liquidnet.service.kylin.dto.vo.KylinRecommendActiveVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.entity.KylinRecommendActive;
+import com.liquidnet.service.kylin.service.IKylinRecommendActiveService;
+import com.liquidnet.service.kylin.utils.DataUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 人流量检测记录表 服务实现类
+ * </p>
+ *
+ */
+@Service
+public class KylinRecommendActiveServiceImpl implements IKylinRecommendActiveService {
+    @Autowired
+    private DataUtils dataUtils;
+
+    @Override
+    public List<KylinRecommendActiveVo> getRecommendById(List<KylinRecommendActive> list) {
+        for(KylinRecommendActive kylinRecommendActive:list){
+            KylinRecommendActiveVo kylinRecommendActiveVo = KylinRecommendActiveVo.getNew();
+            BeanUtils.copyProperties(kylinRecommendActive,kylinRecommendActiveVo);
+
+            if(StringUtil.isNotBlank(kylinRecommendActiveVo.getActiveBindId())&&null !=kylinRecommendActiveVo.getActiveType()){
+                //找到绑定的详情
+                if(kylinRecommendActiveVo.getActiveType()==3){
+                    //演出
+                    KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(kylinRecommendActiveVo.getActiveBindId());
+                }else if(kylinRecommendActiveVo.getActiveType()==1||kylinRecommendActiveVo.getActiveType()==4){
+
+                }else if(kylinRecommendActiveVo.getActiveType()==2){
+
+                }
+
+            }
+
+        }
+        return null;
+    }
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -18,6 +18,7 @@ import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketExpressModuleVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
 import com.liquidnet.service.kylin.entity.KylinOrderCoupons;
+import com.liquidnet.service.kylin.entity.KylinRecommendActive;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -980,5 +981,9 @@ public class DataUtils {
             return (List<String>) obj;
         }
     }
+    //获得 admin配置的推荐活动
+    public   List<KylinRecommendActive> getRecommendActive(String id) {
+        return (List<KylinRecommendActive>) redisUtil.get(KylinRedisConst.RECOMMEND_ACTIVE + id);
+    }
 
 }