积分 admin relation

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/sweet/SweetIntegralActivityPrizeRelationController.java

@@ -6,28 +6,19 @@ import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.common.enums.BusinessType;
-import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityService;
+import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityPrizeRelationService;
 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;
-import com.liquidnet.service.sweet.dto.vo.admin.SweetIntegralActivityVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 
 /**
  * <p>
@@ -40,15 +31,12 @@ import javax.validation.constraints.NotNull;
 @Api(tags = "积分活动管理")
 @Validated
 @Controller
-@RequestMapping("/sweet/integralActivity")
+@RequestMapping("/sweet/integralActivityPrizeRelation")
 public class SweetIntegralActivityPrizeRelationController extends BaseController {
     private String prefix = "zhengzai/sweet/integralActivity";
 
-    @Value("${liquidnet.client.admin.platformUrl}")
-    private String platformUrl;
-
     @Autowired
-    private ISweetIntegralActivityService iSweetIntegralActivityService;
+    private ISweetIntegralActivityPrizeRelationService activityPrizeRelationService;
 
     @Log(title = "积分活动创建", businessType = BusinessType.INSERT)
     @RequiresPermissions("sweet:integralActivity:create")
@@ -56,7 +44,7 @@ public class SweetIntegralActivityPrizeRelationController extends BaseController
     @ApiOperation(value = "积分活动创建")
     @ResponseBody
     public AjaxResult create(@Valid @RequestBody SweetIntegralActivityFromParam param) {
-        Integer result = iSweetIntegralActivityService.createForm(param);
+        Integer result = activityPrizeRelationService.createForm(param);
         if (result > 0) {
             return success("操作成功");
         } else {
@@ -70,28 +58,7 @@ public class SweetIntegralActivityPrizeRelationController extends BaseController
     @ApiOperation(value = "积分活动编辑")
     @ResponseBody
     public AjaxResult update(@Valid @RequestBody SweetIntegralActivityFromParam param) {
-        Integer result = iSweetIntegralActivityService.updateForm(param);
-        if (result > 0) {
-            return success("操作成功");
-        } else {
-            return error("操作失败");
-        }
-    }
-
-    @Log(title = "积分活动上下线", businessType = BusinessType.UPDATE)
-    @RequiresPermissions("sweet:integralActivity:isOnline")
-    @ApiOperation(value = "积分活动上下线")
-    @PutMapping("isOnline")
-    @ResponseBody
-    @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "integralActivityId", value = "活动id"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "isOnline", value = "是否上线 1下线 2上线"),
-    })
-    public AjaxResult isOnline(
-            @RequestParam("integralActivityId") @NotEmpty(message = "integralActivityId不能为空") String integralActivityId,
-            @RequestParam("isOnline") @NotNull(message = "isOnline不能为空") @Min(value = 1, message = "isOnline无效") @Max(value = 2, message = "isOnline无效") Integer isOnline
-    ) {
-        Integer result = iSweetIntegralActivityService.isOnline(integralActivityId, isOnline);
+        Integer result = activityPrizeRelationService.updateForm(param);
         if (result > 0) {
             return success("操作成功");
         } else {
@@ -99,39 +66,14 @@ public class SweetIntegralActivityPrizeRelationController extends BaseController
         }
     }
 
-    @Log(title = "积分活动详情", businessType = BusinessType.DETAIL)
-    @GetMapping("details")
-    @ApiOperation(value = "积分活动详情")
-    @ResponseBody
-    @ApiImplicitParams({
-            @ApiImplicitParam(type = "query", required = true, dataType = "String", name = "integralActivityId", value = "活动id"),
-    })
-    public AjaxResult details(@RequestParam("integralActivityId") String integralActivityId) {
-        SweetIntegralActivityVo result = iSweetIntegralActivityService.detail(integralActivityId);
-        return AjaxResult.success(result);
-    }
-
     @Log(title = "积分活动列表数据", businessType = BusinessType.LIST)
     @RequiresPermissions("sweet:integralActivity:list")
     @ApiOperation(value = "积分活动列表数据")
     @PostMapping("list")
     @ResponseBody
     public TableDataInfo list(SweetIntegralActivityListSearchParam listParam) {
-        PageInfo<SweetIntegralActivityDto> result = iSweetIntegralActivityService.list(listParam);
+        PageInfo<SweetIntegralActivityDto> result = activityPrizeRelationService.list(listParam);
         return getDataTable(result.getList());
     }
 
-    @GetMapping("listView")
-    @ApiOperation(value = "积分活动列表view")
-    public String listView() {
-        return prefix + "/list";
-    }
-
-    @GetMapping("formView")
-    @ApiOperation(value = "积分活动添加编辑view")
-    public String formView(ModelMap mmap) {
-        mmap.put("platformUrl", platformUrl);
-        return prefix + "/form";
-    }
-
 }

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

@@ -4,7 +4,6 @@ import com.github.pagehelper.PageInfo;
 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;
-import com.liquidnet.service.sweet.dto.vo.admin.SweetIntegralActivityVo;
 import com.liquidnet.service.sweet.entity.SweetIntegralActivityPrizeRelation;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -21,9 +20,5 @@ public interface ISweetIntegralActivityPrizeRelationService extends IService<Swe
 
     Integer updateForm(SweetIntegralActivityFromParam param);
 
-    Integer isOnline(String integralActivityId, Integer isOnline);
-
-    SweetIntegralActivityVo detail(String integralActivityId);
-
     PageInfo<SweetIntegralActivityDto> list(SweetIntegralActivityListSearchParam listParam);
 }

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

@@ -12,12 +12,8 @@ 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;
 import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityPrizeFormParam;
-import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityPrizeRelationFormParam;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityVo;
-import com.liquidnet.service.sweet.dto.vo.admin.SweetIntegralActivityPrizeVo;
-import com.liquidnet.service.sweet.dto.vo.admin.SweetIntegralActivityVo;
 import com.liquidnet.service.sweet.entity.SweetIntegralActivity;
-import com.liquidnet.service.sweet.entity.SweetIntegralActivityDraw;
 import com.liquidnet.service.sweet.entity.SweetIntegralActivityPrize;
 import com.liquidnet.service.sweet.entity.SweetIntegralActivityPrizeRelation;
 import com.liquidnet.service.sweet.mapper.SweetIntegralActivityDrawMapper;
@@ -25,7 +21,6 @@ import com.liquidnet.service.sweet.mapper.SweetIntegralActivityMapper;
 import com.liquidnet.service.sweet.mapper.SweetIntegralActivityPrizeMapper;
 import com.liquidnet.service.sweet.mapper.SweetIntegralActivityPrizeRelationMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.liquidnet.service.sweet.utils.SweetNewObjectUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -74,7 +69,7 @@ public class SweetIntegralActivityPrizeRelationServiceImpl extends ServiceImpl<S
                     // 奖品库存
                     sweetRedisAdminUtils.incrIntegralActivityPrizeNum(integralActivityId, sweetIntegralActivityPrize.getPrizeId(), sweetIntegralActivityPrize.getPrizeNum());
 
-                    List<SweetIntegralActivityPrizeRelationFormParam> relationList = prize.getPrizeRelationList();
+                    /*List<SweetIntegralActivityPrizeRelationFormParam> relationList = prize.getPrizeRelationList();
                     if (!CollectionUtils.isEmpty(relationList)) {
                         for (SweetIntegralActivityPrizeRelationFormParam relation : relationList) {
                             SweetIntegralActivityPrizeRelation prizeRelation = SweetIntegralActivityPrizeRelationFormParam.getNew().copy(relation);
@@ -83,7 +78,7 @@ public class SweetIntegralActivityPrizeRelationServiceImpl extends ServiceImpl<S
                             prizeRelation.setPrizeRelationId(relationId);
                             relationMapper.insert(prizeRelation);
                         }
-                    }
+                    }*/
                 }
             }
             // 活动redis处理
