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

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

@@ -148,6 +148,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                             ticketStatus.setStatus(status);
                             ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketItem.getTicketsId()));
                         }
+
                     }
                 } else { //只修改演出相关 场次 票 (不包括 库存 售卖时间 限购)
                     log.info(" PERFORMANCE  演出审核 修改");

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

@@ -277,7 +277,7 @@
         FROM kylin_performances AS p
                  LEFT JOIN kylin_performance_status AS ps ON ps.performance_id = p.performances_id
                  LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
-        WHERE (ps.status = 3 or ps.status = 6 or ps.status = 7)
+        WHERE (ps.status = 3 or ps.status = 6 or ps.status = 7 or ps.status = 8 or ps.status = 9 or ps.status = 10)
           AND pr.road_show_id = ${roadShowId}
         LIMIT 100
     </select>

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

@@ -8,6 +8,7 @@ import com.liquidnet.common.mq.constant.MQConst;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
+import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.feign.adam.api.FeignAdamBaseClient;
@@ -149,20 +150,20 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
             if (performanceData == null || ticketTimesData == null || ticketData == null) {
                 //redisLockUtil.unlock(lock);
-                return ResponseDto.failure("参数错误");//参数错误
+                return ResponseDto.failure(ErrorMapping.get("20004"));//参数错误
             }
             if (!ticketData.getTimeId().equals(payOrderParam.getTimeId()) || !ticketTimesData.getPerformanceId().equals(payOrderParam.getPerformanceId())) {
                 //redisLockUtil.unlock(lock);
-                return ResponseDto.failure("参数错误");//参数错误List<AdamEntersVo> entersVoList
+                return ResponseDto.failure(ErrorMapping.get("20004"));//参数错误
             }
             if (payOrderParam.getNumber()%ticketData.getCounts()!=0) {
                 //redisLockUtil.unlock(lock);
-                return ResponseDto.failure("数量错误");//参数错误List<AdamEntersVo> entersVoList
+                return ResponseDto.failure(ErrorMapping.get("20007"));//数量错误
             }
             //判断代理
             if (!checkAgent(payOrderParam.getAgentId(), ticketData)) {
                 //redisLockUtil.unlock(lock);
-                return ResponseDto.failure("无权购买");
+                return ResponseDto.failure(ErrorMapping.get("20008"));//无权购买
             }
 
             Integer isStudent = ticketData.getIsStudent();
@@ -181,7 +182,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 memberType = 2;
                 if (!isMember) {
                     //redisLockUtil.unlock(lock);
-                    return ResponseDto.failure("非会员用户暂不可购买");//没有会员权限
+                    return ResponseDto.failure(ErrorMapping.get("20009"));//没有会员权限
                 }
             } else {
                 if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == 1 && DateUtil.compareStrDay(DateUtil.getNowTime(), timeStart) == -1 && ticketData.getIsMember() == 1) {
@@ -189,7 +190,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     memberType = 1;
                     if (!isMember) {
                         //redisLockUtil.unlock(lock);
-                        return ResponseDto.failure("非会员用户暂不可购买");//没有会员权限
+                        return ResponseDto.failure(ErrorMapping.get("20009"));//没有会员权限
                     }
                 } else {
                     // 普通用户购买逻辑
@@ -205,49 +206,49 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             int isTrueName = ticketData.getIsTrueName();//是否演出实名
 
             if (!canBuyStatus.contains(performanceData.getAppStatus())) {
-                return ResponseDto.failure("当前不可购买");//没有会员权限
+                return ResponseDto.failure(ErrorMapping.get("20010"));//当前不可购买
             }
 
             if (!canBuyStatus.contains(performanceData.getAppStatus())) {
-                return ResponseDto.failure("当前不可购买");//没有会员权限
+                return ResponseDto.failure(ErrorMapping.get("20010"));//当前不可购买
             }
 
             //通用判断时间
             if (isMember) {
                 if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == -1) {
                     //redisLockUtil.unlock(lock);
-                    return ResponseDto.failure("未开始售卖");//未开始
+                    return ResponseDto.failure(ErrorMapping.get("20011"));//未开始
                 }
             } else {
                 if (DateUtil.compareStrDay(DateUtil.getNowTime(), timeStart) == -1) {
                     //redisLockUtil.unlock(lock);
-                    return ResponseDto.failure("未开始售卖");//未开始
+                    return ResponseDto.failure(ErrorMapping.get("20011"));//未开始
                 }
             }
             if (DateUtil.compareStrDay(DateUtil.getNowTime(), timeEnd) == 1) {
                 //redisLockUtil.unlock(lock);
-                return ResponseDto.failure("售卖已结束");//已结束
+                return ResponseDto.failure(ErrorMapping.get("20012"));//已结束
             }
 
             //快递票判断
             if (payOrderParam.getIsExpress() != null) {
                 if (payOrderParam.getIsExpress() == 1 && DateUtil.compareStrDay(DateUtil.getNowTime(), timeExpressEnd) == 1) {
                     //redisLockUtil.unlock(lock);
-                    return ResponseDto.failure("已超过快递票截止时间");//快递票不卖
+                    return ResponseDto.failure(ErrorMapping.get("20013"));//快递票不卖
                 }
                 if (payOrderParam.getIsExpress() == 1 && payOrderParam.getAddressId().isEmpty()) {
                     //redisLockUtil.unlock(lock);
-                    return ResponseDto.failure("快递票未填写收货地址");//快递票未填写收货地址
+                    return ResponseDto.failure(ErrorMapping.get("20014"));//快递票未填写收货地址
                 }
             }
             //实名判断
             if (isTrueName == 1 && payOrderParam.getEnterIdList().size() <= 0) {
                 //redisLockUtil.unlock(lock);
-                return ResponseDto.failure("入场人数量错误");//需要实名 未实名
+                return ResponseDto.failure(ErrorMapping.get("20015"));//需要实名 未实名
             }
             if (isTrueName == 1 && payOrderParam.getEnterIdList().size() != payOrderParam.getNumber()) {
                 //redisLockUtil.unlock(lock);
-                return ResponseDto.failure("入场人数量错误");//入场人数量错误
+                return ResponseDto.failure(ErrorMapping.get("20015"));//入场人数量错误
             }
 
             // 判断库存
