Merge remote-tracking branch 'origin/dev' into dev

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

@@ -65,9 +65,11 @@ public class BannersParam implements Serializable {
     private List positionList;
 
     @ApiModelProperty(value = "推广省份 多选 数组", example = "[\"1\", \"2\", \"5\"]")
-//    @NotEmpty(message = "请选择推广省份")
     private List provincesList;
 
+    @ApiModelProperty(value = "推广省份 多选 数组", example = "[\"北京\", \"天津\", \"上海\"]")
+    private List provincesNameList;
+
     @JsonIgnore
     public KylinBanners getFields(String bannersId, String createdAt) {
         KylinBanners fields = new KylinBanners();

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

@@ -113,5 +113,5 @@ public class PerformancePartnerVo implements Serializable {
     private String updatedAt;
 
     @ApiModelProperty(value = "是否保存", example = "")
-    private int isCreateSave;
+    private Integer isCreateSave;
 }

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

@@ -60,6 +60,9 @@ public class BannersVo implements Serializable {
     @ApiModelProperty(value = "推广省份 多选 数组")
     private List provincesList;
 
+    @ApiModelProperty(value = "城市名称")
+    private List provincesNameList;
+
     @ApiModelProperty(value = "是否删除 0已删除,1正常")
     private Integer isDeleted;
 

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

@@ -21,6 +21,7 @@
     <resultMap id="misPerformanceListResult" type="com.liquidnet.service.kylin.dao.PerformanceAdminListDao">
         <result column="performances_id" property="performancesId"/>
         <result column="title" property="title"/>
+        <result column="type" property="type"/>
         <result column="time_start" property="timeStart"/>
         <result column="time_end" property="timeEnd"/>
         <result column="total_general" property="totalGeneral"/>
@@ -145,6 +146,7 @@
         p.audit_time,
         p.sort,
         p.title ,
+        p.type,
         p.time_start ,
         p.time_end ,
         t.total_general ,

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

@@ -35,14 +35,14 @@ public class KylinBannersController {
     @ApiOperation("banner列表")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "position", value = "展示位置 1首页 3周边 4演出 5积分商城 6YB 8视频", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "provinceCode", value = "城市code"),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "provinceName", value = "城市名称"),
     })
     public ResponseDto<List<BannersVo>> blist(
             @RequestParam() String position,
-            @RequestParam(defaultValue = "") String provinceCode
+            @RequestParam(defaultValue = "") String provinceName
     ) {
         List result = new ArrayList();
-        result = kylinBannersServiceImpl.blist(position, provinceCode);
+        result = kylinBannersServiceImpl.blist(position, provinceName);
 
         return ResponseDto.success(result);
     }

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