@@ -129,7 +124,7 @@ public class SweetIntegralActivityPrizeRelationServiceImpl extends ServiceImpl<S
                         sweetRedisAdminUtils.decrIntegralActivityPrizeNum(integralActivityId, prizeId, Math.abs(prizeNumDiff));
                     }
 
-                    List<SweetIntegralActivityPrizeRelationFormParam> relationList = prize.getPrizeRelationList();
+                    /*List<SweetIntegralActivityPrizeRelationFormParam> relationList = prize.getPrizeRelationList();
                     if (!CollectionUtils.isEmpty(relationList)) {
                         for (SweetIntegralActivityPrizeRelationFormParam relation : relationList) {
                             SweetIntegralActivityPrizeRelation prizeRelation = SweetIntegralActivityPrizeRelationFormParam.getNew().copy(relation);
@@ -140,7 +135,7 @@ public class SweetIntegralActivityPrizeRelationServiceImpl extends ServiceImpl<S
                                     Wrappers.lambdaUpdate(SweetIntegralActivityPrizeRelation.class).eq(SweetIntegralActivityPrizeRelation::getPrizeRelationId, relationId)
                             );
                         }
-                    }
+                    }*/
                 }
             }
             // 活动redis处理
@@ -152,45 +147,6 @@ public class SweetIntegralActivityPrizeRelationServiceImpl extends ServiceImpl<S
         }
     }
 
