|
|
@@ -16,6 +16,8 @@ import io.swagger.annotations.ApiImplicitParam; |
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
import io.swagger.annotations.ApiOperation; |
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
|
|
|
|
|
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
|
@RestController |
|
|
@RestController |
|
|
@RequestMapping("/order") |
|
|
@RequestMapping("/order") |
|
|
public class WxOrderController extends BaseController { |
|
|
public class WxOrderController extends BaseController { |
|
|
@@ -24,29 +26,37 @@ public class WxOrderController extends BaseController { |
|
|
@Autowired |
|
|
@Autowired |
|
|
private WxOrderService wxOrderService; |
|
|
private WxOrderService wxOrderService; |
|
|
|
|
|
|
|
|
@ApiOperation("分页列表接口") |
|
|
|
|
|
@GetMapping("list") |
|
|
@GetMapping("list") |
|
|
|
|
|
@ApiOperation(value = "券查询接口", notes="{\"pageNum\":int,\"pageSize\":int," + |
|
|
|
|
|
"\"merchantId\":Long,\"cUserId\":Long,"+ |
|
|
|
|
|
"\"status\":int,\"couponStatus\":int}") |
|
|
@ApiImplicitParams({ |
|
|
@ApiImplicitParams({ |
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
@ApiImplicitParam(name = "pageSize", 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<WxOrder> page = wxOrderService.blistAsPage(wxOrder, bUserId, pageNum, pageSize); |
|
|
|
|
|
|
|
|
public ResultData list(@RequestBody Map<String, Object> params) { |
|
|
|
|
|
final PageInfo<Map<String,Object>> page = wxOrderService.bQueryListMap(params); |
|
|
return new ResultData(page); |
|
|
return new ResultData(page); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ApiOperation("订单详情") |
|
|
@ApiOperation("订单详情") |
|
|
@PostMapping("expired") |
|
|
|
|
|
|
|
|
@PostMapping("detail") |
|
|
@ApiImplicitParams({ |
|
|
@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<String, Object> params) { |
|
|
//Assert.notNull(wxOrders.getName(), "角色名不能为空"); |
|
|
//Assert.notNull(wxOrders.getName(), "角色名不能为空"); |
|
|
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); |
|
|
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); |
|
|
return new ResultData(); |
|
|
|
|
|
|
|
|
Map<String,Object> map = wxOrderService.queryObject(params); |
|
|
|
|
|
return new ResultData(map); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ApiOperation("手工退款") |
|
|
@ApiOperation("手工退款") |
|
|
|