From 55810dbe3aa36eb2bbcc4113eb2c85fc3b11b48d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 02 Jun 2022 16:05:38 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java | 2 ++
src/test/java/cc/mrbird/febs/ProfitTest.java | 6 +++++-
src/main/resources/templates/febs/views/modules/order/orderList.html | 1 +
3 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
index 86233cd..a0e3f12 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
@@ -69,4 +69,6 @@
private String memberBindPhone;
private String memberEmail;
+
+ private Integer carriage;
}
diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index b95c28e..8ea89e4 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -203,6 +203,7 @@
{field: 'memberPhone', title: '账号', minWidth: 120,align:'left'},
{field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
{field: 'amount', title: '订单金额', minWidth: 120,align:'left'},
+ {field: 'carriage', title: '运费', minWidth: 120,align:'left'},
{field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
{field: 'status', title: '状态',
templet: function (d) {
diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java
index b6bc5a2..ab1abe5 100644
--- a/src/test/java/cc/mrbird/febs/ProfitTest.java
+++ b/src/test/java/cc/mrbird/febs/ProfitTest.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs;
import cc.mrbird.febs.mall.service.IAgentService;
+import cc.mrbird.febs.mall.service.IMemberProfitService;
import cc.mrbird.febs.rabbit.consumer.AgentConsumer;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,8 +20,11 @@
@Autowired
private IAgentService agentService;
+ @Autowired
+ private IMemberProfitService memberProfitService;
+
@Test
public void dynamicProfit() {
- agentService.rankReturnMoney(7L);
+ memberProfitService.dynamicProfit(23L);
}
}
--
Gitblit v1.9.1