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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetIntegralActivityServiceImpl.java

@@ -62,7 +62,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
             if (!CollectionUtils.isEmpty(prizeList)) {
                 for (SweetIntegralActivityPrizeFormParam prize : prizeList) {
                     if (prize.getPrizeType() == 2) {
-                        prize.setPrizeTypeNum(10);
+                        prize.setPrizeTypeNum(100);
                     } else {
                         prize.setPrizeTypeNum(1);
                     }
@@ -102,7 +102,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
                     sweetIntegralActivityPrize.setIntegralActivityId(integralActivityId);
                     String prizeId = prize.getPrizeId();
                     if (prize.getPrizeType() == 2) {
-                        sweetIntegralActivityPrize.setPrizeTypeNum(10);
+                        sweetIntegralActivityPrize.setPrizeTypeNum(100);
                     } else {
                         sweetIntegralActivityPrize.setPrizeTypeNum(1);
                     }

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

@@ -29,6 +29,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 @Component
 @Slf4j
@@ -364,6 +365,7 @@ public class DataUtils {
             query.fields().exclude("ticketTimeList");
             query.fields().exclude("describeElectronic");
             List<KylinPerformanceVo> toDayList = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
+            List<String> roadShowId = toDayList.stream().filter(r -> !r.getRoadShowId().equals("0")).map(KylinPerformanceVo -> KylinPerformanceVo.getRoadShowId()).collect(Collectors.toList());
 
             // 固定条件
             Query queryT = getCommonWhere();
@@ -374,7 +376,7 @@ public class DataUtils {
             // 三天的
             Calendar cal = Calendar.getInstance();
             cal.setTime((Date) toDayTime.get("end"));
-            Date beforeDayEnd = DateUtil.getBeforeDayEnd(cal, 3);
+            Date beforeDayEnd = DateUtil.getBeforeDayEnd(cal, 2);
             String threeDaysLaterStr = DateUtil.SDF_YMD_HMS.format(beforeDayEnd);
 
             queryT.addCriteria(Criteria.where("sellTime").gte(toDayEndTimeStr).lt(threeDaysLaterStr));
@@ -382,6 +384,7 @@ public class DataUtils {
             queryT.fields().exclude("noticeImage");
             queryT.fields().exclude("ticketTimeList");
             queryT.fields().exclude("describeElectronic");
+            queryT.addCriteria(Criteria.where("roadShowId").nin(roadShowId));
             List<KylinPerformanceVo> threeDaysList = mongoTemplate.find(queryT, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
 
             HashMap<String, Object> info = CollectionUtil.mapStringObject();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/KylinRefundsStatusServiceImpl.java

@@ -274,7 +274,7 @@ public class KylinRefundsStatusServiceImpl {
                 }
             }
             // 退积分
-            ResponseDto<String> de2111 = feignStoneIntegralClient.de2111(orderInfo.getUserId(), refundCallbackParam.getRefundPrice().setScale(0, BigDecimal.ROUND_HALF_UP).intValue(), "演出订单退款:".concat(orderInfo.getPerformanceTitle()).concat(":").concat(orderInfo.getOrderCode().substring(orderInfo.getOrderCode().length() - 10)));
+            ResponseDto<String> de2111 = feignStoneIntegralClient.de2111(orderInfo.getUserId(), refundCallbackParam.getRefundPrice().setScale(0, BigDecimal.ROUND_DOWN).intValue(), "演出订单退款:".concat(orderInfo.getPerformanceTitle()).concat(":").concat(orderInfo.getOrderCode().substring(orderInfo.getOrderCode().length() - 10)));
             log.info("订单退款回调退积分结果：[de2111={}]", de2111);
         }