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

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

@@ -13,6 +13,7 @@ import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.dto.param.*;
 import com.liquidnet.service.kylin.dto.vo.admin.*;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
@@ -743,6 +744,11 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                         Query.query(Criteria.where("orderTicketsId").in(orderTicketIdList)).getQueryObject(),
                         new BasicDBObject("$set", mongoConverter.convertToMongoType(mapMongo))
                 );
+                mapMongo.put("useEnd", ticketVo.getUseEnd());
+                mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateMany(
+                        Query.query(Criteria.where("orderId").in(orderTicketIdList)).getQueryObject(),
+                        new BasicDBObject("$set", mongoConverter.convertToMongoType(mapMongo))
+                );
                 log.debug("修改场次相关 mongo time -> " + (System.currentTimeMillis() - time1) + " ms ");
 
                 time1 = System.currentTimeMillis();

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/CandyUserCouponBasicDto.java

@@ -131,7 +131,7 @@ public class CandyUserCouponBasicDto implements Serializable, Cloneable {
         this.setCcode(cCode);
 
         this.setState(1);
-        this.setBindAt(LocalDateTime.now());
+        this.setBindAt(couponInfoDto.getEffectAt());
         this.setDuedAt(duedAt);
 
         this.setUseRules(couponInfoDto.getUseRules());

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/service/impl/CandyCouponServiceImpl.java

@@ -147,7 +147,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
             CandyCouponVo baseVo = CouponBaseUtil.getPerformanceCouponUserVo(dtoItem, priceTotal, performanceId, timeId, ticketId);
             if (type == 1) {
-                if (baseVo.getState().equals(3) || dtoItem.getState().equals(5) || dtoItem.getState().equals(21)) {
+                if (baseVo.getState().equals(3) || dtoItem.getState().equals(5)) {
                     continue;
                 }
             } else if (type == 2) {
@@ -216,7 +216,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
             CandyCouponVo baseVo = CouponBaseUtil.getGoodCouponUserVo(dtoItem, priceTotal, goodId, dtoList.size());
             if (type == 1) {
-                if (baseVo.getState().equals(3) || dtoItem.getState().equals(5) || dtoItem.getState().equals(21)) {
+                if (baseVo.getState().equals(3) || dtoItem.getState().equals(5)) {
                     continue;
                 }
             } else if (type == 2) {
@@ -482,7 +482,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
             LinkedList<Object[]> objsUserCoupon = CollectionUtil.linkedListObjectArr(),
                     objsCouponCode = CollectionUtil.linkedListObjectArr();
             toMqSqls.add(SqlMapping.get("candy_coupon.receive"));
-            objsUserCoupon.add(new Object[]{uCouponId, uid, 1, infoDto.getCouponId(), ccode, now, now, infoDto.getExpireAt()});
+            objsUserCoupon.add(new Object[]{uCouponId, uid, 1, infoDto.getCouponId(), ccode, infoDto.getEffectAt(), now, infoDto.getExpireAt()});
             toMqSqls.add(SqlMapping.get("candy_coupon_code.receive"));// state:状态[0-可用|1-已用]
             objsCouponCode.add(new Object[]{1, uCouponId, uid, mobile, now, now, dto.getCouponId(), ccode});
             queueUtils.sendMsgByRedis(

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/util/CouponBaseUtil.java

@@ -177,7 +177,6 @@ public class CouponBaseUtil {
                 voRules.setBusiId(ruleItem.getBusiId());
                 voRules.setBusiName(ruleItem.getBusiName());
                 rulesVoList.add(voRules);
-                System.out.println(dtoItem.getUcouponId());
                 switch (ruleItem.getUseScope()) {
                     case 80://商品
                         isTarget = isTargetCoupon(ruleItem.getBusiId(), dtoItem.getCouType(), goodId, priceTotal, dtoItem.getValOver());

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

@@ -527,9 +527,18 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         // 3审核通过;4审核未通过;6在售;7停售;8售罄;9未开始;10已结束
         int getStatus = ticketItem.getStatus();
         int status = getStatus;
+
+        if (getStatus == 8) {
+            getStatus = 6;
+        }
+        boolean isSellOut = dataUtils.ticketIsSoldOut(ticketItem.getTicketsId());
+        if (isSellOut) {
+            status = 8;
+            getStatus = 8;
+        }
         if (null != ticketItem) {
             // 判断售罄
-            if (6 == getStatus || 8 == getStatus || 9 == getStatus || 10 == getStatus) {
+            if (6 == getStatus || 9 == getStatus || 10 == getStatus) {
                 String timeStart = ticketItem.getTimeStart();
                 String timeEnd = ticketItem.getTimeEnd();
                 String nowTime = DateUtil.getNowTime();
@@ -543,11 +552,6 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
                     }
                 }
             }
-
-            boolean isSellOut = dataUtils.ticketIsSoldOut(ticketItem.getTicketsId());
-            if (isSellOut) {
-                status = 8;
-            }
         }
         return status;
     }
@@ -623,22 +627,22 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         if (useScope.equals(91)) {//场次
             List<KylinTicketTimesPartnerVo> voTimes = mongoTemplate.find(Query.query(Criteria.where("ticketTimesId").is(busiId)),
                     KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
-            if(voTimes.size()<=0){
+            if (voTimes.size() <= 0) {
                 return ResponseDto.failure();
-            }else{
+            } else {
                 return ResponseDto.success(voTimes.get(0).getPerformancesId());
             }
         } else if (useScope.equals(92)) {//票
             List<KylinTicketPartnerVo> voTickets = mongoTemplate.find(Query.query(Criteria.where("ticketsId").is(busiId)),
                     KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
-            if(voTickets.size()<=0) {
+            if (voTickets.size() <= 0) {
                 return ResponseDto.failure();
-            }else{
+            } else {
                 List<KylinTicketTimesPartnerVo> voTimes = mongoTemplate.find(Query.query(Criteria.where("ticketTimesId").is(voTickets.get(0).getTimesId())),
                         KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
-                if(voTimes.size()<=0){
+                if (voTimes.size() <= 0) {
                     return ResponseDto.failure();
-                }else{
+                } else {
                     return ResponseDto.success(voTimes.get(0).getPerformancesId());
                 }
             }