From 29586248907d34a7b2517ae4c1f753e0627028f1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 21 Dec 2023 11:23:54 +0800
Subject: [PATCH] 富文本框输入版本变化
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAppServiceImpl.java | 19 +++++++++++++++++++
src/main/java/cc/mrbird/febs/mall/dto/ApiNormalInsureDto.java | 4 ++++
src/main/java/cc/mrbird/febs/mall/dto/ApiRegistAppOrderDto.java | 1 +
src/main/java/cc/mrbird/febs/mall/controller/ApiMallAppController.java | 6 ++++++
src/main/java/cc/mrbird/febs/mall/service/IApiMallAppService.java | 2 ++
src/main/java/cc/mrbird/febs/mall/dto/ApiAddOrderDto.java | 3 +++
6 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallAppController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallAppController.java
index 3c60150..fa3233c 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallAppController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallAppController.java
@@ -86,4 +86,10 @@
return mallAppService.getOrder(apiGetOrderDto);
}
+ @ApiOperation(value = "取单-删除", notes = "取单-删除")
+ @PostMapping(value = "/getOrderCancel")
+ public FebsResponse getOrderCancel(@RequestBody ApiGetOrderDto apiGetOrderDto) {
+ return mallAppService.getOrderCancel(apiGetOrderDto);
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ApiAddOrderDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ApiAddOrderDto.java
index 0d85159..c7c381d 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/ApiAddOrderDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ApiAddOrderDto.java
@@ -10,6 +10,9 @@
@ApiModel(value = "ApiAddOrderDto", description = "新增订单接口参数接收类")
public class ApiAddOrderDto {
+ @ApiModelProperty(value = "订单ID", example = "1")
+ private Long orderId;
+
@ApiModelProperty(value = "订单结算方式 1：普通结算 2：会员结算", example = "1")
private Integer type;
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ApiNormalInsureDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ApiNormalInsureDto.java
index 52cea45..731da9c 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/ApiNormalInsureDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ApiNormalInsureDto.java
@@ -10,6 +10,10 @@
@ApiModel(value = "ApiNormalInsureDto", description = "新增订单接口参数接收类")
public class ApiNormalInsureDto {
+
+ @ApiModelProperty(value = "订单ID", example = "1")
+ private Long orderId;
+
@ApiModelProperty(value = "订单结算方式 1：普通结算 2：会员结算", example = "1")
private Integer type;
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ApiRegistAppOrderDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ApiRegistAppOrderDto.java
index 57352a9..6f8a557 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/ApiRegistAppOrderDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ApiRegistAppOrderDto.java
@@ -12,4 +12,5 @@
@ApiModelProperty(value = "商品明细")
private List<ApiAddOrderItemDto> items;
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IApiMallAppService.java b/src/main/java/cc/mrbird/febs/mall/service/IApiMallAppService.java
index 2d44c33..6b97eb5 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IApiMallAppService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IApiMallAppService.java
@@ -24,4 +24,6 @@
FebsResponse getOrderList(ApiGetOrderListDto orderListDto);
FebsResponse getOrder(ApiGetOrderDto apiGetOrderDto);
+
+ FebsResponse getOrderCancel(ApiGetOrderDto apiGetOrderDto);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAppServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAppServiceImpl.java
index 6fc27d6..ac31f35 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAppServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAppServiceImpl.java
@@ -100,6 +100,11 @@
@Override
@Transactional
public FebsResponse createAppOrder(ApiAddOrderDto addOrderDto) {
+ if(ObjectUtil.isNotEmpty(addOrderDto.getOrderId())){
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(addOrderDto.getOrderId());
+ mallOrderInfo.setStatus(OrderStatusEnum.CANCEL.getValue());
+ mallOrderInfoMapper.updateById(mallOrderInfo);
+ }
MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(addOrderDto.getMemberId());
if (ObjectUtil.isEmpty(mallMemberWallet)) {
throw new FebsException("用户钱包不存在。");
@@ -234,6 +239,11 @@
@Override
public FebsResponse normalInsure(ApiNormalInsureDto addOrderDto) {
+ if(ObjectUtil.isNotEmpty(addOrderDto.getOrderId())){
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(addOrderDto.getOrderId());
+ mallOrderInfo.setStatus(OrderStatusEnum.CANCEL.getValue());
+ mallOrderInfoMapper.updateById(mallOrderInfo);
+ }
String orderNo = MallUtils.getOrderNum();
MallOrderInfo orderInfo = new MallOrderInfo();
orderInfo.setOrderNo(orderNo);
@@ -296,6 +306,15 @@
return new FebsResponse().success().data(apiGetOrderListVo);
}
+ @Override
+ public FebsResponse getOrderCancel(ApiGetOrderDto apiGetOrderDto) {
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(apiGetOrderDto.getOrderId());
+ mallOrderInfo.setStatus(OrderStatusEnum.CANCEL.getValue());
+ mallOrderInfoMapper.updateById(mallOrderInfo);
+
+ return new FebsResponse().success().message("订单已取消");
+ }
+
public String generateAsaToken(String token) {
RSA rsa = new RSA(null, AppContants.PUBLIC_KEY);
return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);
--
Gitblit v1.9.1