Merge branch 'dev' into test

share-quartz/src/main/java/share/quartz/task/RedisTask.java

@@ -350,8 +350,9 @@ public class RedisTask {
                     if (extracted(o, sOrders, sOrder)) return;
                     //更改订单状态
                     sOrder.setStatus(OrderStatusEnum.USED.getCode());
-//                    addNewConsumer(sOrder);
+                    addNewConsumer(sOrder);
                     isOrderService.updateById(sOrder);
+                    pointActivitiesService.joinPointActivities(sOrder);
                     // 修改房间状态
                     SRoom room = roomService.getById(sOrder.getRoomId());
                     if (ObjectUtil.isNotEmpty(room)) {

share-system/src/main/java/share/system/domain/vo/SConsumerVo.java

@@ -2,6 +2,7 @@ package share.system.domain.vo;
 
 import lombok.Data;
 import share.system.domain.ConsumerMember;
+import share.system.domain.PointActivities;
 import share.system.domain.SConsumer;
 
 import java.util.List;
@@ -51,4 +52,6 @@ public class SConsumerVo extends SConsumer {
 
     private List<ConsumerSecondaryCardVo> secondaryCardList;
 
+    private PointActivities pointActivities;
+
 }

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

@@ -573,7 +573,7 @@ public class SConsumerCouponServiceImpl extends ServiceImpl<SConsumerCouponMappe
         newSConsumerCoupon.setDuration(sCoupon.getDuration());
         newSConsumerCoupon.setOrderType(sCoupon.getOrderType());
         newSConsumerCoupon.setPackIds(sCoupon.getPackIds());
-        newSConsumerCoupon.setSourceType(SourceTypeEnum.GIVE.getCode());
+        newSConsumerCoupon.setSourceType(SourceTypeEnum.RECEIVE.getCode());
         newSConsumerCoupon.setPlatformType(sCoupon.getPlatformType());
         newSConsumerCoupon.setStartDate(sCoupon.getStartDate());
         newSConsumerCoupon.setEndDate(DateUtils.addDays(new Date(), giveDay));

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

@@ -66,8 +66,8 @@ public class SConsumerServiceImpl extends ServiceImpl<SConsumerMapper, SConsumer
     private ConsumerSecondaryCardService consumerSecondaryCardService;
     @Autowired
     private ConsumerMonthlyCardService consumerMonthlyCardService;
-
-
+    @Autowired
+    private PointActivitiesService pointActivitiesService;
     @Autowired
     private SConsumerService sConsumerService;
 
@@ -264,6 +264,7 @@ public class SConsumerServiceImpl extends ServiceImpl<SConsumerMapper, SConsumer
             }
             vo.setConsumerWallet(consumerWalletVo);
         }
+        vo.setPointActivities(pointActivitiesService.selectByConsumerId());
         List<Long> longList = storeConsumerMapper.selectByConsumerId(currentUser.getId(), PositionEnum.CLEANER.getCode());
         if (CollectionUtils.isEmpty(longList)) {
             vo.setIsCleaner(false);