From 75d0ca9a8bffa2470a73be5f3d6e4c7f54ea2f71 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 17 Aug 2018 13:50:14 +0800 Subject: [PATCH] =?UTF-8?q?[di=E8=AE=A2=E5=8D=95][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=EF=BC=8C=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxOrderController.java | 76 ++++++++++++------ .../simple/controller/WxOrderController.java | 77 ++++++++++--------- 2 files changed, 95 insertions(+), 58 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java index 99cb4d533..18c59d800 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java @@ -1,7 +1,11 @@ package com.simple.controller; +import com.simple.common.ErrorCode; +import com.simple.domain.po.WxMerchantBUser; import com.simple.domain.vo.OrderVo; import com.simple.enums.EnumOrderStatus; +import io.swagger.models.auth.In; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; @@ -32,45 +36,71 @@ public class WxOrderController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), - @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 = "orderId", value = "订单ID", dataType = "Long", paramType = "query", required = false), - @ApiImplicitParam(name = "couponId", value = "券ID", dataType = "Long", paramType = "query", required = false), - @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "orderStatus", 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 OrderVo orderVo, Integer pageNum, Integer pageSize) { + public ResultData list(Integer orderStatus, Integer couponStatus, Integer pageNum, Integer pageSize) { + WxMerchantBUser user = getUser(); + OrderVo orderVo = new OrderVo(); + orderVo.setbUserId(user.getId()); + if (orderStatus != -1) + orderVo.setOrderStatus(orderStatus); + if (couponStatus != -1) + orderVo.setCouponStatus(couponStatus); final PageInfo> page = wxOrderService.bQueryListMap(orderVo, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("订单详情") + @ApiOperation(value = "订单详情", notes = "{\"couponOrderId\":\"String\",\"orderId\":\"String\",\"couponId\":\"String\"}") @GetMapping("detail") - @ApiImplicitParams({ - @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 = "orderId", value = "订单ID", dataType = "Long", paramType = "query", required = false), - @ApiImplicitParam(name = "couponId", value = "券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(@ModelAttribute OrderVo orderVo) { + public ResultData orderDetail(@RequestBody Map paramMap) { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + String couponOrderIdStr = paramMap.get("couponOrderId"); + String orderIdStr = paramMap.get("orderId"); + String couponIdStr = paramMap.get("couponId"); + if (StringUtils.isBlank(couponOrderIdStr)) { + return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "couponOrderId不能为空"); + } + if (StringUtils.isBlank(orderIdStr)) { + return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); + } + if (StringUtils.isBlank(couponIdStr)) { + return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "couponId不能为空"); + } + Long couponOrderId = 0L, orderId = 0L, couponId = 0L; + try { + couponOrderId = Long.valueOf(couponOrderIdStr); + orderId = Long.valueOf(orderIdStr); + couponId = Long.valueOf(couponIdStr); + } catch (NumberFormatException e) { + logger.error("couponOrderId " + couponOrderIdStr + ", e:" + e.getMessage()); + } + WxMerchantBUser user = getUser(); + OrderVo orderVo = new OrderVo(); + orderVo.setbUserId(user.getId()); + orderVo.setOrderId(orderId); + orderVo.setCouponId(couponId); Map map = wxOrderService.queryObject(orderVo); return new ResultData(map); } - @ApiOperation("手工退款") + @ApiOperation(value = "手工退款", notes = "{\"orderId\":\"string\"}") @PostMapping("refund") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long") - }) - public ResultData expiringOrder(@RequestBody WxOrder wxOrder) { + public ResultData expiringOrder(@RequestBody Map paramMap) { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - // 1. - //wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_PENDING_REFUND); + String orderIdStr = paramMap.get("orderId"); + if (StringUtils.isBlank(orderIdStr)) { + return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); + } + Long orderId = 0L; + try { + orderId = Long.valueOf(orderIdStr); + } catch (NumberFormatException e) { + logger.error("orderId " + orderIdStr + ", e:" + e.getMessage()); + } + wxOrderService.updateOrderStatus(orderId, EnumOrderStatus.ORDER_STATUS_PENDING_REFUND); return new ResultData(); } } diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java index 630a68b4c..26e80f761 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java @@ -4,6 +4,7 @@ import com.simple.common.ErrorCode; import com.simple.domain.po.WxCUser; import com.simple.enums.EnumOrderStatus; import com.simple.exception.MallinkException; +import io.swagger.models.auth.In; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -51,56 +52,62 @@ public class WxOrderController extends BaseController { } } - @ApiOperation("取消订单") + @ApiOperation(value = "取消订单", notes = "{\"orderId\":\"string\"}") @PostMapping("cancel") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long"), - @ApiImplicitParam(name = "cUserId", value = "用户ID", required = true, dataType = "Long") - }) - public ResultData cancelOrder(@RequestBody WxOrder wxOrder) { + public ResultData cancelOrder(@RequestBody Map paramMap) { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL); - return new ResultData(); - } - - @ApiOperation("订单过期") - @PostMapping("expiring") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long"), - @ApiImplicitParam(name = "cUserId", value = "用户ID", required = true, dataType = "Long") - }) - public ResultData expiringOrder(@RequestBody WxOrder wxOrder) { - //Assert.notNull(wxOrders.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_PENDING_REFUND); + String orderIdStr = paramMap.get("orderId"); + if (StringUtils.isBlank(orderIdStr)) { + return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); + } + Long orderId = 0L; + WxCUser user = getUser(); + try { + orderId = Long.valueOf(orderIdStr); + } catch (NumberFormatException e) { + logger.error(e.getMessage()); + } + wxOrderService.updateOrderStatus(orderId, EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL); return new ResultData(); } - @ApiOperation("订单已过期") + @ApiOperation(value = "订单已过期", notes = "{\"orderId\":\"string\"}") @PostMapping("expired") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long"), - @ApiImplicitParam(name = "cUserId", value = "用户ID", required = true, dataType = "Long") - }) - public ResultData expiredOrder(@RequestBody WxOrder wxOrder) { + public ResultData expiredOrder(@RequestBody Map paramMap) { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS); + String orderIdStr = paramMap.get("orderId"); + if (StringUtils.isBlank(orderIdStr)) { + return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); + } + Long orderId = 0L; + WxCUser user = getUser(); + try { + orderId = Long.valueOf(orderIdStr); + } catch (NumberFormatException e) { + logger.error(e.getMessage()); + } + wxOrderService.updateOrderStatus(orderId, EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS); return new ResultData(); } - @ApiOperation("分页列表接口") + @ApiOperation(value = "分页订单列表接口", notes = "{\"pageNum\":Integer,\"pageSize\":Integer,\"orderStatus\":\"0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款)\"}") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { - if (null == wxOrder) wxOrder = new WxOrder(); + public ResultData list(@RequestBody Map paramMap) { + Integer pageNum = (Integer) paramMap.get("pageNum"); + Integer pageSize = (Integer) paramMap.get("pageSize"); + Integer orderStatus = (Integer) paramMap.get("orderStatus"); + if (pageNum <= 0) + pageNum = 1; + if (pageSize <= 0) + pageSize = 10; // c端用户应该只能看到自己的订单 WxCUser user = getUser(); - wxOrder.setCUserId(user.getId()); - final PageInfo page = wxOrderService.listAsPage(wxOrder, pageNum, pageSize); + WxOrder wxOrderQ = new WxOrder(); + wxOrderQ.setCUserId(user.getId()); + wxOrderQ.setOrderStatus(orderStatus); + final PageInfo page = wxOrderService.listAsPage(wxOrderQ, pageNum, pageSize); return new ResultData(page); }