From a225da9a879c2becb13627a5f5d573d022bad1be Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 29 Aug 2022 17:53:14 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/mall/dto/ApiRefundOrderInfoDto.java | 17 +++++++++++++++++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 12 ++++++++++++
src/main/java/cc/mrbird/febs/mall/controller/ApiMallTeamLeaderController.java | 6 ++++++
src/main/java/cc/mrbird/febs/mall/mapper/MallRefundMapper.java | 2 +-
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 4 +++-
src/main/java/cc/mrbird/febs/mall/service/IApiMallTeamLeaderService.java | 2 ++
6 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallTeamLeaderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallTeamLeaderController.java
index 59fe2e6..01dbe83 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallTeamLeaderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallTeamLeaderController.java
@@ -103,6 +103,12 @@
return iApiMallTeamLeaderService.leaderRefundOrder(apiLeaderRefundOrderDto);
}
+ @ApiOperation(value = "团长退款详情", notes = "团长退款详情")
+ @PostMapping(value = "/refundOrderInfo")
+ public FebsResponse refundOrderInfo(@RequestBody ApiRefundOrderInfoDto apiRefundOrderInfoDto) {
+ return iApiMallTeamLeaderService.refundOrderInfo(apiRefundOrderInfoDto);
+ }
+
/**
* 商品列表页的团长信息
* 有团长特征码直接显示该团长，
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ApiRefundOrderInfoDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ApiRefundOrderInfoDto.java
new file mode 100644
index 0000000..839df00
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ApiRefundOrderInfoDto.java
@@ -0,0 +1,17 @@
+package cc.mrbird.febs.mall.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "ApiRefundOrderInfoDto", description = "参数接收类")
+public class ApiRefundOrderInfoDto {
+
+ @ApiModelProperty(value = "订单ID", example = "1")
+ private Long orderId;
+
+ @ApiModelProperty(value = "订单详情ID", example = "1")
+ private Long ItemId;
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallRefundMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallRefundMapper.java
index c6a51fc..fe79fda 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallRefundMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallRefundMapper.java
@@ -10,7 +10,7 @@
public interface MallRefundMapper extends BaseMapper<MallRefundEntity> {
- List<MallRefundEntity> selectByItemIdAndOrderIdAndState(@Param("itemId")Long itemId, @Param("orderId")Long orderId, @Param("state")int i);
+ List<MallRefundEntity> selectByItemIdAndOrderIdAndState(@Param("itemId")Long itemId, @Param("orderId")Long orderId, @Param("state")Integer i);
IPage<MallRefundEntity> getOrderRefundListInPage(Page<MallRefundEntity> page, @Param("record")MallRefundEntity mallRefundEntity);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IApiMallTeamLeaderService.java b/src/main/java/cc/mrbird/febs/mall/service/IApiMallTeamLeaderService.java
index 3ce5be0..218507f 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IApiMallTeamLeaderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IApiMallTeamLeaderService.java
@@ -28,4 +28,6 @@
FebsResponse findTeamOrderMarkCnt();
FebsResponse leaderRefundOrder(ApiLeaderRefundOrderDto apiLeaderRefundOrderDto);
+
+ FebsResponse refundOrderInfo(ApiRefundOrderInfoDto apiRefundOrderInfoDto);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index 12322cb..929f6f4 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -332,4 +332,16 @@
return new FebsResponse().success().message("退款成功");
}
+ @Override
+ public FebsResponse refundOrderInfo(ApiRefundOrderInfoDto apiRefundOrderInfoDto) {
+ Long orderId = apiRefundOrderInfoDto.getOrderId();
+ Long itemId = apiRefundOrderInfoDto.getItemId();
+
+ List<MallRefundEntity> mallRefundEntities = mallRefundMapper.selectByItemIdAndOrderIdAndState(itemId, orderId, null);
+ if(CollUtil.isEmpty(mallRefundEntities)){
+ return new FebsResponse().fail().message("退款信息不存在");
+ }
+ return new FebsResponse().success().data(mallRefundEntities.get(0));
+ }
+
}
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 35cfde4..a4fd6cb 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -150,6 +150,7 @@
<result property="price" column="price" />
<result property="amount" column="amount" />
<result property="isNormal" column="is_normal" />
+ <result property="state" column="state" />
</collection>
</resultMap>
@@ -164,6 +165,7 @@
b.style_name,
b.sku_name,
b.sku_image,
+ b.state,
b.cnt,
b.price,
b.amount,
@@ -190,7 +192,7 @@
and a.status = #{record.status}
</if>
<if test="record.status == 5">
- and a.status = 7
+ and a.status = 7 or b.state in (2,3)
</if>
<if test="record.memberId != null">
and a.member_id=#{record.memberId}
--
Gitblit v1.9.1