@@ -6,7 +6,6 @@ import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.TicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.TicketVo;
-import com.liquidnet.service.kylin.entity.KylinPerformanceStatus;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import com.liquidnet.service.kylin.service.IKylinPerformancesService;
@@ -24,10 +23,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 import java.util.regex.Pattern;
 
 /**
@@ -283,4 +279,33 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         return ticketTimesList;
     }
 
+    public HashMap<String, Object> userList(List performancesIds, int page, int size) {
+        HashMap<String, Object> info = new HashMap<>();
+
+        // 排序 分页
+        Sort sortName = Sort.by(Sort.Direction.ASC, "timeStart");
+
+        Pageable pageable = PageRequest.of(page - 1, size, sortName);
+
+        //条件
+        Document queryObject = new Document();
+
+        Query query = new Query();
+        query.addCriteria(Criteria.where("performancesId").in(performancesIds));
+
+        // 查询总数
+        long count = mongoTemplate.count(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
+        query.getQueryObject();
+
+        query.with(pageable);
+
+        List<PerformanceVo> list = mongoTemplate.find(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
+
+        // 组合数据
+        info.put("total", count);
+        info.put("list", list);
+
+        return info;
+    }
+
 }

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

@@ -245,7 +245,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
         }
     }
 
-    public List blist(String position, String provinceCode) {
+    public List blist(String position, String provinceName) {
         Query query = new Query();
         query.addCriteria(
                 Criteria.where("isOnline").is(1).and("isDeleted").is(1)
@@ -267,8 +267,8 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
         }
 
         Criteria mergeCriteriaPromotion = new Criteria();
-        if (!provinceCode.isEmpty()) {
-            Criteria promotionCity = Criteria.where("provincesList").in(provinceCode);
+        if (!provinceName.isEmpty()) {
+            Criteria promotionCity = Criteria.where("provincesNameList").in(provinceName);
             Criteria promotionAll = Criteria.where("promotionType").is(1);
             mergeCriteriaPromotion.orOperator(promotionCity, promotionAll);
         }

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

@@ -95,10 +95,6 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     @Override
     public PerformanceMisVo performanceDetails(String performancesId) {
         log.info(" PERFORMANCE  mis演出详情");
-//        PerformanceMisVo createMisVo = mongoTemplate.findOne(
-//                Query.query(Criteria.where("performancesId").is(performancesId)),
-//                PerformanceMisVo.class,
-//                PerformanceMisVo.class.getSimpleName());
         PerformanceMisVo createMisVo = performanceVoTask.getPerformanceMisVo(performancesId);
         return createMisVo;
     }

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

@@ -176,6 +176,8 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             performancePartnerVo.setIsSubmit(0);
             performancePartnerVo.setStatus(0);
             performancePartnerVo.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds()));
+            performancePartnerVo.setFieldName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performancePartnerVo.getFieldId(), "name"));
+            performancePartnerVo.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds()));
             if (data != null) { // 有修改记录
                 performancePartnerVo.setIsTrueName(data.getIsTrueName());
                 performancePartnerVo.setLimitCount(data.getLimitCount());
@@ -405,7 +407,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                 );
                 return ResponseDto.success("保存成功");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             return ResponseDto.failure(ErrorMapping.get(20115));
         }
     }
@@ -658,21 +660,22 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             List<TicketTimesPartnerVo> ticketTimesPartnerVos = mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId)), TicketTimesPartnerVo.class, TicketTimesPartnerVo.class.getSimpleName());
             for (TicketTimesPartnerVo timeItem : ticketTimesPartnerVos) {
                 //复制场次
+                String timesId = timeItem.getTicketTimesId();
                 timeItem.setTicketTimesId(IDGenerator.nextSnowId().toString());
                 timeItem.setPerformancesId(performancePartnerVo.getPerformancesId());
                 mongoTemplate.insert(timeItem, TicketTimesPartnerVo.class.getSimpleName());
 
-                List<TicketPartnerVo> ticketPartnerVos = mongoTemplate.find(Query.query(Criteria.where("timesId").is(timeItem.getTicketTimesId())), TicketPartnerVo.class, TicketPartnerVo.class.getSimpleName());
+                List<TicketPartnerVo> ticketPartnerVos = mongoTemplate.find(Query.query(Criteria.where("timesId").is(timesId)), TicketPartnerVo.class, TicketPartnerVo.class.getSimpleName());
                 for (TicketPartnerVo ticketItem : ticketPartnerVos) {
                     //复制票
                     ticketItem.setStatus(0);
-                    ticketItem.setTimesId(ticketItem.getTimesId());
+                    ticketItem.setTimesId(timeItem.getTicketTimesId());
                     ticketItem.setTicketsId(IDGenerator.nextSnowId().toString());
                     mongoTemplate.insert(ticketItem, TicketPartnerVo.class.getSimpleName());
                 }
             }
             return performancePartnerVo.getPerformancesId();
-        }catch (Exception e){
+        } catch (Exception e) {
             return null;
         }
     }
@@ -747,7 +750,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             } else {
                 return ResponseDto.failure(ErrorMapping.get(20116));
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             return ResponseDto.failure(ErrorMapping.get(20117));
         }
     }