Merge branch 'dev-1.6-shouqianba' into container-test

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinSqbOrderDetailVo.java

@@ -69,9 +69,12 @@ public class GoblinSqbOrderDetailVo implements Serializable {
     @ApiModelProperty(value = "核销二维码")
     private String couponQrCode;
 
-    @ApiModelProperty(value = "券码过期时间")
+    @ApiModelProperty(value = "券码过期时间:取的演出结束时间")
     private String couponExpireTime;
 
     @ApiModelProperty(value = "券核销标记：0-未核销 1-已核销")
     private Integer couponUsedStatus;
+
+    @ApiModelProperty(value = "修改时间")
+    private String updateTime;
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinSqbServiceImpl.java

@@ -16,6 +16,7 @@ import com.liquidnet.service.goblin.util.GoblinMongoUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
 import com.liquidnet.service.goblin.util.GoblinSqbRedisUtils;
 import com.liquidnet.service.goblin.util.QueueUtils;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -400,13 +401,14 @@ public class GoblinSqbServiceImpl implements IGoblinSqbService {
         detailVo.setSkuName(skuVo.getSkuName());
         detailVo.setSkuImage(skuVo.getSkuImage());
         detailVo.setQuantity(skuVo.getNum());
+        detailVo.setUpdateTime(sqbOrderVo.getUpdatedAt());
         // 来自 GoblinSqbOrderVo（Redis 或 DB；无扩展数据时券标记默认 0）
         if (sqbOrderVo != null) {
             detailVo.setPerformancesId(sqbOrderVo.getPerformancesId());
             detailVo.setSqbAcquiringSn(sqbOrderVo.getSqbAcquiringSn());
             detailVo.setCouponSn(sqbOrderVo.getCouponSn());
             detailVo.setCouponQrCode(sqbOrderVo.getCouponQrCode());
-            detailVo.setCouponExpireTime(sqbOrderVo.getCouponExpireTime());
+            detailVo.setCouponExpireTime(getPerformanceEndTime(sqbOrderVo.getPerformancesId())); // 取演出结束时间
             detailVo.setCouponUsedStatus(sqbOrderVo.getCouponUsedStatus() != null ? sqbOrderVo.getCouponUsedStatus() : 0);
         } else {
             detailVo.setCouponUsedStatus(0);
@@ -414,6 +416,14 @@ public class GoblinSqbServiceImpl implements IGoblinSqbService {
         return detailVo;
     }
 
+    private String getPerformanceEndTime(String performancesId) {
+        KylinPerformanceVo kylinPerformanceVo = goblinMongoUtils.getKylinPerformanceVo(performancesId);
+        if (null != kylinPerformanceVo) {
+            return kylinPerformanceVo.getTimeEnd();
+        }
+        return "";
+    }
+
     /**
      * 与列表/详情/查券码一致：Redis 无扩展单时从库加载并回写，避免仅因缓存未命中误判「订单不存在」。
      */

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -11,6 +11,8 @@ import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.entity.GoblinFrontBanner;
 import com.liquidnet.service.goblin.entity.GoblinFrontHotWord;
 import com.liquidnet.service.goblin.entity.GoblinFrontNavigation;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.UpdateOneModel;
 import com.mongodb.client.model.WriteModel;
@@ -1990,4 +1992,17 @@ public class GoblinMongoUtils {
     }
     /* ----------------------------------------  ---------------------------------------- */
     /* ----------------------------------------  ---------------------------------------- */
+
+    public KylinPerformanceVo getKylinPerformanceVo(String performanceId) {
+        Object obj = redisUtils.get(KylinRedisConst.PERFORMANCES + performanceId);
+        if (obj != null) {
+            return (KylinPerformanceVo) obj;
+        } else {
+            return mongoTemplate.findOne(Query
+                            .query(Criteria.where("performancesId")
+                                    .is(performanceId)),
+                    KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
+        }
+
+    }
 }