@@ -270,7 +271,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 currentTime = System.currentTimeMillis() - currentTime;
                 log.debug("redis 修改库存 售罄 -> time:" + (currentTime) + "毫秒");
                 //redisLockUtil.unlock(lock);
-                return ResponseDto.failure("该票种已售罄");//没抢到
+                return ResponseDto.failure(ErrorMapping.get("20016"));//没抢到
             } else {
                 isDownGeneral = true;
 
@@ -285,7 +286,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                             int age = IDCard.getAgeByIdCard(adamEnters.getIdCard());
                             if (age > 25) {
                                 //redisLockUtil.unlock(lock);
-                                return ResponseDto.failure("年龄不符合");//年龄超了
+                                return ResponseDto.failure(ErrorMapping.get("20017"));//年龄超了
                             }
                         }
                     }
@@ -338,7 +339,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             e.printStackTrace();
             log.error("Kylin Order Pay Error = " + e.getMessage());
             //redisLockUtil.unlock(lock);
-            return ResponseDto.failure("下单失败");//乱七八糟异常
+            return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常
         }
     }
 

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

@@ -239,11 +239,11 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
 
     @Override
     public List<KylinTicketTimesPartnerVo> getTimesMongoList(String performancesId) {
-        return mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId)), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
+        return mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId).and("status").ne(0)), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
     }
 
     @Override
     public KylinTicketTimesPartnerVo getTimesMongo(String timesId) {
-        return mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(timesId)), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
+        return mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(timesId).and("status").ne(-1)), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
     }
 }

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

@@ -327,7 +327,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
         map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
         UpdateResult updateResult = mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateMany(
-                Query.query(Criteria.where("timesId").is(timesId)).getQueryObject(),
+                Query.query(Criteria.where("timesId").is(timesId).and("status").ne(-2)).getQueryObject(),
                 object
         );
         return updateResult.getModifiedCount() <= 0;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/errors.properties

@@ -7,10 +7,21 @@
 20001=验证码发送失败
 20002=验证码无效
 20003=无权查看
-20004=
+20004=参数错误
 20005=手机号获取失败，请更换登录方式
 20006=第三方账号未注册
-20007=
+20007=数量错误
+20008=无权购买
+20009=非会员用户暂不可购买
+20010=当前不可购买
+20011=未开始售卖
+20012=售卖已结束
+20013=已超过快递票截止时间
+20014=快递票未填写收货地址
+20015=入场人数量错误
+20016=该票种已售罄
+20017=年龄不符合
+20018=下单失败
 
 #APP PARTNER
 20101=添加失败