From a7962f680b606fbd200550bfda679f0957f3c447 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 27 Sep 2021 15:44:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 5 +++++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 6 +++---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 7 +++++--
src/main/java/cc/mrbird/febs/mall/service/IAgentService.java | 2 ++
5 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java b/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
index d0907cb..033babe 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
@@ -21,7 +21,7 @@
@ApiModelProperty(value = "搜索参数", example = "1")
private String query;
- @ApiModelProperty(value = "订单状态", example = "0-全部 1-待付款 2-待发货 3-待收货 4-退款或退款中")
+ @ApiModelProperty(value = "订单状态", example = "0-全部 1-待付款 2-待发货 3-待收货 4-退款或退款中 5-已取消")
private Integer status;
@ApiModelProperty(hidden = true)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAgentService.java b/src/main/java/cc/mrbird/febs/mall/service/IAgentService.java
index de87f80..bccd530 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAgentService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAgentService.java
@@ -5,4 +5,6 @@
void autoUpAgentLevel(Long memberId);
void returnMoneyToAgent(Long orderId);
+
+ void rankReturnMoney(Long orderId);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 1aa0798..47820ca 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -229,4 +229,9 @@
return JSONObject.parseObject(dic.getValue(), AgentInfo.class);
}
+
+ @Override
+ public void rankReturnMoney(Long orderId) {
+
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 5278912..5d3d9bd 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -195,6 +195,9 @@
Map<String, Object> map = new HashMap<>();
map.put("orderNo", orderNo);
map.put("orderId", orderInfo.getId());
+
+ agentProducer.sendAutoLevelUpMsg(member.getId());
+ agentProducer.sendReturnMoneyMsg(orderInfo.getId());
return map;
}
@@ -275,9 +278,6 @@
orderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
orderInfo.setReceivingTime(new Date());
this.baseMapper.updateById(orderInfo);
-
- agentProducer.sendAutoLevelUpMsg(member.getId());
- agentProducer.sendReturnMoneyMsg(orderInfo.getId());
}
@Override
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index e59fcf6..42d9562 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -93,8 +93,11 @@
<if test="record.status == 4 and record.status != 0">
and a.status in (5,6)
</if>
- <if test="record.status != 4 and record.status != 0">
+ <if test="record.status != 4 and record.status != 0 and record.status != 5">
and a.status = #{record.status}
+ </if>
+ <if test="record.status == 5">
+ and a.status = 7
</if>
<if test="record.memberId != null">
and a.member_id=#{record.memberId}
@@ -147,7 +150,7 @@
select IFNULL(count(1), 0) from mall_order_info a
inner join mall_member b on a.member_id=b.ID
<where>
- a.status=4
+ a.status in (2,3,4)
<if test="type == 1">
and b.referrer_id=#{inviteId}
</if>
--
Gitblit v1.9.1