记得上下班打卡 | git大法好,push需谨慎

Commit cebc658b authored by jiangxiulong's avatar jiangxiulong

Merge remote-tracking branch 'origin/dev_stone' into dev_stone

parents 82aac5f7 42632b76
...@@ -3,17 +3,18 @@ package com.liquidnet.client.admin.web.controller.zhengzai.stone; ...@@ -3,17 +3,18 @@ package com.liquidnet.client.admin.web.controller.zhengzai.stone;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.annotation.Log; import com.liquidnet.client.admin.common.annotation.Log;
import com.liquidnet.client.admin.common.core.controller.BaseController; 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.core.page.TableDataInfo;
import com.liquidnet.client.admin.common.enums.BusinessType;
import com.liquidnet.client.admin.zhengzai.stone.service.IItemService; import com.liquidnet.client.admin.zhengzai.stone.service.IItemService;
import com.liquidnet.service.stone.entity.StoneScoreItems; import com.liquidnet.service.stone.entity.StoneScoreItems;
import com.liquidnet.service.stone.param.StoneItemBuildParam;
import com.liquidnet.service.stone.param.StoneListParam; import com.liquidnet.service.stone.param.StoneListParam;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@Api(tags = "积分物品")
@Controller @Controller
@RequestMapping("stone/item") @RequestMapping("stone/item")
public class StoneItemController extends BaseController { public class StoneItemController extends BaseController {
...@@ -23,8 +24,8 @@ public class StoneItemController extends BaseController { ...@@ -23,8 +24,8 @@ public class StoneItemController extends BaseController {
private IItemService iItemService; private IItemService iItemService;
@Log(title = "积分商品:列表", businessType = BusinessType.LIST) @Log(title = "积分商品:列表")
@PostMapping("list") @GetMapping("list")
@ResponseBody @ResponseBody
public TableDataInfo list(StoneListParam listParam) { public TableDataInfo list(StoneListParam listParam) {
PageInfo<StoneScoreItems> result = iItemService.itemList(listParam.getTitle(), listParam.getState(), listParam.getType()); PageInfo<StoneScoreItems> result = iItemService.itemList(listParam.getTitle(), listParam.getState(), listParam.getType());
...@@ -34,4 +35,36 @@ public class StoneItemController extends BaseController { ...@@ -34,4 +35,36 @@ public class StoneItemController extends BaseController {
rspData.setTotal(result.getTotal()); rspData.setTotal(result.getTotal());
return rspData; return rspData;
} }
@Log(title = "积分商品:修改状态")
@PostMapping("change/status")
@ResponseBody
public AjaxResult status(@RequestParam("itemId") String itemId, @RequestParam("status") Integer status) {
String result = iItemService.changeStatus(itemId, status);
return AjaxResult.success(result);
}
@Log(title = "积分商品:详情")
@PostMapping("details")
@ResponseBody
public AjaxResult details(@RequestParam("itemId") String itemId) {
StoneScoreItems result = iItemService.itemDetails(itemId);
return AjaxResult.success(result);
}
@Log(title = "积分商品:创建")
@PostMapping("")
@ResponseBody
public AjaxResult createItem(StoneItemBuildParam param) {
String result = iItemService.createItem(param);
return AjaxResult.success(result);
}
@Log(title = "积分商品:修改")
@PutMapping("")
@ResponseBody
public AjaxResult updateItem(StoneItemBuildParam param) {
String result = iItemService.updateItem(param);
return AjaxResult.success(result);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment