From f479b8b996117f1619fef360d159fbff2655dcb0 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 11 Aug 2018 11:42:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxOrderController.java | 30 +++++--- .../java/com/simple/mapper/WxOrderMapper.java | 9 ++- .../com/simple/service/WxOrderService.java | 14 ++-- .../service/impl/WxOrderServiceImpl.java | 11 ++- .../main/resources/mapper/WxOrderMapper.xml | 68 ++++++++++++++++++- 5 files changed, 107 insertions(+), 25 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java index d63ade549..2d488ec3d 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java @@ -16,6 +16,8 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import java.util.Map; + @RestController @RequestMapping("/order") public class WxOrderController extends BaseController { @@ -24,29 +26,37 @@ public class WxOrderController extends BaseController { @Autowired private WxOrderService wxOrderService; - @ApiOperation("分页列表接口") @GetMapping("list") + @ApiOperation(value = "券查询接口", notes="{\"pageNum\":int,\"pageSize\":int," + + "\"merchantId\":Long,\"cUserId\":Long,"+ + "\"status\":int,\"couponStatus\":int}") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "bUserId", value = "B端用户ID", dataType = "Long", paramType = "query", required = true), - @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", defaultValue = "0", required = false, dataType = "Integer") + @ApiImplicitParam(name = "merchantId", value = "B端用户ID", dataType = "Long", paramType = "query", required = true), + @ApiImplicitParam(name = "cUserId", value = "C端用户ID", dataType = "Long", paramType = "query", required = false), + @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "couponStatus", value = "券状态:-1全部;3:已领取/已购买/未核销/未使用,4:已核销/已使用,5:已过期,6:已退券", required = false, dataType = "Integer") }) - public ResultData list(@ModelAttribute WxOrder wxOrder, Long bUserId, Integer pageNum, Integer pageSize) { - if (null == wxOrder) wxOrder = new WxOrder(); - final PageInfo page = wxOrderService.blistAsPage(wxOrder, bUserId, pageNum, pageSize); + public ResultData list(@RequestBody Map params) { + final PageInfo> page = wxOrderService.bQueryListMap(params); return new ResultData(page); } @ApiOperation("订单详情") - @PostMapping("expired") + @PostMapping("detail") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long") + @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long"), + @ApiImplicitParam(name = "merchantId", value = "B端用户ID", dataType = "Long", paramType = "query", required = true), + @ApiImplicitParam(name = "cUserId", value = "C端用户ID", dataType = "Long", paramType = "query", required = false), + @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "couponStatus", value = "券状态:-1全部;3:已领取/已购买/未核销/未使用,4:已核销/已使用,5:已过期,6:已退券", required = false, dataType = "Integer") }) - public ResultData orderDetail(@RequestBody WxOrder wxOrder) { + public ResultData orderDetail(@RequestBody Map params) { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - return new ResultData(); + Map map = wxOrderService.queryObject(params); + return new ResultData(map); } @ApiOperation("手工退款") diff --git a/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java index c3aa5a5a2..9a8e6b320 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java @@ -8,10 +8,9 @@ import com.simple.domain.po.WxOrder; public interface WxOrderMapper extends CommonMapper { List findList(WxOrder wxOrder); - - - - - + List> queryListMap(Map params); + + Map queryObject(Map params); + } diff --git a/mallinkService/src/main/java/com/simple/service/WxOrderService.java b/mallinkService/src/main/java/com/simple/service/WxOrderService.java index d331aadd1..b369daae3 100644 --- a/mallinkService/src/main/java/com/simple/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxOrderService.java @@ -20,13 +20,17 @@ public interface WxOrderService { /** * 根据实体查询分页列表 * - * @param record - * @param merchantId - * @param pageIndex - * @param pageSize + * @param params + * @return + */ + PageInfo> bQueryListMap(Map params); + + /** + * 查询券详情 + * @param params * @return */ - PageInfo blistAsPage(WxOrder record, Long merchantId, Integer pageIndex, Integer pageSize); + Map queryObject(Map params); /** * 提交订单 diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java index 835575556..9ec63109e 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java @@ -36,8 +36,15 @@ public class WxOrderServiceImpl implements WxOrderService { } @Override - public PageInfo blistAsPage(WxOrder record, Long merchantId, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.findList(record)); + public PageInfo> bQueryListMap(Map params) { + Integer pageIndex = (Integer) params.get("pageIndex"); + Integer pageSize = (Integer) params.get("pageSize"); + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(()->wxOrderMapper.queryListMap(params)); + } + + @Override + public Map queryObject(Map params) { + return wxOrderMapper.queryObject(params); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 08dc8cd4f..11d5da2e9 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -101,9 +101,71 @@ select from wx_order - - - + + + + +