双12活动

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/DiscountCardRecordServiceImpl.java

@@ -98,7 +98,7 @@ public class DiscountCardRecordServiceImpl extends ServiceImpl<DiscountCardRecor
                 log.error("时间类型错误{}", discountCardRecord.getType());
         }
         discountCardRecord.setStartTime(DateUtil.localDateTimeToDate(startTime.atTime(LocalTime.MIN)));
-        discountCardRecord.setEndTime(DateUtil.localDateTimeToDate(endTime.atTime(LocalTime.MAX)));
+        discountCardRecord.setEndTime(DateUtil.localDateTimeToDate(endTime.atTime(23,59,59)));
 
         this.save(discountCardRecord);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/RedisCacheServiceImpl.java

@@ -175,43 +175,6 @@ public class RedisCacheServiceImpl implements RedisCacheService {
     }
 
 
-    /**
-     * 用户下单金额分账配置
-     *
-     * @param subOrderNo 订单详情号
-     * @param config 下单配置信息
-     */
-    @Override
-    public void saveUserAccountConfig(String subOrderNo, String config) {
-
-        String cacheKey = getCacheKey(CacheKey.USER_ORDER_ACCOUNT, subOrderNo);
-
-        RBucket<Object> bucket = redissonClient.getBucket(cacheKey);
-
-        // 缓存数据
-        bucket.set(config, 150L, TimeUnit.MINUTES);
-    }
-
-
-    /**
-     * 用户下单金额分账配置
-     *
-     * @param subOrderNo 订单详情号
-     */
-    @Override
-    public String getUserAccountConfig(String subOrderNo) {
-
-        String cacheKey = getCacheKey(CacheKey.USER_ORDER_ACCOUNT,subOrderNo);
-
-        // 获取用户支付配置信息
-        RBucket<Object> bucket = redissonClient.getBucket(cacheKey);
-        Object data = bucket.get();
-        if (Objects.isNull(data)) {
-            return StringUtils.EMPTY;
-        }
-
-        return (String) data;
-    }
 
     /**
      * 删除用户下单配置

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserPaymentCoreServiceImpl.java

@@ -874,9 +874,9 @@ DISCOUNT("畅学卡")
 
                 // 会员买赠活动 判断购买商品是否符合活动要求
                 Map<String, List<Long>> map = orderReq.getGoodsInfos().stream()
-                        .filter(o -> o.getGiftFlag() != null && !o.getGiftFlag())
+                        .filter(o -> o.getGiftFlag() != null && o.getGiftFlag())
                         .collect(Collectors.groupingBy(o -> o.getGoodType().getCode(),
-                                Collectors.mapping(UserPaymentOrderWrapper.OrderGoodsInfo::getBizId, Collectors.toList())));
+                                Collectors.mapping(o->Long.valueOf(o.getBizContent().toString()), Collectors.toList())));
                 for (ActivityPlanRewardDto activityPlanRewardDto : activityPlan.getActivityRewardList()) {
                     RewardTypeEnum rewardType = activityPlanRewardDto.getActivityReward().getRewardType();
                     if (map.containsKey(rewardType.toString())) {
@@ -890,9 +890,9 @@ DISCOUNT("畅学卡")
                 }
                 // 购买的商品判断
                 map = orderReq.getGoodsInfos().stream()
-                        .filter(o -> o.getGiftFlag() == null || o.getGiftFlag())
+                        .filter(o -> o.getGiftFlag() == null || !o.getGiftFlag())
                         .collect(Collectors.groupingBy(o -> o.getGoodType().getCode(),
-                                Collectors.mapping(UserPaymentOrderWrapper.OrderGoodsInfo::getBizId, Collectors.toList())));
+                                Collectors.mapping(o->Long.valueOf(o.getBizContent().toString()), Collectors.toList())));
                 if (map.containsKey(GoodTypeEnum.VIP.name()) || map.containsKey(GoodTypeEnum.SVIP.name())) {
                     MemberPriceSettings settings = memberPriceSettingsService.getById(activityPlan.getVipCardId());
                     if (settings == null) {

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityPlanRewardMapper.xml

@@ -60,6 +60,7 @@
         , ar.update_time_ as "activityReward.updateTime"
         , ar.update_by_ as "activityReward.updateBy"
         , ar.discount_price_ as "activityReward.discountPrice"
+        , ar.vip_card_id_ as "activityReward.vipCardId"
     </sql>
 
     <select id="queryActivityPlanReward" resultType="com.yonge.cooleshow.biz.dal.dto.ActivityPlanRewardDto">