Merge remote-tracking branch 'origin/master' into jxl_antiepidemic_question

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyCouponCodeAdminController.java

@@ -158,7 +158,7 @@ public class CandyCouponCodeAdminController extends BaseController {
             List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisUtil.get(uckey);
 
             if (!CollectionUtils.isEmpty(vos)) {
-                CandyUserCouponBasicDto userCouponBasicDto = vos.parallelStream().filter(v -> v.getCouponId().equals(couponId)).findAny().orElse(null);
+                CandyUserCouponBasicDto userCouponBasicDto = vos.stream().filter(v -> v.getCouponId().equals(couponId)).findAny().orElse(null);
 
                 if (null != userCouponBasicDto && userCouponBasicDto.getState() == 1) {
                     String cckey = CandyRedisConst.BASIC_COUPON_CODE.concat(r.getCcode());

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java

@@ -171,6 +171,7 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
         updateInfoMemberOrder.setMid(memberOrder.getMid());
         updateInfoMemberOrder.setState(4);
         updateInfoMemberOrder.setUpdatedAt(now);
+        updateInfoMemberOrder.setComment("R");
         adamMemberOrderMapper.updateById(updateInfoMemberOrder);
 
         String moKey = AdamRedisConst.INFO_MEMBER_ORDER + memberOrder.getUid();
@@ -184,9 +185,10 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
         vos.set(idx, vo);
         redisUtil.set(moKey, vos);
 
-        if (memberRefund.getRenewable() == 2) {
+        if (memberRefund.getRenewable() == 2) {// 拉黑用户，直接更新用户会员状态信息
             AdamUserMember updateUserMember = new AdamUserMember();
             updateUserMember.setState(2);
+            updateUserMember.setExpiryAt(now);
             updateUserMember.setUpdatedAt(now);
             updateUserMember.setComment("R");
 
@@ -198,6 +200,7 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
             AdamUserMemberVo userMemberVo = (AdamUserMemberVo) redisUtil.get(umkey);
 
             userMemberVo.setState(2);
+            userMemberVo.setExpiryAt(now);
             userMemberVo.setUpdatedAt(now);
 
             redisUtil.set(umkey, userMemberVo);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamRscController.java

@@ -103,7 +103,7 @@ public class AdamRscController {
         }
         try {
             List<String> uidList = req.getUidList();
-            uidList.parallelStream().forEach(r -> {
+            uidList.forEach(r -> {
                 AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(r);
                 if (null != userInfoVo) {
                     list.add(AdamChimeUinfoDto.getNew().copy(userInfoVo));

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -612,7 +612,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
 
                 if (!CollectionUtils.isEmpty(memberRightsCouponVoList)) {
                     // 该权益下关联券统计
-                    Map<String, Long> rightsCouponCtMap = memberRightsCouponVoList.parallelStream()
+                    Map<String, Long> rightsCouponCtMap = memberRightsCouponVoList.stream()
                             .collect(Collectors.groupingBy(AdamMemberRightsCouponVo::getCouponId, Collectors.counting()));
 
                     rightsCouponCtMap.forEach((couponId, num) -> {

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

@@ -95,7 +95,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         }
         List<CandyUserCouponBasicDto> dtoList = redisDataUtils.getCouponByUid(uid, userCreateTime);
         if (!CollectionUtil.isEmpty(dtoList)) {
-            Map<String, Long> mCouponCountMap = dtoList.parallelStream()
+            Map<String, Long> mCouponCountMap = dtoList.stream()
                     .filter(r -> (r.getExclusive() == 1 && r.getState() == 1))
                     .collect(Collectors.groupingBy(CandyUserCouponBasicDto::getMcouponId, Collectors.counting()));
 

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/biz/ChimeUserBiz.java

@@ -82,7 +82,7 @@ public class ChimeUserBiz {
         }
         List<ChimeUserTagsMappingVo> userTagList = new ArrayList<>();
         //设置用户id
-        userTagVoList.parallelStream().forEach(vo -> {
+        userTagVoList.forEach(vo -> {
             ChimeUserTagsMappingVo userTagsMappingVo = ChimeUserTagsMappingVo.getNew();
             userTagsMappingVo.setTagCode(vo.getVal());
             userTagsMappingVo.setTagDesc(vo.getDesc());
@@ -111,7 +111,7 @@ public class ChimeUserBiz {
 //            }
 //        }
 //        //设置用户id
-//        userTagVoList.parallelStream().forEach(vo -> {
+//        userTagVoList.forEach(vo -> {
 //            ChimeUserTagDto userTagDto = ChimeUserTagDto.getNew();
 //            userTagDto.setTagCode(vo.getVal());
 //            userTagDto.setTagDesc(vo.getDesc());
@@ -198,6 +198,7 @@ public class ChimeUserBiz {
                     KylinPerformanceVo kylinPerformanceVo = responseDto.getData();
                     if(kylinPerformanceVo.getAppStatus() == KylinPerformanceStatusEnum.PERFORMANCESTATUS6.getIndex()
                             ||kylinPerformanceVo.getAppStatus() == KylinPerformanceStatusEnum.PERFORMANCESTATUS8.getIndex()
+                            ||kylinPerformanceVo.getAppStatus() == KylinPerformanceStatusEnum.PERFORMANCESTATUS11.getIndex()
                             ||kylinPerformanceVo.getAppStatus() == KylinPerformanceStatusEnum.PERFORMANCESTATUS9.getIndex()){
                         isOnline = true;
                     }

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/test/java/com/liquidnet/service/chime/test/TestDataUtils.java

@@ -242,7 +242,7 @@ public class TestDataUtils {
 //            reqDto.setTags("tags40,tags80");
             NewPageResult<ChimeUserInfoDto> pageInfo = chimePerformanceService.getUserListByCon(reqDto);
             log.info("总共获取总数pagecount:{}",pageInfo.getList().size());
-            pageInfo.getList().parallelStream().forEach(dto -> {
+            pageInfo.getList().forEach(dto -> {
 //                System.out.println(dto.getUserId());
 //                System.out.println(JsonUtils.toJson(dto.getUserTags()));
             });

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/PlatformMemberRefundService.java

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.stream.IntStream;
@@ -96,31 +97,40 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
             vo.setUpdatedAt(now);
             vos.set(idx, vo);
             boolean syncVo = redisUtil.set(moKey, vos);
-            log.warn("###会员退款回调处理成功:更新REDIS会员订单状态{}[orderNo:{},uid:{}]", syncVo ? "成功" : "失败", orderNo, memberOrder.getUid());
+            log.info("###会员退款回调处理成功:更新REDIS会员订单信息{}[orderNo:{},uid:{}]", syncVo ? "成功" : "失败", orderNo, memberOrder.getUid());
 
             String umKey = AdamRedisConst.INFO_USER_MEMBER.concat(memberOrder.getUid());
             AdamUserMemberVo userMemberVo = (AdamUserMemberVo) redisUtil.get(umKey);
 
-            newExpiryAt = userMemberVo.getExpiryAt().minusDays(memberOrder.getDays());
-            userMemberVo.setExpiryAt(newExpiryAt);
-            userMemberVo.setUpdatedAt(now);
+            if (userMemberVo.getState() == 1) {// 非拉黑用户，则更新到期时间为减去订单标记的会员有效期的日期
+                newExpiryAt = userMemberVo.getExpiryAt().minusDays(memberOrder.getDays());
 
-            syncVo = redisUtil.set(umKey, userMemberVo);
-            log.warn("###会员退款回调处理成功:更新REDIS会员状态{}[orderNo:{},uid:{}]", syncVo ? "成功" : "失败", orderNo, memberOrder.getUid());
-        }
+                LocalDate nowDate = now.toLocalDate();
+                LocalDate newExpiryDate = newExpiryAt.toLocalDate();
+                if (newExpiryDate.isEqual(nowDate)) {// 新的过期时间如果和当前时间为同一天，则重置到期时间为当天00:00:00
+                    newExpiryAt = now.withHour(0).withMinute(0).withSecond(0);
+                }
+
+                userMemberVo.setExpiryAt(newExpiryAt);
+                userMemberVo.setUpdatedAt(now);
 
-        AdamUserMember updateInfoUserMember = new AdamUserMember();
-        updateInfoUserMember.setExpiryAt(newExpiryAt);
-        updateInfoUserMember.setUpdatedAt(now);
-        updateInfoUserMember.setComment("R");
-        int updateRst = adamUserMemberMapper.update(updateInfoUserMember, Wrappers.lambdaUpdate(AdamUserMember.class).eq(AdamUserMember::getUid, memberOrder.getUid()));
-        log.warn("###会员退款回调处理成功:更新用户会员状态{}[orderNo:{},uid:{}]", updateRst <= 0 ? "失败" : "成功", orderNo, memberOrder.getUid());
+                syncVo = redisUtil.set(umKey, userMemberVo);
+                log.info("###会员退款回调处理成功:更新REDIS会员信息{}[orderNo:{},uid:{}]", syncVo ? "成功" : "失败", orderNo, memberOrder.getUid());
+
+                AdamUserMember updateInfoUserMember = new AdamUserMember();
+                updateInfoUserMember.setExpiryAt(newExpiryAt);
+                updateInfoUserMember.setUpdatedAt(now);
+                updateInfoUserMember.setComment("R");
+                int updateRst = adamUserMemberMapper.update(updateInfoUserMember, Wrappers.lambdaUpdate(AdamUserMember.class).eq(AdamUserMember::getUid, memberOrder.getUid()));
+                log.info("###会员退款回调处理成功:更新DB会员信息{}[orderNo:{},uid:{}]", updateRst <= 0 ? "失败" : "成功", orderNo, memberOrder.getUid());
+            }
+        }
 
         AdamMemberOrder updateInfoMemberOrder = new AdamMemberOrder();
         updateInfoMemberOrder.setMid(memberOrder.getMid());
         updateInfoMemberOrder.setState(5);
         updateInfoMemberOrder.setUpdatedAt(now);
-        updateRst = adamMemberOrderMapper.updateById(updateInfoMemberOrder);
-        log.warn("###会员退款回调处理成功:更新会员订单状态{}[orderNo:{}]", updateRst <= 0 ? "失败" : "成功", orderNo);
+        int updateRst = adamMemberOrderMapper.updateById(updateInfoMemberOrder);
+        log.info("###会员退款回调处理成功:更新DB订单信息{}[orderNo:{}]", updateRst <= 0 ? "失败" : "成功", orderNo);
     }
 }

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

@@ -74,15 +74,15 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
 
         List<CandyUserCouponBasicDto> basicDtoList = candyUserCouponMapper.selectMultiForUserCouponBasicDto(uid);
         if (!CollectionUtils.isEmpty(basicDtoList)) {
-            List<String> couponIdList = basicDtoList.parallelStream().map(CandyUserCouponBasicDto::getCouponId).collect(Collectors.toList());
+            List<String> couponIdList = basicDtoList.stream().map(CandyUserCouponBasicDto::getCouponId).collect(Collectors.toList());
 
             List<CandyCouponRuleDto> couponRuleDtoList = candyCouponRuleMapper.selectListForCouponRuleDto(couponIdList);
 
-            Map<String, List<CandyCouponRuleDto>> couponRuleDtoListMap = couponRuleDtoList.parallelStream().collect(Collectors.groupingBy(CandyCouponRuleDto::getCouponId));
+            Map<String, List<CandyCouponRuleDto>> couponRuleDtoListMap = couponRuleDtoList.stream().collect(Collectors.groupingBy(CandyCouponRuleDto::getCouponId));
 
-//            Map<String, List<CandyUserCouponBasicDto>> basicDtoListMap = basicDtoList.parallelStream().collect(Collectors.groupingBy(CandyUserCouponBasicDto::getCouponId));
+//            Map<String, List<CandyUserCouponBasicDto>> basicDtoListMap = basicDtoList.stream().collect(Collectors.groupingBy(CandyUserCouponBasicDto::getCouponId));
 
-            basicDtoList.parallelStream().forEach(dto -> {
+            basicDtoList.forEach(dto -> {
                 dto.setUseRules(couponRuleDtoListMap.get(dto.getCouponId()));
             });
 
@@ -94,13 +94,13 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
     public List<CandyCommonCouponBasicDto> ccouponBasicDtoByUidProcessing(LocalDateTime ucreatedAt) {
         List<CandyCommonCouponBasicDto> basicDtoList = candyCommonCouponMapper.selectMultiForCommonCouponBasicDto(ucreatedAt);
         if (!CollectionUtils.isEmpty(basicDtoList)) {
-            List<String> couponIdList = basicDtoList.parallelStream().map(CandyCommonCouponBasicDto::getCouponId).collect(Collectors.toList());
+            List<String> couponIdList = basicDtoList.stream().map(CandyCommonCouponBasicDto::getCouponId).collect(Collectors.toList());
 
             List<CandyCouponRuleDto> couponRuleDtoList = candyCouponRuleMapper.selectListForCouponRuleDto(couponIdList);
 
-            Map<String, List<CandyCouponRuleDto>> couponRuleDtoListMap = couponRuleDtoList.parallelStream().collect(Collectors.groupingBy(CandyCouponRuleDto::getCouponId));
+            Map<String, List<CandyCouponRuleDto>> couponRuleDtoListMap = couponRuleDtoList.stream().collect(Collectors.groupingBy(CandyCouponRuleDto::getCouponId));
 
-            basicDtoList.parallelStream().forEach(dto -> {
+            basicDtoList.forEach(dto -> {
                 dto.setUseRules(couponRuleDtoListMap.get(dto.getCouponId()));
             });