奖品积分和实物分开存

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/IntegralActivityVo.java

@@ -58,6 +58,12 @@ public class IntegralActivityVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "奖品列表")
     private List<IntegralActivityPrizeVo> prizeList;
 
+    @ApiModelProperty(value = "奖品列表 积分、券")
+    private List<IntegralActivityPrizeVo> prizeList1;
+
+    @ApiModelProperty(value = "奖品列表 实物、会员")
+    private List<IntegralActivityPrizeVo> prizeList2;
+
     private static final IntegralActivityVo obj = new IntegralActivityVo();
     public static IntegralActivityVo getNew() {
         try {

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

@@ -19,9 +19,11 @@ import com.liquidnet.service.sweet.mapper.SweetIntegralActivityPrizeRelationMapp
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -102,27 +104,64 @@ public class SweetIntegralActivityPrizeRelationServiceImpl extends ServiceImpl<S
                 Wrappers.lambdaQuery(SweetIntegralActivity.class).eq(SweetIntegralActivity::getIntegralActivityId, integralActivityId)
         );
         IntegralActivityVo integralActivityVo = IntegralActivityVo.getNew().copy(sweetIntegralActivity);
-        // 详情奖品
-        List<SweetIntegralActivityPrize> sweetIntegralActivityPrizes = sweetIntegralActivityPrizeMapper.selectList(
+        // 详情奖品 全部
+        List<SweetIntegralActivityPrize> activityPrizes = sweetIntegralActivityPrizeMapper.selectList(
                 Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getIntegralActivityId, integralActivityId)
         );
         List<IntegralActivityPrizeVo> prizeList = SweetObjectAdminUtil.getSweetIntegralActivityPrizeVoList();
-        sweetIntegralActivityPrizes.forEach(r -> {
+        activityPrizes.forEach(r -> {
             IntegralActivityPrizeVo copy = IntegralActivityPrizeVo.getNew().copy(r);
             // 奖品券列表
             List<SweetIntegralActivityPrizeRelation> prizeRelations = relationMapper.selectList(
                     Wrappers.lambdaQuery(SweetIntegralActivityPrizeRelation.class).eq(SweetIntegralActivityPrizeRelation::getPrizeId, copy.getPrizeId())
             );
             ArrayList<IntegralActivityPrizeRelationVo> prizeRelationVoList = SweetObjectAdminUtil.getSweetIntegralActivityPrizeRelationVoList();
+            if (!CollectionUtils.isEmpty(prizeRelations)) {
                 prizeRelations.forEach(rr -> {
                     IntegralActivityPrizeRelationVo copyR = IntegralActivityPrizeRelationVo.getNew().copy(rr);
                     prizeRelationVoList.add(copyR);
                 });
+            }
             copy.setPrizeRelationList(prizeRelationVoList);
 
             prizeList.add(copy);
         });
         integralActivityVo.setPrizeList(prizeList);
+        // 详情奖品 积分和券
+        List<SweetIntegralActivityPrize> activityPrizes1 = sweetIntegralActivityPrizeMapper.selectList(
+                Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getIntegralActivityId, integralActivityId)
+                        .in(SweetIntegralActivityPrize::getPrizeType, Arrays.asList(1,2))
+        );
+        List<IntegralActivityPrizeVo> prizeList1 = SweetObjectAdminUtil.getSweetIntegralActivityPrizeVoList();
+        activityPrizes1.forEach(r -> {
+            IntegralActivityPrizeVo copy = IntegralActivityPrizeVo.getNew().copy(r);
+            // 奖品券列表
+            List<SweetIntegralActivityPrizeRelation> prizeRelations = relationMapper.selectList(
+                    Wrappers.lambdaQuery(SweetIntegralActivityPrizeRelation.class).eq(SweetIntegralActivityPrizeRelation::getPrizeId, copy.getPrizeId())
+            );
+            ArrayList<IntegralActivityPrizeRelationVo> prizeRelationVoList = SweetObjectAdminUtil.getSweetIntegralActivityPrizeRelationVoList();
+            if (!CollectionUtils.isEmpty(prizeRelations)) {
+                prizeRelations.forEach(rr -> {
+                    IntegralActivityPrizeRelationVo copyR = IntegralActivityPrizeRelationVo.getNew().copy(rr);
+                    prizeRelationVoList.add(copyR);
+                });
+            }
+            copy.setPrizeRelationList(prizeRelationVoList);
+
+            prizeList1.add(copy);
+        });
+        integralActivityVo.setPrizeList1(prizeList1);
+        // 详情奖品 实物等
+        List<SweetIntegralActivityPrize> activityPrizes2 = sweetIntegralActivityPrizeMapper.selectList(
+                Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getIntegralActivityId, integralActivityId)
+                        .in(SweetIntegralActivityPrize::getPrizeType, Arrays.asList(3,4))
+        );
+        List<IntegralActivityPrizeVo> prizeList2 = SweetObjectAdminUtil.getSweetIntegralActivityPrizeVoList();
+        activityPrizes2.forEach(r -> {
+            IntegralActivityPrizeVo copy = IntegralActivityPrizeVo.getNew().copy(r);
+            prizeList2.add(copy);
+        });
+        integralActivityVo.setPrizeList2(prizeList2);
 
         sweetRedisAdminUtils.setIntegralActivityInfo(integralActivityVo);
     }

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

