diff --git a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java index ceb5576b..03623929 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java @@ -401,7 +401,7 @@ public class StoreOrderController { @ApiOperation(value = "订单核销",notes = "订单核销") public ApiResult orderVerify( @RequestBody OrderVerifyParam param){ Long uid = LocalUser.getUser().getUid(); - YxStoreOrderQueryVo orderQueryVo = storeOrderService.verificOrder(param.getVerifyCode(), + YxStoreOrderQueryVo orderQueryVo = storeOrderService.verifyOrder(param.getVerifyCode(), param.getIsConfirm(),uid); if(orderQueryVo != null) { return ApiResult.ok(orderQueryVo); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java index 28a9f0ca..b0b0548a 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java @@ -146,7 +146,7 @@ public interface YxStoreOrderService extends BaseService{ * @param uid uid * @return YxStoreOrderQueryVo */ - YxStoreOrderQueryVo verificOrder(String verifyCode,Integer isConfirm ,Long uid); + YxStoreOrderQueryVo verifyOrder(String verifyCode, Integer isConfirm , Long uid); /** * 订单列表 diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index d467c79b..c7a4cfb7 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -923,7 +923,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpllambdaQuery() .eq(YxStoreOrder::getVerifyCode,verifyCode) diff --git a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java index 06240222..b09df9ed 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java @@ -165,7 +165,7 @@ public class StoreOrderController { throw new BadRequestException("订单未支付"); } - yxStoreOrderService.verificOrder(resources.getVerifyCode(), + yxStoreOrderService.verifyOrder(resources.getVerifyCode(), OrderInfoEnum.CONFIRM_STATUS_1.getValue(),null); return new ResponseEntity(HttpStatus.NO_CONTENT);