From f489850355bae6d690b2d3e6d0627f90bde79b1d Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期五, 06 九月 2024 18:59:51 +0800 Subject: [PATCH] 1.优惠券记录新增category查询字段 2.小程序-商品历史记录根据更新时间排序 3.优惠券-用户优惠券控制已下架的优惠券不可重新上架,及当前优惠券的已经发放的情况下不可再次下发 --- src/main/java/com/mzl/flower/web/supplier/DeliverySupplierController.java | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/mzl/flower/web/supplier/DeliverySupplierController.java b/src/main/java/com/mzl/flower/web/supplier/DeliverySupplierController.java index 9d3cc18..51760a1 100644 --- a/src/main/java/com/mzl/flower/web/supplier/DeliverySupplierController.java +++ b/src/main/java/com/mzl/flower/web/supplier/DeliverySupplierController.java @@ -4,6 +4,7 @@ import com.mzl.flower.base.BaseController; import com.mzl.flower.base.R; import com.mzl.flower.base.ReturnDataDTO; +import com.mzl.flower.constant.Constants; import com.mzl.flower.dto.request.payment.DeliveryOrderArriveDTO; import com.mzl.flower.dto.request.payment.DeliveryOrderQueryDTO; import com.mzl.flower.dto.response.payment.*; @@ -136,4 +137,32 @@ return returnData(R.SUCCESS.getCode(), deliveryOrderService.selectSettlementListByTime(page, day)); } + @GetMapping("/mine/list/check/info/reduce") + @ApiOperation(value = "降级操作详情") + @ApiImplicitParams({ + @ApiImplicitParam(name = "orderItemId", value = "订单商品id", required = true, dataType = "String", paramType = "query") + }) + public ResponseEntity<ReturnDataDTO<OrderItemCheckReduceDTO>> getReduceCheck(String orderItemId){ + return returnData(R.SUCCESS.getCode(), deliveryOrderService.getReduceCheck(orderItemId)); + } + + @GetMapping("/mine/list/check/info/replace") + @ApiOperation(value = "补货操作详情") + @ApiImplicitParams({ + @ApiImplicitParam(name = "orderItemId", value = "订单商品id", required = true, dataType = "String", paramType = "query") + }) + public ResponseEntity<ReturnDataDTO<OrderItemCheckNumDTO>> getReplaceCheck(String orderItemId){ + return returnData(R.SUCCESS.getCode(), deliveryOrderService.getOtherCheck(orderItemId + , Constants.CHECK_TYPE.replace.name())); + } + + @GetMapping("/mine/list/check/info/lack") + @ApiOperation(value = "缺货操作详情") + @ApiImplicitParams({ + @ApiImplicitParam(name = "orderItemId", value = "订单商品id", required = true, dataType = "String", paramType = "query") + }) + public ResponseEntity<ReturnDataDTO<OrderItemCheckNumDTO>> getLackCheck(String orderItemId){ + return returnData(R.SUCCESS.getCode(), deliveryOrderService.getOtherCheck(orderItemId + , Constants.CHECK_TYPE.lack.name())); + } } -- Gitblit v1.9.3