-    @Override
-    public Integer isOnline(String integralActivityId, Integer isOnline) {
-        SweetIntegralActivity sweetIntegralActivity = SweetIntegralActivity.getNew();
-        sweetIntegralActivity.setIsOnline(isOnline);
-        sweetIntegralActivity.setUpdatedAt(LocalDateTime.now());
-        int update = sweetIntegralActivityMapper.update(
-                sweetIntegralActivity,
-                Wrappers.lambdaUpdate(SweetIntegralActivity.class).eq(SweetIntegralActivity::getIntegralActivityId, integralActivityId)
-        );
-        // 活动redis处理
-        this.integralActivityList(integralActivityId);
-        return update;
-    }
-
-    @Override
-    public SweetIntegralActivityVo detail(String integralActivityId) {
-        SweetIntegralActivity sweetIntegralActivity = sweetIntegralActivityMapper.selectOne(
-                Wrappers.lambdaQuery(SweetIntegralActivity.class).eq(SweetIntegralActivity::getIntegralActivityId, integralActivityId)
-        );
-        SweetIntegralActivityVo integralActivityVo = SweetIntegralActivityVo.getNew().copy(sweetIntegralActivity);
-        List<SweetIntegralActivityPrize> sweetIntegralActivityPrizes = sweetIntegralActivityPrizeMapper.selectList(
-                Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getIntegralActivityId, integralActivityId)
-        );
-        if (!CollectionUtils.isEmpty(sweetIntegralActivityPrizes)) {
-            List<SweetIntegralActivityPrizeVo> prizeVoList = SweetNewObjectUtil.getSweetIntegralActivityPrizeVoArrayList();
-            for (SweetIntegralActivityPrize prize : sweetIntegralActivityPrizes) {
-                SweetIntegralActivityPrizeVo sweetIntegralActivityPrizeVo = SweetIntegralActivityPrizeVo.getNew().copy(prize);
-                // 已发出
-                Integer winPrizeNum = sweetIntegralActivityDrawMapper.selectCount(
-                        Wrappers.lambdaQuery(SweetIntegralActivityDraw.class).eq(SweetIntegralActivityDraw::getPrizeId, prize.getPrizeId())
-                );
-                sweetIntegralActivityPrizeVo.setWinPrizeNum(winPrizeNum);
-                prizeVoList.add(sweetIntegralActivityPrizeVo);
-            }
-            integralActivityVo.setPrizeList(prizeVoList);
-        }
-        return integralActivityVo;
-    }
-
     @Override
     public PageInfo<SweetIntegralActivityDto> list(SweetIntegralActivityListSearchParam listParam) {
         PageHelper.startPage(listParam.getPageNum(), listParam.getPageSize());