Merge branch 'dev' into test

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

@@ -203,7 +203,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 List<OrderRefundListVo> orderRefundListVos = new ArrayList<>();
                 BigDecimal lockPrice = BigDecimal.valueOf(0.00);
                 for (KylinOrderRefundsVo item : orderRefundsVoList) {
-                    if(item.getType().equals(1)){
+                    if (item.getType().equals(1)) {
                         break;
                     }
                     OrderRefundListVo data = OrderRefundListVo.getNew();
@@ -239,7 +239,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 orderTicketVo.setOrderRefundListVos(orderRefundListVos);
                 orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
                 vo.setOrderTicketVo(orderTicketVo);
-                vo.setEnterDescribe(dataUtils.getEnterInfo(performanceVo.getType(),orderTicketVo.getGetTicketType(),orderTicketVo.getIsStudent(),ticketVo.getIsTrueName()));
+                vo.setEnterDescribe(dataUtils.getEnterInfo(performanceVo.getType(), orderTicketVo.getGetTicketType(), orderTicketVo.getIsStudent(), ticketVo.getIsTrueName()));
             }
             log.info(UserPathDto.setData("订单详情", orderId, vo));
             return vo;
@@ -510,6 +510,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 kylinOrderTicketEntitiesVo.setIsPayment(newIsPayment);
                 kylinOrderTicketEntitiesVo.setUpdatedAt(strTime);
                 kylinOrderTicketEntitiesVo.setChangeDate(time);
+                kylinOrderTicketEntitiesVo.setRefundPrice(null);
                 BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
                 mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("orderTicketEntitiesId").is(item.getOrderTicketEntitiesId())).getQueryObject(),

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetTemplateServiceImpl.java

@@ -87,7 +87,8 @@ public class SweetTemplateServiceImpl {
 
     public ResponseDto remind(String unionId, String performancesId) {
         ResponseDto<KylinPerformanceVo> performanceVo = feignKylinPerformanceClient.detail(performancesId);
-        redisDataUtils.setSweetRemind(unionId, performancesId);
+        KylinPerformanceVo performanceInfo = performanceVo.getData();
+        redisDataUtils.setSweetRemind(unionId, performancesId, performanceInfo);
         return ResponseDto.success();
     }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.dto.SweetManualAppletDto;
 import com.liquidnet.service.sweet.dto.SweetManualArtistList2Dto;
@@ -229,21 +230,19 @@ public class RedisDataUtils {
     }
 
     // 小程序演出提醒
-    public void setSweetRemind(String unionId, String performancesId) {
+    public void setSweetRemind(String unionId, String performancesId, KylinPerformanceVo performanceInfo) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_REMIND.concat(unionId);
         SweetRemindVo sweetRemindVo = SweetRemindVo.getNew();
         sweetRemindVo.setCreatedAt(DateUtil.getNowTime());
         sweetRemindVo.setPerformancesId(performancesId);
         sweetRemindVo.setUnionId(unionId);
 
-        /*String redisKeyPer = KylinRedisConst.PERFORMANCES.concat(performancesId);
-        KylinPerformanceVo perInfo = (KylinPerformanceVo) redisUtil.get(redisKeyPer);
-        if (null != perInfo) {
-            sweetRemindVo.setFieldName(perInfo.getFieldName());
-            sweetRemindVo.setTitle(perInfo.getTitle());
-            sweetRemindVo.setTimeStart(perInfo.getTimeStart());
-            sweetRemindVo.setSellTime(perInfo.getSellTime());
-        }*/
+        if (null != performanceInfo) {
+            sweetRemindVo.setFieldName(performanceInfo.getFieldName());
+            sweetRemindVo.setTitle(performanceInfo.getTitle());
+            sweetRemindVo.setTimeStart(performanceInfo.getTimeStart());
+            sweetRemindVo.setSellTime(performanceInfo.getSellTime());
+        }
         redisUtil.set(redisKey, sweetRemindVo);
     }
 }