@@ -33,6 +33,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -194,27 +195,64 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
                 Wrappers.lambdaQuery(SweetIntegralActivity.class).eq(SweetIntegralActivity::getIntegralActivityId, integralActivityId)
         );
         IntegralActivityVo integralActivityVo = IntegralActivityVo.getNew().copy(sweetIntegralActivity);
-        // 详情奖品
-        List<SweetIntegralActivityPrize> sweetIntegralActivityPrizes = sweetIntegralActivityPrizeMapper.selectList(
+        // 详情奖品 全部
+        List<SweetIntegralActivityPrize> activityPrizes = sweetIntegralActivityPrizeMapper.selectList(
                 Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getIntegralActivityId, integralActivityId)
         );
         List<IntegralActivityPrizeVo> prizeList = SweetObjectAdminUtil.getSweetIntegralActivityPrizeVoList();
-        sweetIntegralActivityPrizes.forEach(r -> {
+        activityPrizes.forEach(r -> {
             IntegralActivityPrizeVo copy = IntegralActivityPrizeVo.getNew().copy(r);
             // 奖品券列表
             List<SweetIntegralActivityPrizeRelation> prizeRelations = relationMapper.selectList(
                     Wrappers.lambdaQuery(SweetIntegralActivityPrizeRelation.class).eq(SweetIntegralActivityPrizeRelation::getPrizeId, copy.getPrizeId())
             );
             ArrayList<IntegralActivityPrizeRelationVo> prizeRelationVoList = SweetObjectAdminUtil.getSweetIntegralActivityPrizeRelationVoList();
+            if (!CollectionUtils.isEmpty(prizeRelations)) {
                 prizeRelations.forEach(rr -> {
                     IntegralActivityPrizeRelationVo copyR = IntegralActivityPrizeRelationVo.getNew().copy(rr);
                     prizeRelationVoList.add(copyR);
                 });
+            }
             copy.setPrizeRelationList(prizeRelationVoList);
 
             prizeList.add(copy);
         });
         integralActivityVo.setPrizeList(prizeList);
+        // 详情奖品 积分和券
+        List<SweetIntegralActivityPrize> activityPrizes1 = sweetIntegralActivityPrizeMapper.selectList(
+                Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getIntegralActivityId, integralActivityId)
+                        .in(SweetIntegralActivityPrize::getPrizeType, Arrays.asList(1,2))
+        );
+        List<IntegralActivityPrizeVo> prizeList1 = SweetObjectAdminUtil.getSweetIntegralActivityPrizeVoList();
+        activityPrizes1.forEach(r -> {
+            IntegralActivityPrizeVo copy = IntegralActivityPrizeVo.getNew().copy(r);
+            // 奖品券列表
+            List<SweetIntegralActivityPrizeRelation> prizeRelations = relationMapper.selectList(
+                    Wrappers.lambdaQuery(SweetIntegralActivityPrizeRelation.class).eq(SweetIntegralActivityPrizeRelation::getPrizeId, copy.getPrizeId())
+            );
+            ArrayList<IntegralActivityPrizeRelationVo> prizeRelationVoList = SweetObjectAdminUtil.getSweetIntegralActivityPrizeRelationVoList();
+            if (!CollectionUtils.isEmpty(prizeRelations)) {
+                prizeRelations.forEach(rr -> {
+                    IntegralActivityPrizeRelationVo copyR = IntegralActivityPrizeRelationVo.getNew().copy(rr);
+                    prizeRelationVoList.add(copyR);
+                });
+            }
+            copy.setPrizeRelationList(prizeRelationVoList);
+
+            prizeList1.add(copy);
+        });
+        integralActivityVo.setPrizeList1(prizeList1);
+        // 详情奖品 实物等
+        List<SweetIntegralActivityPrize> activityPrizes2 = sweetIntegralActivityPrizeMapper.selectList(
+                Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getIntegralActivityId, integralActivityId)
+                        .in(SweetIntegralActivityPrize::getPrizeType, Arrays.asList(3,4))
+        );
+        List<IntegralActivityPrizeVo> prizeList2 = SweetObjectAdminUtil.getSweetIntegralActivityPrizeVoList();
+        activityPrizes2.forEach(r -> {
+            IntegralActivityPrizeVo copy = IntegralActivityPrizeVo.getNew().copy(r);
+            prizeList2.add(copy);
+        });
+        integralActivityVo.setPrizeList2(prizeList2);
 
         sweetRedisAdminUtils.setIntegralActivityInfo(integralActivityVo);
     }