Merge branch 'refs/heads/dev' into test

share-system/src/main/java/share/system/service/impl/ActivityServiceImpl.java

@@ -14,7 +14,6 @@ import share.common.enums.MemberTypeEnum;
 import share.common.enums.YesNoEnum;
 import share.common.utils.DateUtils;
 import share.common.utils.StringUtils;
-import share.common.utils.bean.BeanUtils;
 import share.system.domain.Activity;
 import share.system.domain.ConsumerMember;
 import share.system.domain.SConsumer;
@@ -136,17 +135,24 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
         for (int i = 0; i <= 4; i++) {
             days.add(DateUtils.addDays(new Date(), i));
         }
-        Activity activity = new Activity();
-        BeanUtils.copyProperties(dto, activity);
-        activity.setMemberType(MemberTypeEnum.NORMAL.getIndex());
-        if (consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex())) {
-            activity.setMemberType(MemberTypeEnum.RECHARGE.getIndex());
-        }
-        if (consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex())) {
-            activity.setMemberType(MemberTypeEnum.RIGHTS.getIndex());
+        LambdaQueryWrapper<Activity> queryWrapper = new LambdaQueryWrapper<>();
+//        Activity activity = new Activity();
+//        BeanUtils.copyProperties(dto, activity);
+//        activity.setMemberType(MemberTypeEnum.NORMAL.getIndex());
+        if (consumerMember.getIsRecharge().equals(YesNoEnum.no.getIndex()) && consumerMember.getIsRights().equals(YesNoEnum.no.getIndex())) {
+            queryWrapper.eq(Activity::getMemberType, MemberTypeEnum.NORMAL.getIndex());
+        } else if (consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex()) && consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex())) {
+            queryWrapper.in(Activity::getMemberType, MemberTypeEnum.RECHARGE.getIndex(), MemberTypeEnum.RIGHTS.getIndex());
+        } else if (consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex()) && consumerMember.getIsRights().equals(YesNoEnum.no.getIndex())) {
+//            activity.setMemberType(MemberTypeEnum.RECHARGE.getIndex());
+            queryWrapper.eq(Activity::getMemberType, MemberTypeEnum.RECHARGE.getIndex());
+        } else if (consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex()) && consumerMember.getIsRecharge().equals(YesNoEnum.no.getIndex())) {
+//            activity.setMemberType(MemberTypeEnum.RIGHTS.getIndex());
+            queryWrapper.eq(Activity::getMemberType, MemberTypeEnum.RIGHTS.getIndex());
         }
 
-        List<Activity> activities = selectActivityList(activity);
+//        List<Activity> activities = selectActivityList(activity);
+        List<Activity> activities = list(queryWrapper);
         CronParser cronParser = new CronParser(CronDefinitionBuilder.instanceDefinitionFor(CronType.QUARTZ));
         Map<Date, List<Activity>> map = new HashMap<>();
         days.stream().forEach(day -> {

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -2446,12 +2446,23 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             consumerMember = consumerMemberService.getOne(new LambdaQueryWrapper<ConsumerMember>().eq(ConsumerMember::getConsumerId, user.getId()));
             if (ObjectUtil.isNotEmpty(consumerMember)) {
                 queryWrapper.eq(Activity::getIsOpen, YesNoEnum.yes.getIndex());
-                if (consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex())) {
-                    queryWrapper.eq(Activity::getMemberType, MemberTypeEnum.RIGHTS.getIndex());
+//                if (consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex())) {
+//                    queryWrapper.eq(Activity::getMemberType, MemberTypeEnum.RIGHTS.getIndex());
+//                } else if (consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex()) && consumerMember.getIsRights().equals(YesNoEnum.no.getIndex())) {
+//                    queryWrapper.eq(Activity::getMemberType, MemberTypeEnum.RECHARGE.getIndex());
+//                } else {
+//                    queryWrapper.eq(Activity::getMemberType, MemberTypeEnum.NORMAL.getIndex());
+//                }
+                if (consumerMember.getIsRecharge().equals(YesNoEnum.no.getIndex()) && consumerMember.getIsRights().equals(YesNoEnum.no.getIndex())) {
+                    queryWrapper.eq(Activity::getMemberType, MemberTypeEnum.NORMAL.getIndex());
+                } else if (consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex()) && consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex())) {
+                    queryWrapper.in(Activity::getMemberType, MemberTypeEnum.RECHARGE.getIndex(), MemberTypeEnum.RIGHTS.getIndex());
                 } else if (consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex()) && consumerMember.getIsRights().equals(YesNoEnum.no.getIndex())) {
+//            activity.setMemberType(MemberTypeEnum.RECHARGE.getIndex());
                     queryWrapper.eq(Activity::getMemberType, MemberTypeEnum.RECHARGE.getIndex());
-                } else {
-                    queryWrapper.eq(Activity::getMemberType, MemberTypeEnum.NORMAL.getIndex());
+                } else if (consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex()) && consumerMember.getIsRecharge().equals(YesNoEnum.no.getIndex())) {
+//            activity.setMemberType(MemberTypeEnum.RIGHTS.getIndex());
+                    queryWrapper.eq(Activity::getMemberType, MemberTypeEnum.RIGHTS.getIndex());
                 }
             }
             if (ObjectUtil.isNotEmpty(consumerWallet)) {