积分 admin

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/admin/SweetIntegralActivityPrizeFormParam.java

@@ -5,12 +5,10 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.List;
 
 /**
  * <p>
@@ -64,11 +62,6 @@ public class SweetIntegralActivityPrizeFormParam implements Serializable,Cloneab
     @NotNull(message = "winningProbability不能为空")
     private BigDecimal winningProbability;
 
-    @Valid
-    @ApiModelProperty(value = "奖品列表", example = "")
-    @NotNull(message = "prizeList不能为空")
-    private List<SweetIntegralActivityPrizeRelationFormParam> prizeRelationList;
-
     private static final SweetIntegralActivityPrizeFormParam obj = new SweetIntegralActivityPrizeFormParam();
 
     public static SweetIntegralActivityPrizeFormParam getNew() {

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

@@ -29,6 +29,9 @@ public class IntegralActivityVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "活动玩一次所需积分")
     private Integer activityNum;
 
+    @ApiModelProperty(value = "预估玩此活动的总人数")
+    private Integer estimatedNum;
+
     @ApiModelProperty(value = "活动时间类型 1长期 2开始结束时间")
     private Integer timeType;
 
@@ -44,6 +47,9 @@ public class IntegralActivityVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "活动规则")
     private String activityRules;
 
+    @ApiModelProperty(value = "概率公示")
+    private String probabilityPublicity;
+
     @ApiModelProperty(value = "是否上线 1未上线 2已上线")
     private Integer isOnline;
 
@@ -72,11 +78,13 @@ public class IntegralActivityVo implements Serializable, Cloneable {
         this.setActivityImg(source.getActivityImg());
         this.setActivityType(source.getActivityType());
         this.setActivityNum(source.getActivityNum());
+        this.setEstimatedNum(source.getEstimatedNum());
         this.setTimeType(source.getTimeType());
         this.setStartTime(source.getStartTime());
         this.setEndTime(source.getEndTime());
         this.setExpressFeeType(source.getExpressFeeType());
         this.setActivityRules(source.getActivityRules());
+        this.setProbabilityPublicity(source.getProbabilityPublicity());
         this.setIsOnline(source.getIsOnline());
         this.setCreatedAt(source.getCreatedAt());
         this.setUpdatedAt(source.getUpdatedAt());

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

@@ -8,7 +8,6 @@ import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityS
 import com.liquidnet.client.admin.zhengzai.sweet.utils.SweetObjectAdminUtil;
 import com.liquidnet.client.admin.zhengzai.sweet.utils.SweetRedisAdminUtils;
 import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.sweet.constant.StatusConst;
 import com.liquidnet.service.sweet.dto.SweetIntegralActivityDto;
 import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityFromParam;
 import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityListSearchParam;
@@ -25,7 +24,6 @@ import com.liquidnet.service.sweet.mapper.SweetIntegralActivityDrawMapper;
 import com.liquidnet.service.sweet.mapper.SweetIntegralActivityMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.service.sweet.mapper.SweetIntegralActivityPrizeMapper;
-import com.liquidnet.service.sweet.mapper.SweetIntegralActivityPrizeRelationMapper;
 import com.liquidnet.service.sweet.utils.SweetNewObjectUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -51,8 +49,6 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
     private SweetIntegralActivityPrizeMapper sweetIntegralActivityPrizeMapper;
     @Autowired
     private SweetIntegralActivityDrawMapper sweetIntegralActivityDrawMapper;
-    @Autowired
-    private SweetIntegralActivityPrizeRelationMapper relationMapper;
 
     @Autowired
     private SweetRedisAdminUtils sweetRedisAdminUtils;
@@ -74,17 +70,6 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
                     sweetIntegralActivityPrizeMapper.insert(sweetIntegralActivityPrize);
                     // 奖品库存
                     sweetRedisAdminUtils.incrIntegralActivityPrizeNum(integralActivityId, sweetIntegralActivityPrize.getPrizeId(), sweetIntegralActivityPrize.getPrizeNum());
-
-                    List<SweetIntegralActivityPrizeRelationFormParam> relationList = prize.getPrizeRelationList();
-                    if (!CollectionUtils.isEmpty(relationList)) {
-                        for (SweetIntegralActivityPrizeRelationFormParam relation : relationList) {
-                            SweetIntegralActivityPrizeRelation prizeRelation = SweetIntegralActivityPrizeRelationFormParam.getNew().copy(relation);
-                            prizeRelation.setPrizeId(prizeId);
-                            String relationId = IDGenerator.nextSnowId();
-                            prizeRelation.setPrizeRelationId(relationId);
-                            relationMapper.insert(prizeRelation);
-                        }
-                    }
                 }
             }
             // 活动redis处理
@@ -99,8 +84,9 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
     @Override
     public Integer updateForm(SweetIntegralActivityFromParam param) {
         try {
+            LocalDateTime nowTime = LocalDateTime.now();
             SweetIntegralActivity sweetIntegralActivity = SweetIntegralActivityFromParam.getNew().copy(param);
-            sweetIntegralActivity.setUpdatedAt(LocalDateTime.now());
+            sweetIntegralActivity.setUpdatedAt(nowTime);
             String integralActivityId = param.getIntegralActivityId();
             int update = sweetIntegralActivityMapper.update(
                     sweetIntegralActivity,
@@ -110,14 +96,8 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
             if (!CollectionUtils.isEmpty(prizeList)) {
                 for (SweetIntegralActivityPrizeFormParam prize : prizeList) {
                     SweetIntegralActivityPrize sweetIntegralActivityPrize = SweetIntegralActivityPrizeFormParam.getNew().copy(prize);
-                    sweetIntegralActivityPrize.setUpdatedAt(LocalDateTime.now());
-                    sweetIntegralActivityPrize.setIntegralActivityId(integralActivityId);
+                    sweetIntegralActivityPrize.setUpdatedAt(nowTime);
                     String prizeId = prize.getPrizeId();
-                    if (prize.getPrizeType() == 2) {
-                        sweetIntegralActivityPrize.setPrizeTypeNum(100);
-                    } else {
-                        sweetIntegralActivityPrize.setPrizeTypeNum(1);
-                    }
                     // 处理奖品库存
                     SweetIntegralActivityPrize sweetIntegralActivityPrizeOld = sweetIntegralActivityPrizeMapper.selectOne(
                             Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getPrizeId, prizeId)
@@ -203,6 +183,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
             voList.add(copy);
         });
         sweetRedisAdminUtils.setIntegralActivityList(voList);
+
         // 活动详情
         SweetIntegralActivity sweetIntegralActivity = sweetIntegralActivityMapper.selectOne(
                 Wrappers.lambdaQuery(SweetIntegralActivity.class).eq(SweetIntegralActivity::getIntegralActivityId, integralActivityId)