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

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberCodeParam.java

@@ -12,7 +12,7 @@ public class AdamMemberCodeParam implements Serializable {
     private static final long serialVersionUID = -7273522103593077617L;
     @ApiModelProperty(position = 1, required = true, value = "会员类型ID", example = "1")
     private String memberId;
-    @ApiModelProperty(position = 2, required = true, value = "会员价格ID", example = "101")
+    @ApiModelProperty(position = 2, required = true, value = "会员价格ID", example = "1")
     private String memberPriceId;
     @ApiModelProperty(position = 3, required = true, value = "类型:0-用户购买兑换码,1-后台生成兑换码", example = "1")
     private Integer type;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberOrderParam.java

@@ -16,7 +16,7 @@ public class AdamMemberOrderParam implements Serializable {
     @ApiModelProperty(position = 10, required = true, value = "会员ID[50]", example = "1")
     @NotBlank
     private String memberId;
-    @ApiModelProperty(position = 11, required = true, value = "会员价格ID", example = "101")
+    @ApiModelProperty(position = 11, required = true, value = "会员价格ID", example = "1")
     @NotBlank
     private String memberPriceId;
     @ApiModelProperty(position = 12, required = true, value = "购买方式:0-购买会员,1-购买会员码", allowableValues = "0,1")

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

@@ -27,7 +27,6 @@ public class CreateTicketTimesParam implements Serializable {
     private LocalDateTime useStart;
 
     @ApiModelProperty(value = "场次适用结束时间", example = "2020-12-01T12:00:00")
-    @NotNull(message = "不能为空")
     private LocalDateTime useEnd;
 
     @ApiModelProperty(value = "类型 1单日票 2通票", example = "1")

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

@@ -58,7 +58,7 @@ public interface IKylinTicketsPartnerService extends IService<KylinTickets> {
      * @param ticketsId 票id
      * @return vo
      */
-    ResponseDto<KylinTicketPartnerVo> copyTicket(String ticketsId);
+    ResponseDto<KylinTicketPartnerVo> copyTicket(String performanceId,String ticketsId);
 
     /**
      * 整个场次票 提交 审核

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java

@@ -165,6 +165,9 @@ public class PerformanceVoUtils {
                 }
             }
 
+            if(vo.getAppStatus()<=4){
+                appStatus=vo.getAppStatus();
+            }
             if(vo.getAppStatus()==7){
                 appStatus=7;
             }

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CurrentUtil.java

@@ -57,21 +57,21 @@ public class CurrentUtil {
         }
         if (ip == null || ip.length() == 0 || CLI_UNKNOWN.equalsIgnoreCase(ip)) {
             ip = request.getRemoteAddr();
-            if (LOCALHOST_IP1.equalsIgnoreCase(ip) || LOCALHOST_IP.equalsIgnoreCase(ip)) {
-                // 根据网卡取本机配置的IP
-                InetAddress iNet = null;
-                try {
-                    iNet = InetAddress.getLocalHost();
-                } catch (UnknownHostException e) {
-                    e.printStackTrace();
-                }
-                ip = iNet.getHostAddress();
-            }
+//            if (LOCALHOST_IP1.equalsIgnoreCase(ip) || LOCALHOST_IP.equalsIgnoreCase(ip)) {
+//                // 根据网卡取本机配置的IP
+//                InetAddress iNet = null;
+//                try {
+//                    iNet = InetAddress.getLocalHost();
+//                } catch (UnknownHostException e) {
+//                    e.printStackTrace();
+//                }
+//                ip = iNet.getHostAddress();
+//            }
         }
         // 使用代理，则获取第一个IP地址
         if (!StringUtils.isEmpty(ip) && ip.indexOf(IP_UTILS_FLAG) > 0) {
             ip = ip.substring(0, ip.indexOf(IP_UTILS_FLAG));
         }
-        return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : ip;
+        return LOCALHOST_IP.equals(ip) ? LOCALHOST_IP1 : ip;
     }
 }

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

@@ -286,7 +286,7 @@
         <where>
         ps.status in ${status}
         <if test="title!=''">
-            AND title LIKE concat('%', ${title}, '%')
+            AND title LIKE concat('%', #{title}, '%')
         </if>
         </where>
         LIMIT 20

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java

@@ -173,9 +173,10 @@ public class AdamMemberOrderController {
     public ResponseDto<AdamMemberOrderResult> exchangeMemberCode(@Valid @RequestBody AdamMemberOrderCodeParam param) {
         log.debug("member/order/exchange:param:{}", JsonUtils.toJson(param));
         String currentUid = CurrentUtil.getCurrentUid();
-        if (null != adamRdmService.getUserMemberVoByUid(currentUid)) {// 仅限从未购买过会员的用户使用
-            return ResponseDto.failure(ErrorMapping.get("10200"));
-        }
+        // TODO: 2021/6/19 关闭该验证（如果已是会员继续兑换则保留原会员号，兑换码对应会员号记录至会员订单）
+//        if (null != adamRdmService.getUserMemberVoByUid(currentUid)) {// 仅限从未购买过会员的用户使用
+//            return ResponseDto.failure(ErrorMapping.get("10200"));
+//        }
 
         // TODO: 2021/6/9 判断黑名单，待定（暂不做）
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserMemberServiceImpl.java

@@ -31,6 +31,7 @@ public class AdamUserMemberServiceImpl extends ServiceImpl<AdamUserMemberMapper,
 
     @Override
     public String getNextMemberNo(String memberId) {
+        long s = System.currentTimeMillis();
         int memberMaxNo = adamRdmService.getMaxMemberNo();
         if (-1 == memberMaxNo) {
             if (RedisLockUtil.tryLock(LOCK_KEY_UMEMBER_NO, 1, 3000)) {
@@ -58,6 +59,7 @@ public class AdamUserMemberServiceImpl extends ServiceImpl<AdamUserMemberMapper,
             // 不能是完全相同的数字
             nextMemberNoStr = String.valueOf(adamRdmService.incrMemberNo());
         }
+        log.debug("#MNO耗时:{}ms", System.currentTimeMillis() - s);
         return nextMemberNoStr;
     }
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -220,7 +220,7 @@ CREATE TABLE `kylin_ticket_times`
     `type`            tinyint      NOT NULL DEFAULT 1 COMMENT '状态 1单日票 2通票',
     `status`          tinyint      NOT NULL DEFAULT 1 COMMENT '状态 0不可用 1可用',
     `use_start`       datetime     NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票开始时间',
-    `use_end`         datetime     NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票结束时间',
+    `use_end`         datetime              DEFAULT NULL COMMENT '售票结束时间',
     `comment`         varchar(255) NULL     DEFAULT '' COMMENT 'comment',
     `created_at`      datetime(3)  NULL     DEFAULT NULL COMMENT '创建时间',
     `updated_at`      datetime(3)  NULL     DEFAULT NULL COMMENT '修改时间',
@@ -264,7 +264,7 @@ CREATE TABLE `kylin_tickets`
     `time_end`              datetime      NOT NULL DEFAULT '2030-01-01 12:00:00' COMMENT '售卖结束时间',
     `time_end_express`      datetime      NOT NULL DEFAULT '2030-01-01 12:00:00' COMMENT '快递票结束时间',
     `use_start`             datetime      NOT NULL DEFAULT '2030-01-01 12:00:00' COMMENT '适用开始时间',
-    `use_end`               datetime      NOT NULL DEFAULT '2030-01-01 12:00:00' COMMENT '适用结束时间',
+    `use_end`               datetime               DEFAULT NULL COMMENT '适用结束时间',
     `pay_countdown_minute`  int(11)       NOT NULL DEFAULT 5 COMMENT '支付倒计时时间',
     `sale_remind_minute`    int(11)       NOT NULL DEFAULT 60 COMMENT '开票提醒倒计时（分钟数）',
     `comment`               varchar(255)  NULL     DEFAULT '' COMMENT 'comment',

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

@@ -57,8 +57,8 @@ public class KylinTicketsPartnerController {
     @PostMapping(value = "/copy")
     @ApiOperation(value = "复制票务",position = 4)
     @ApiResponse(response = KylinTicketPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<KylinTicketPartnerVo> copyTicket(@RequestParam("ticketsId") @NotNull String ticketsId) {
-        return ticketsPartnerService.copyTicket(ticketsId);
+    public ResponseDto<KylinTicketPartnerVo> copyTicket(@RequestParam("performancesId") @NotNull String performancesId,@RequestParam("ticketsId") @NotNull String ticketsId) {
+        return ticketsPartnerService.copyTicket(performancesId,ticketsId);
     }
 
     @GetMapping(value = "/details")

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

@@ -115,7 +115,7 @@ public class PerformancePartnerController {
         return performancesPartnerService.withdraw(performancesId);
     }
 
-    @PostMapping(value = "orderStatistical")
+    @GetMapping(value = "orderStatistical")
     @ApiOperation(value = "演出订单统计",position = 9)
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<List<PerformanceOrderStatisticalDao>> performanceOrderStatisticalList(@RequestParam("performancesId") @NotNull String performancesId) {

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

@@ -108,6 +108,14 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     @Autowired
     private KylinOrderTicketEntitiesMapper entitiesMapper;
 
+    ArrayList<Integer> canBuyStatus = new ArrayList(){{
+        add(6);
+        add(8);
+        add(9);
+        add(10);
+    }};
+
+
     @Override
     public ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam) {
         Long currentTime;
@@ -192,7 +200,13 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             int performanceMemberLimit = performanceData.getLimitCountMember();//会员演出限购
             int isTrueName = ticketData.getIsTrueName();//是否演出实名
 
-            //TODO 演出 票状态
+            if(!canBuyStatus.contains(performanceData.getAppStatus())){
+                return ResponseDto.failure("当前不可购买");//没有会员权限
+            }
+
+            if(!canBuyStatus.contains(performanceData.getAppStatus())){
+                return ResponseDto.failure("当前不可购买");//没有会员权限
+            }
 
             //通用判断时间
             if (isMember) {

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

@@ -88,21 +88,26 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             LocalDateTime createdAt = LocalDateTime.now();
             // 标题
             String title = "";
-            String useStart = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
-            String useEnd = createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+            String useStart;
+            String useEnd;
             if (createTicketTimesParam.getType() == 1) {
-                if(!useStart.split(" ")[0].equals(useEnd.split(" ")[0])){
-                    return ResponseDto.failure(ErrorMapping.get(20118));
-                }
+                useStart = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+                useEnd = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
                 title = useStart;
             } else {
+                useStart = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+                useEnd = createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
                 title = useStart + "-" + useEnd;
             }
             // mongo 操作
             KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = new KylinTicketTimesPartnerVo();
             kylinTicketTimesPartnerVo.setTicketTimesId(ticketTimesId);
             kylinTicketTimesPartnerVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            if(createTicketTimesParam.getType() == 2) {
                 kylinTicketTimesPartnerVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            }else{
+                kylinTicketTimesPartnerVo.setUseEnd(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            }
             kylinTicketTimesPartnerVo.setStatus(1);
             kylinTicketTimesPartnerVo.setTitle(title);
             kylinTicketTimesPartnerVo.setPerformancesId(createTicketTimesParam.getPerformancesId());

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

@@ -193,9 +193,10 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
     public ResponseDto<KylinTicketPartnerVo> updateTicket(TicketCreateParam ticketCreateParam) {
         log.info("票 修改");
         try {
-            KylinTicketTimeRelation ticketTimeRelation = ticketTimeRelationMapper.selectOne(
-                    new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketCreateParam.getTimesId()));
-            PerformancePartnerVo data = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(ticketTimeRelation.getPerformanceId())),
+            KylinTicketTimesPartnerVo ticketTimeRelation = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketCreateParam.getTimesId())),
+                    KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
+
+            PerformancePartnerVo data = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(ticketTimeRelation.getPerformancesId())),
                     PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
             if (data == null || data.getAuditStatus() == null || data.getAuditStatus() == 0) {
                 return ResponseDto.failure(ErrorMapping.get("20112"));
@@ -236,6 +237,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             KylinTicketPartnerVo kylinTicketPartnerVoData = JsonUtils.fromJson(doc.toJson(), KylinTicketPartnerVo.class);
             return ResponseDto.success(kylinTicketPartnerVoData);
         } catch (Exception e) {
+            e.printStackTrace();
             return ResponseDto.failure(ErrorMapping.get(20103));
         }
     }
@@ -282,16 +284,22 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
                 return ResponseDto.failure(ErrorMapping.get(20106));
             }
         } catch (Exception e) {
+            e.printStackTrace();
             return ResponseDto.failure(ErrorMapping.get(20102));
         }
     }
 
     @Override
-    public ResponseDto<KylinTicketPartnerVo> copyTicket(String ticketsId) {
+    public ResponseDto<KylinTicketPartnerVo> copyTicket(String performanceId,String ticketsId) {
         try {
             // 获取 当前时间 -> 创建时间
             LocalDateTime createdAt = LocalDateTime.now();
 
+            PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
+            if(performancePartnerVo.getAuditStatus()==1){
+                return ResponseDto.failure(ErrorMapping.get(20107));
+            }
+
             KylinTicketPartnerVo kylinTicketPartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("ticketsId").is(ticketsId)), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
             kylinTicketPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             kylinTicketPartnerVo.setTicketsId(IDGenerator.nextSnowId().toString());
@@ -301,6 +309,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             );
             return ResponseDto.success(kylinTicketPartnerVo);
         } catch (Exception e) {
+            e.printStackTrace();
             return ResponseDto.failure(ErrorMapping.get(20107));
         }
     }
@@ -361,6 +370,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
                 return ResponseDto.failure(ErrorMapping.get(20110));
             }
         }catch (Exception e){
+            e.printStackTrace();
             return ResponseDto.failure(ErrorMapping.get(20108));
         }
     }
@@ -391,6 +401,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
                 return ResponseDto.failure(ErrorMapping.get(20111));
             }
         }catch (Exception e){
+            e.printStackTrace();
             return ResponseDto.failure(ErrorMapping.get(20109));
         }
     }

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

@@ -171,6 +171,9 @@ public class PerformanceVoTask {
                     }
                 }
             }
+            if(vo.getAppStatus()<=4){
+                appStatus=vo.getAppStatus();
+            }
             if(vo.getAppStatus()==7){
                 appStatus=7;
             }