From c6fa5a52910df1a934489430055339878630529d Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Sun, 21 Jul 2024 17:03:31 +0800
Subject: [PATCH] no message
---
.../api/financialStatement/yunyingfenxi.js | 67 +++++++
.../yunyingfenxi/tab/int.vue | 147 ++++++++++-----
.../yunyingfenxi/tab/oil.vue | 175 +++++++++++++-----
.../yunyingfenxi/tab/store.vue | 167 +++++++++++------
.../yunyingfenxi/tab/vip.vue | 164 +++++-----------
.../controller/IntegralOrdersController.java | 18 +-
.../integral/mapper/IntegralOrdersMapper.java | 3 +
.../mapper/xml/IntegralOrdersMapper.xml | 35 ++++
.../service/IntegralOrdersService.java | 2 +
.../impl/IntegralOrdersServiceImpl.java | 25 +++
.../integral/vo/IntegralOrdersVO.java | 9 +
.../largeSscreen/vo/OrderGoodsVO.java | 7 +
.../mapper/CardValueRecordMapper.java | 3 +
.../mapper/xml/CardValueRecordMapper.xml | 10 +
.../order/controller/LJOrderController.java | 16 +-
.../order/controller/OilOrderController.java | 15 +-
.../fuint/business/order/entity/LJOrder.java | 5 +
.../order/mapper/AllOrderInfoMapper.java | 5 +
.../business/order/mapper/LJOrderMapper.java | 5 +
.../business/order/mapper/OilOrderMapper.java | 5 +-
.../order/mapper/OrderGoodsMapper.java | 9 +
.../order/mapper/xml/AllOrderInfoMapper.xml | 22 +++
.../order/mapper/xml/LJOrderMapper.xml | 32 +++-
.../order/mapper/xml/OilOrderMapper.xml | 40 +++-
.../order/mapper/xml/OrderGoodsMapper.xml | 39 ++++
.../order/service/LJOrderService.java | 2 +
.../order/service/OilOrderService.java | 4 +-
.../service/impl/LJOrderServiceImpl.java | 59 +++++-
.../service/impl/OilOrderServiceImpl.java | 39 ++++
.../fuint/business/order/vo/LJOrderVo.java | 20 ++
.../fuint/business/order/vo/OilOrderVo.java | 13 ++
.../controller/UserBalanceController.java | 35 ++++
.../userManager/mapper/UserBalanceMapper.java | 8 +
.../mapper/xml/UserBalanceMapper.xml | 22 +++
.../service/UserBalanceService.java | 7 +
.../service/impl/UserBalanceServiceImpl.java | 62 +++++++
.../userManager/vo/UserBalanceVo.java | 23 +++
37 files changed, 1030 insertions(+), 289 deletions(-)
create mode 100644 fuintAdmin_zt/src/api/financialStatement/yunyingfenxi.js
create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/UserBalanceController.java
diff --git a/fuintAdmin_zt/src/api/financialStatement/yunyingfenxi.js b/fuintAdmin_zt/src/api/financialStatement/yunyingfenxi.js
new file mode 100644
index 000000000..c5bc1da02
--- /dev/null
+++ b/fuintAdmin_zt/src/api/financialStatement/yunyingfenxi.js
@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+
+// 会员充值订单
+ export function getFenXiUserbalanceListApi(query) {
+ return request({
+ url: '/business/userManager/userbalance/listByZt',
+ method: 'get',
+ params: query
+ })
+}
+ export function getFenXiUserbalanceDataApi(query) {
+ return request({
+ url: '/business/userManager/userbalance/getUser',
+ method: 'get',
+ params: query
+ })
+}
+
+// 油品分析
+ export function getFenXiOilOrderListApi(query) {
+ return request({
+ url: '/business/oilOrder/selectOilOrderFenXiListByZtDz',
+ method: 'get',
+ params: query
+ })
+}
+ export function getFenXiOilOrderDataApi(query) {
+ return request({
+ url: '/business/oilOrder/selectOilOrderFenXiDataByZtDz',
+ method: 'get',
+ params: query
+ })
+}
+
+// 商品订单
+ export function getFenXiStoreListApi(query) {
+ return request({
+ url: '/business/order/selectOrderFenxiListByZtDz',
+ method: 'get',
+ params: query
+ })
+}
+ export function getFenXiStoreDataApi(query) {
+ return request({
+ url: '/business/order/selectOrderFenxiDataByZtDz',
+ method: 'get',
+ params: query
+ })
+}
+
+// 积分商城
+export function getFenXiIntegralListApi(query) {
+ return request({
+ url: '/business/integral/integralOrders/queryByPageFenxiByZtDz',
+ method: 'get',
+ params: query
+ })
+}
+export function getFenXiIntegralDataApi(query) {
+ return request({
+ url: '/business/integral/integralOrders/getIntFenxiDataByZtDz',
+ method: 'get',
+ params: query
+ })
+}
+
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
index 9bb19baab..e2ebf7a92 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
@@ -74,58 +74,44 @@
重置
-
-
+
+
+
累计交易金额（万元）
+
{{orderStatistics.payAmount}}
+
+
+
累计交易笔数
+
{{orderStatistics.count}}
+
+
+
累计兑换商品数量
+
{{orderStatistics.goodsNum}}
+
+
+
累计消耗积分
+
{{orderStatistics.cvg}}
+
+
-
-
-
-
-
-
- 收银台
- POS机
- 平台
- 小程序
- 其他
-
-
-
-
- 现金
- 微信
- 支付宝
- 余额
-
-
-
-
- 未支付
- 已支付
- 已退款
- 支付失败
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 详情
-
+
+
+
+
+
+
+
+
+
+
+
+
+
{
+ getFenXiIntegralDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data
console.log("res.data1111",res.data)
})
@@ -251,7 +237,7 @@ import {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
- getTradingPageApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
+ getFenXiIntegralListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
@@ -295,6 +281,65 @@ import {
.table-box{
width: 100%;
}
-
+.wrap-box{
+ width: 100%;
+ display: flex;
+ align-items: center;
+ margin-bottom: 15px;
+}
+.k_{
+ width: 200px;
+ height: 80px;
+ margin-right: 20px;
+ box-sizing: border-box;
+ padding: 15px 10px;
+ color: #333333;
+}
+.size_{
+ font-weight: 400;
+ font-size: 14px;
+ color: #333333;
+ margin-bottom: 10px;
+}
+.title_{
+ font-weight: 600;
+ font-size: 24px;
+ color: #333333;
+}
+#k_1{
+ background: url("../imgs/k1.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_2{
+ background: url("../imgs/k2.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_3{
+ background: url("../imgs/k3.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_4{
+ background: url("../imgs/k4.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_5{
+ background: url("../imgs/k5.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_6{
+ background: url("../imgs/k6.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_7{
+ background: url("../imgs/k7.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
index d75f92b3c..15eb71ec3 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
@@ -70,52 +70,70 @@
重置
-
-
+
+
+
累计交易金额（万元）
+
{{orderStatistics.amount}}
+
+
+
累计交易升数
+
{{orderStatistics.num}}
+
+
+
92#汽油交易金额（万元）
+
{{orderStatistics.amount92}}
+
+
+
95#汽油交易金额（万元）
+
{{orderStatistics.amount95}}
+
+
+
98#汽油交易金额（万元）
+
{{orderStatistics.amount98}}
+
+
+
0#柴油交易金额（万元）
+
{{orderStatistics.amount0}}
+
+
-
-
-
-
-
- 收银台
- POS机
- 平台
- 小程序
- 其他
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 现金
- 微信
- 支付宝
- 余额
-
-
-
-
- 未支付
- 已支付
- 已退款
- 支付失败
-
-
-
-
-
-
-
-
-
-
-
-
{
+ getFenXiOilOrderDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data
console.log("res.data1111",res.data)
})
@@ -241,7 +256,7 @@ import {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
- getTradingPageApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
+ getFenXiOilOrderListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
@@ -285,5 +300,65 @@ import {
.table-box{
width: 100%;
}
+.wrap-box{
+ width: 100%;
+ display: flex;
+ align-items: center;
+ margin-bottom: 15px;
+}
+.k_{
+ width: 200px;
+ height: 80px;
+ margin-right: 20px;
+ box-sizing: border-box;
+ padding: 15px 10px;
+ color: #333333;
+}
+.size_{
+ font-weight: 400;
+ font-size: 14px;
+ color: #333333;
+ margin-bottom: 10px;
+}
+.title_{
+ font-weight: 600;
+ font-size: 24px;
+ color: #333333;
+}
+#k_1{
+ background: url("../imgs/k1.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_2{
+ background: url("../imgs/k2.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_3{
+ background: url("../imgs/k3.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_4{
+ background: url("../imgs/k4.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_5{
+ background: url("../imgs/k5.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_6{
+ background: url("../imgs/k6.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_7{
+ background: url("../imgs/k7.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
index 6b4c426c9..fae02116d 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
@@ -74,58 +74,56 @@
重置
-
-
+
+
+
累计交易金额（万元）
+
{{orderStatistics.payAmount}}
+
+
+
累计交易笔数
+
{{orderStatistics.count}}
+
+
+
累计销售商品数量
+
{{orderStatistics.goodsNum}}
+
+
+
热销品类数量
+
{{orderStatistics.cvg}}
+
+
-
-
-
-
-
-
- 收银台
- POS机
- 平台
- 小程序
- 其他
-
+
+
+
+
+
+
+
+
+
+
-
-
- 现金
- 微信
- 支付宝
- 余额
-
+
+
+
+
+
+
-
-
- 未支付
- 已支付
- 已退款
- 支付失败
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 详情
-
+
+
+
+
+
+
+
{
+ getFenXiStoreDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data
console.log("res.data1111",res.data)
})
@@ -251,7 +244,7 @@ import {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
- getTradingPageApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
+ getFenXiStoreListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
@@ -295,5 +288,65 @@ import {
.table-box{
width: 100%;
}
+.wrap-box{
+ width: 100%;
+ display: flex;
+ align-items: center;
+ margin-bottom: 15px;
+}
+.k_{
+ width: 200px;
+ height: 80px;
+ margin-right: 20px;
+ box-sizing: border-box;
+ padding: 15px 10px;
+ color: #333333;
+}
+.size_{
+ font-weight: 400;
+ font-size: 14px;
+ color: #333333;
+ margin-bottom: 10px;
+}
+.title_{
+ font-weight: 600;
+ font-size: 24px;
+ color: #333333;
+}
+#k_1{
+ background: url("../imgs/k1.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_2{
+ background: url("../imgs/k2.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_3{
+ background: url("../imgs/k3.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_4{
+ background: url("../imgs/k4.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_5{
+ background: url("../imgs/k5.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_6{
+ background: url("../imgs/k6.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
+#k_7{
+ background: url("../imgs/k7.png");
+ background-size: cover; /* 背景图片铺满盒子 */
+ background-repeat: no-repeat; /* 禁止背景图片重复 */
+}
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
index d81142033..a505dc240 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
@@ -13,142 +13,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 至
-
-
-
-
-
-
-
- 搜索
- 重置
-
+
+
+
+
+
会员总数
-
335
+
{{orderStatistics.sumnum}}
-
会员总数
-
335
+
累计充值金额（万元）
+
{{orderStatistics.tongjMoney}}
-
会员总数
-
335
+
会员总消费（万元）
+
{{orderStatistics.tongjXfMoney}}
-
会员总数
-
335
+
会员总余额（万元）
+
--
-
会员总数
-
335
+
累计囤油卡余额（万元）
+
--
-
会员总数
-
335
+
累计礼品卡余额（元）
+
--
-
会员总数
-
335
+
累计储值卡余额（元 ）
+
{{orderStatistics.balanceSum}}
+
+
-
-
-
-
-
- 收银台
- POS机
- 平台
- 小程序
- 其他
-
-
-
-
- 现金
- 微信
- 支付宝
- 余额
-
-
-
-
- 未支付
- 已支付
- 已退款
- 支付失败
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -172,6 +97,7 @@ import {
getTissueByDataApi,
getTradingPageApi
} from "@/api/allOrder";
+import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/financialStatement/yunyingfenxi";
export default {
name: "yunyingfenxi-vip",
@@ -208,16 +134,10 @@ import {
deptId:"",
},
orderStatistics:{
- CASH:"0",
- WECHAT:"0",
- ALIPAY:"0",
- balance:"0",
- CASHCount:"0",
- WECHATCount:"0",
- ALIPAYCount:"0",
- balanceCount:"0",
- refBalance:"0",
- refBalanceCount:"0",
+ sumnum:'', // 会员总数
+ balanceSum:'', // 会员余额
+ tongjMoney:'', // 累计冲纸
+ tongjXfMoney:'', // 总消费
},
total:0,
}
@@ -261,7 +181,7 @@ import {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
- getTissueByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
+ getFenXiUserbalanceDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data
console.log("res.data1111",res.data)
})
@@ -274,7 +194,7 @@ import {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
- getTradingPageApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
+ getFenXiUserbalanceListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
index 6b60ba9e2..f278b8a26 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
@@ -47,11 +47,25 @@ public class IntegralOrdersController extends BaseController {
IPage integralOrdersIPage = this.integralOrdersService.queryByPage(pages, integralOrders);
return getSuccessResult(integralOrdersIPage);
}
- @GetMapping("queryByPageByZtDz")
- public ResponseObject queryByPageByZtDz(@RequestParam(value = "page",defaultValue = "1") Integer page,
+ @GetMapping("queryByPageFenxiByZtDz")
+ public ResponseObject queryByPageFenxiByZtDz(@RequestParam(value = "page",defaultValue = "1") Integer page,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
@Param("integralOrders") IntegralOrdersDTO integralOrders) {
Page pages = new Page(page, pageSize);
+ IPage integralOrdersIPage = this.integralOrdersService.queryByPageFenxiByZtDz(pages, integralOrders);
+ return getSuccessResult(integralOrdersIPage);
+ }
+ @GetMapping("/getIntFenxiDataByZtDz")
+ public ResponseObject getIntFenxiDataByZtDz( @Param("integralOrders") IntegralOrdersDTO integralOrders) {
+ return getSuccessResult(this.integralOrdersService.getIntFenxiDataByZtDz(integralOrders));
+ }
+
+
+ @GetMapping("queryByPageByZtDz")
+ public ResponseObject queryByPageByZtDz(@RequestParam(value = "page",defaultValue = "1") Integer page,
+ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+ @Param("integralOrders") IntegralOrdersDTO integralOrders) {
+ Page pages = new Page(page, pageSize);
IPage integralOrdersIPage = this.integralOrdersService.queryByPageByZtDz(pages, integralOrders);
return getSuccessResult(integralOrdersIPage);
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java
index ccfb80a2d..f871227e4 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java
@@ -44,6 +44,9 @@ public interface IntegralOrdersMapper {
IPage queryByPageUni(@Param("page") Page page, @Param("integralOrders") IntegralOrdersDTO integralOrders);
+ IPage queryByPageFenxiByZtDz(@Param("page") Page page, @Param("integralOrders") IntegralOrdersDTO integralOrders);
+IntegralOrdersVO getInfoByStoreId(@Param("integralOrders") IntegralOrdersDTO integralOrders);
+ Map getIntFenxiDataByZtDz(IntegralOrdersDTO integralOrders);
/**
* 统计总行数
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
index 8ed55208e..7121bb6d7 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
@@ -628,6 +628,41 @@
and io.create_time >= #{time}
+
+
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java
index 662b9c667..0f70e02a3 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java
@@ -39,6 +39,8 @@ public interface IntegralOrdersService {
*/
IPage queryByPage(@Param("page") Page page, @Param("integralGift") IntegralOrdersDTO integralOrders);
IPage queryByPageByZtDz(@Param("page") Page page, @Param("integralGift") IntegralOrdersDTO integralOrders);
+ IPage queryByPageFenxiByZtDz(@Param("page") Page page, @Param("integralGift") IntegralOrdersDTO integralOrders);
+ Map getIntFenxiDataByZtDz(IntegralOrdersDTO integralOrders);
IPage queryByPageUni(@Param("page") Page page, @Param("integralGift") IntegralOrdersDTO integralOrders);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
index 9b5b1a479..643affd1e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
@@ -133,6 +133,31 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
return integralOrdersVOIPage;
}
+ @Override
+ public IPage queryByPageFenxiByZtDz(Page page, IntegralOrdersDTO integralOrders) {
+ IPage integralOrdersVOIPage = integralOrdersDao.queryByPageFenxiByZtDz(page, integralOrders);
+ for (IntegralOrdersVO record : integralOrdersVOIPage.getRecords()) {
+ MtStore mtStore = mtStoreMapper.selectById(record.getStoreId());
+
+ IntegralOrdersVO infoByStoreId = integralOrdersDao.getInfoByStoreId(integralOrders);
+ if (ObjectUtil.isNotEmpty(
+ infoByStoreId
+ )) {
+ record.setGiftName(infoByStoreId.getGiftName());
+ record.setExchangeQuantityBy(infoByStoreId.getExchangeQuantityBy());
+ record.setPaidInfoBy(infoByStoreId.getPaidInfoBy());
+ record.setIntegralBy(infoByStoreId.getIntegralBy());
+ }
+
+ }
+ return integralOrdersVOIPage;
+ }
+
+ @Override
+ public Map getIntFenxiDataByZtDz(IntegralOrdersDTO integralOrders) {
+ return integralOrdersDao.getIntFenxiDataByZtDz(integralOrders);
+ }
+
@Override
public IPage queryByPageUni(@Param("page") Page page, @Param("integralOrders") IntegralOrdersDTO integralOrders) {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralOrdersVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralOrdersVO.java
index 770383deb..8d140d175 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralOrdersVO.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralOrdersVO.java
@@ -19,4 +19,13 @@ public class IntegralOrdersVO extends IntegralOrders {
private String addrMobile;
private String address;
private String storeName;
+
+
+// private String paidInfo;
+ private String count;
+// private String exchangeQuantity;
+ private String exchangeQuantityBy;
+ private String paidInfoBy;
+ private String integralBy;
+
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/largeSscreen/vo/OrderGoodsVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/largeSscreen/vo/OrderGoodsVO.java
index e7b4a3793..2ad6dec57 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/largeSscreen/vo/OrderGoodsVO.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/largeSscreen/vo/OrderGoodsVO.java
@@ -9,11 +9,18 @@ import java.io.Serializable;
public class OrderGoodsVO extends OrderGoods implements Serializable {
//商品名称
private String goodsName;
+ private String cvgName;
+
//商品售出数量
private Integer goodsNumber;
+ private Integer cvgNumber;
//今天的销量
private Integer todayCount;
//昨天的销量
private Integer yesTodayCount;
private double expent;
+ private String cvsNum;
+ private String goodsNum;
+ private Double goodsAmount;
+ private Double cvsAmount;
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java
index e7655fec5..4631fafa0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java
@@ -7,6 +7,7 @@ import com.fuint.business.integral.entity.IntegralDetail;
import com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO;
import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
import com.fuint.business.marketingActivity.cardValue.vo.Excel.CardValueRecordExcel;
+import com.fuint.business.userManager.vo.UserBalanceVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -41,5 +42,7 @@ public interface CardValueRecordMapper extends BaseMapper {
* @return
*/
IPage selectCardValueRecordList(Page page, @Param("cardValueRecord") CardValueRecord cardValueRecord);
+
+ Map getAmountAndConsume(UserBalanceVo record);
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
index b2440eebb..f8070379f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
@@ -306,6 +306,16 @@
order by create_time desc
+
+
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/LJOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/LJOrderController.java
index 62851a83d..0c67832fe 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/LJOrderController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/LJOrderController.java
@@ -48,6 +48,19 @@ public class LJOrderController extends BaseController {
IPage list = orderService.selectOrderListByZtDz(page,order);
return getSuccessResult(list);
}
+ @GetMapping("/selectOrderFenxiListByZtDz")
+ public ResponseObject selectOrderFenxiListByZtDz(LJOrderVo order,
+ @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+ Page page =new Page(pageNo,pageSize);
+ IPage list = orderService.selectOrderFenxiListByZtDz(page,order);
+ return getSuccessResult(list);
+ }
+
+ @GetMapping("/selectOrderFenxiDataByZtDz")
+ public ResponseObject selectOrderFenxiDataByZtDz(LJOrderVo order){
+ return getSuccessResult(orderService.selectOrderFenxiDataByZtDz(order));
+ }
/**
*导出订单
@@ -107,5 +120,6 @@ public class LJOrderController extends BaseController {
@GetMapping("/orderStatistics")
public ResponseObject orderStatistics(LJOrder order){
return getSuccessResult(orderService.orderStatistics(order));
- }
+ } // 订单统计
+
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
index e5ef7510f..fb5113a2b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
@@ -50,8 +50,19 @@ public class OilOrderController extends BaseController {
IPage list = orderService.selectOilOrderListByZtDz(page,order);
return getSuccessResult(list);
}
+ @GetMapping("/selectOilOrderFenXiListByZtDz")
+ public ResponseObject selectOilOrderFenXiListByZtDz(OilOrderVo order,
+ @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+ Page page =new Page(pageNo,pageSize);
+ IPage list = orderService.selectOilOrderFenXiListByZtDz(page,order);
+ return getSuccessResult(list);
+ }
-
+ @GetMapping("/selectOilOrderFenXiDataByZtDz")
+ public ResponseObject selectOilOrderFenXiDataByZtDz(OilOrderVo order){
+ return getSuccessResult(orderService.selectOilOrderFenXiDataByZtDz(order));
+ }
/**
*导出订单
*@paramresponse
@@ -104,6 +115,8 @@ public class OilOrderController extends BaseController {
return getSuccessResult(orderService.selectOilOrderById(id));
}
+
+
/**
* 批量添加订单信息 并支付
* @param map
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java
index ad0452291..0a4e7c4da 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java
@@ -110,5 +110,10 @@ public class LJOrder extends BaseEntity implements Serializable {
private Long deptId;
@TableField(exist = false)
private List storeIds;
+
+
+
+ private String count;
+
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
index 877d4423a..601e49032 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
@@ -11,10 +11,12 @@ import com.fuint.business.order.entity.HandoverRecord;
import com.fuint.business.order.vo.AllOrderInfoVo;
import com.fuint.business.order.vo.CardBalanceChangeVo;
import com.fuint.business.store.entity.MtStore;
+import com.fuint.business.userManager.vo.UserBalanceVo;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.List;
+import java.util.Map;
public interface AllOrderInfoMapper extends BaseMapper {
@@ -71,4 +73,7 @@ public interface AllOrderInfoMapper extends BaseMapper {
Integer selectTotal(@Param("allOrderInfo") AllOrderInfo allOrderInfo);
Double selectAllAmount(@Param("allOrderInfo") AllOrderInfo allOrderInfo);
+
+ Map getLeiJiInfo(UserBalanceVo record);
+ Map getShuJuVipInfo(UserBalanceVo record);
}
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java
index d9579e7db..bea579808 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java
@@ -38,4 +38,9 @@ public interface LJOrderMapper extends BaseMapper {
LJOrder getStatisticsByTime(@Param("time") Date time,@Param("goodsId") Integer goodsId,@Param("payType") String payType);
+
+ IPage selectOrderFenxiListByZtDz(Page page, LJOrderVo order);
+
+ Map selectOrderFenxiDataByZtDz(LJOrderVo order);
+ Map selectOrderFenxiDataByZtDz2(LJOrderVo order);
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java
index f3c67acdd..7abe5c977 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java
@@ -30,7 +30,10 @@ public interface OilOrderMapper extends BaseMapper {
*/
public IPage selectOilOrderList(Page page, @Param("order") OilOrder order);
- public IPage selectOilOrderListByZtDz(Page page, @Param("order") OilOrder order);
+ public IPage selectOilOrderListByZtDz(Page page, @Param("order") OilOrder order);
+ public IPage selectOilOrderFenXiListByZtDz(Page page, @Param("order") OilOrderVo order);
+
+ Map selectOilOrderFenXiDataByZtDz(@Param("order") OilOrderVo order);
List selectOilOrderListExcel(@Param("order") OilOrder order);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OrderGoodsMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OrderGoodsMapper.java
index ece7c09e6..76f4f0be3 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OrderGoodsMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OrderGoodsMapper.java
@@ -3,6 +3,7 @@ package com.fuint.business.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fuint.business.largeSscreen.vo.OrderGoodsVO;
import com.fuint.business.order.entity.OrderGoods;
+import com.fuint.business.order.vo.LJOrderVo;
import com.fuint.business.order.vo.OrderGoodsVo;
import org.apache.ibatis.annotations.Param;
@@ -28,4 +29,12 @@ public interface OrderGoodsMapper extends BaseMapper {
* @return
*/
List selectGoodsSalesRankYestoday(int i);
+
+ OrderGoodsVO selectInfoByStoreId(LJOrderVo record);
+ OrderGoodsVO selectInfoByStoreId1(LJOrderVo record);
+ OrderGoodsVO selectInfoByStoreId2(LJOrderVo record);
+ // 热销品类
+ OrderGoodsVO selectInfoByStoreIdType(LJOrderVo record);
+ // 热销商品
+ OrderGoodsVO selectInfoByStoreIdGoods(LJOrderVo record);
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
index 943ff716d..3798ac62e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
@@ -465,6 +465,28 @@
order by create_time ASC limit 1
+
+
+
+
+
+
+
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
index b8775edb4..52cfcf9fc 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
@@ -217,7 +217,12 @@
+
+
+
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
index b08dd516c..6ffc7490f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
@@ -98,7 +98,7 @@
select
sum(order_amount),
sum(discount_amount),
- sum(pay_amount),
+ sum(pay_amount)
-- sum(if(order_status='0',money,0))
from oil_order
where store_id = #{storeId}
@@ -690,4 +690,42 @@
GROUP BY staff_id
+
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OrderGoodsMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OrderGoodsMapper.xml
index 2ca4a59ba..062c94ee1 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OrderGoodsMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OrderGoodsMapper.xml
@@ -37,4 +37,43 @@
GROUP BY cg.name
ORDER BY goodsNumber desc
+
+
+
+
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java
index 86b9f7442..2a5eae251 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java
@@ -26,6 +26,7 @@ public interface LJOrderService extends IService {
*/
public IPage selectOrderList(Page page, LJOrder order);
public IPage selectOrderListByZtDz(Page page, LJOrder order);
+ public IPage selectOrderFenxiListByZtDz(Page page, LJOrderVo order);
void export(HttpServletResponse response, LJOrder order);
@@ -65,6 +66,7 @@ public interface LJOrderService extends IService {
void insertFavorable(LJOrder order);
Map orderStatistics(LJOrder order);
+ Map selectOrderFenxiDataByZtDz(LJOrderVo order);
LJOrder getStatisticsByTime(Date time ,Integer goodsId, String payType);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
index 6db98b914..89543dd4d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
@@ -31,7 +31,8 @@ public interface OilOrderService extends IService {
*/
public IPage selectOilOrderList(Page page, OilOrder order);
public IPage selectOilOrderListByZtDz(Page page, OilOrder order);
-
+ public IPage selectOilOrderFenXiListByZtDz(Page page, OilOrderVo order);
+ public Map selectOilOrderFenXiDataByZtDz(OilOrderVo order);
void export(HttpServletResponse response, OilOrder order);
/**
@@ -50,6 +51,7 @@ public interface OilOrderService extends IService {
public IPage selectOilOrderByUserId(Page page, OilOrder order);
public IPage selectOilOrderByUserId2(Page page, OilOrder order);
+
/**
* 根据订单号查询油品订单信息
* @param orderNo
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
index c15cfd6aa..2642c2d26 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
@@ -10,17 +10,20 @@ import com.fuint.business.convenienceSore.entity.CvsGoods;
import com.fuint.business.convenienceSore.entity.LJGoods;
import com.fuint.business.convenienceSore.mapper.CvsGoodsMapper;
import com.fuint.business.convenienceSore.service.LJGoodsService;
+import com.fuint.business.largeSscreen.vo.OrderGoodsVO;
import com.fuint.business.marketingActivity.favorableRecords.entity.FavorableRecords;
import com.fuint.business.marketingActivity.favorableRecords.service.FavorableRecordsService;
import com.fuint.business.order.entity.LJOrder;
import com.fuint.business.order.entity.OilOrder;
import com.fuint.business.order.entity.OrderGoods;
import com.fuint.business.order.mapper.LJOrderMapper;
+import com.fuint.business.order.mapper.OrderGoodsMapper;
import com.fuint.business.order.service.LJOrderService;
import com.fuint.business.order.service.OrderGoodsService;
import com.fuint.business.order.vo.Excel.LJOrderExcel;
import com.fuint.business.order.vo.LJOrderVo;
import com.fuint.business.order.vo.OrderGoodsVo;
+import com.fuint.business.store.entity.MtStore;
import com.fuint.business.store.mapper.MtStoreMapper;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
@@ -69,7 +72,7 @@ public class LJOrderServiceImpl extends ServiceImpl impl
List strings = sysDeptMapper.selectChildByDeptIdR(order.getDeptId());
List longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
order.setStoreIds(longs);
- IPage ljOrderIPage = baseMapper.selectOrderList(page, order);
+ IPage ljOrderIPage = baseMapper.selectOrderListByZtDz(page, order);
for (LJOrder item : ljOrderIPage.getRecords()) {
List orderGoodsVos = orderGoodsService.selectOrderGoods(item.getId());
if (ObjectUtil.isNotEmpty(orderGoodsVos)) {
@@ -93,6 +96,60 @@ public class LJOrderServiceImpl extends ServiceImpl impl
return ljOrderIPage;
+
+
+ }
+
+ @Resource
+ OrderGoodsMapper orderGoodsMapper;
+ @Override
+ public IPage selectOrderFenxiListByZtDz(Page page, LJOrderVo order) {
+ if (ObjectUtil.isEmpty(order.getDeptId())) {
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ order.setDeptId(nowAccountInfo.getDeptId());
+ }
+
+ List strings = sysDeptMapper.selectChildByDeptIdR(order.getDeptId());
+ List longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
+ order.setStoreIds(longs);
+ IPage ljOrderIPage = baseMapper.selectOrderFenxiListByZtDz(page, order);
+ for (LJOrderVo record : ljOrderIPage.getRecords()) {
+ MtStore mtStore = mtStoreMapper.selectById(record.getStoreId());
+ if (ObjectUtil.isNotEmpty(mtStore)) {
+ record.setStoreName(mtStore.getName());
+ }
+ // 商品信息
+ OrderGoodsVO orderGoodsVO = orderGoodsMapper.selectInfoByStoreId1(record);
+ OrderGoodsVO orderGoodsVO1 = orderGoodsMapper.selectInfoByStoreId2(record);
+ OrderGoodsVO orderGoodsVO2 = orderGoodsMapper.selectInfoByStoreIdType(record);// 热销品类信息
+ OrderGoodsVO orderGoodsVO3 = orderGoodsMapper.selectInfoByStoreIdGoods(record);// 热销商品信息
+
+ if (ObjectUtil.isNotEmpty(orderGoodsVO)) {
+ record.setCvsNum(orderGoodsVO.getCvsNum());
+ }
+ if (ObjectUtil.isNotEmpty(orderGoodsVO1) && ObjectUtil.isNotEmpty(orderGoodsVO1.getGoodsNum())) {
+ record.setGoodsNum(Integer.valueOf(orderGoodsVO1.getGoodsNum()));
+ }
+ if (ObjectUtil.isNotEmpty(orderGoodsVO2)) {
+ record.setCvgName(orderGoodsVO2.getCvgName());
+ record.setCvgNumber(orderGoodsVO2.getCvgNumber());
+ record.setCvsAmount(orderGoodsVO2.getCvsAmount().toString());
+ }
+ if (ObjectUtil.isNotEmpty(orderGoodsVO3)) {
+ record.setGoodsName(orderGoodsVO3.getGoodsName());
+ record.setGoodsNumber(orderGoodsVO3.getGoodsNumber());
+ record.setGoodsAmount(orderGoodsVO3.getGoodsAmount().toString());
+ }
+ }
+ return ljOrderIPage;
+ }
+
+ @Override
+ public Map selectOrderFenxiDataByZtDz(LJOrderVo order){
+ Map stringObjectMap = baseMapper.selectOrderFenxiDataByZtDz(order);
+ Map stringObjectMap2 = baseMapper.selectOrderFenxiDataByZtDz2(order);
+ stringObjectMap.put("cvg",stringObjectMap2.get("cvg"));
+ return stringObjectMap;
}
public void export(HttpServletResponse response, LJOrder order) {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
index c0c8a5de1..4218dec04 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -200,6 +200,45 @@ public class OilOrderServiceImpl extends ServiceImpl i
}
return oilOrderIPage;
}
+ @Override
+ public IPage selectOilOrderFenXiListByZtDz(Page page, OilOrderVo order) {
+ if (ObjectUtil.isEmpty(order.getDeptId())) {
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ order.setDeptId(nowAccountInfo.getDeptId());
+ }
+
+ List strings = sysDeptMapper.selectChildByDeptIdR(order.getDeptId());
+ List longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
+ order.setStoreIds(longs);
+
+ IPage oilOrderIPage = baseMapper.selectOilOrderFenXiListByZtDz(page, order);
+ for (OilOrder record : oilOrderIPage.getRecords()) {
+ MtStore mtStore = mtStoreMapper.selectById(record.getStoreId());
+ if (ObjectUtil.isNotEmpty(mtStore)) {
+ record.setStoreName(mtStore.getName());
+ }
+// if (ObjectUtil.isNotEmpty(record.getOilGunNum())) {
+// OilGun oilGun = oilGunMapper.queryById(Integer.valueOf(record.getOilGunNum()));
+// if (ObjectUtil.isNotEmpty(oilGun)){
+// record.setGunName(oilGun.getGunName());
+// }
+// }
+//
+// OilName oilName = oilNameMapper.selectOilNameById(Integer.valueOf(record.getOils()));
+// if (ObjectUtil.isNotEmpty(oilName)) {
+// record.setOilName(oilName.getOilName());
+// }
+// OilTank oilTank = oilTankMapper.queryById(record.getTankId());
+// if (ObjectUtil.isNotEmpty(oilTank)) {
+// record.setTankName(oilTank.getTankName());
+// }
+ }
+ return oilOrderIPage;
+ }
+
+ public Map selectOilOrderFenXiDataByZtDz(OilOrderVo order){
+ return baseMapper.selectOilOrderFenXiDataByZtDz(order);
+ }
public void export(HttpServletResponse response, OilOrder order) {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/LJOrderVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/LJOrderVo.java
index 244d0d1e0..15576d182 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/LJOrderVo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/LJOrderVo.java
@@ -6,4 +6,24 @@ import lombok.Data;
@Data
public class LJOrderVo extends LJOrder {
private String storeName;
+ //商品名称
+ private String goodsName;
+ private String cvgName;
+
+ //商品售出数量
+ private Integer goodsNumber;
+ private Integer cvgNumber;
+
+ private String cvsNum;
+// private String goodsNum;
+
+ private String goodsAmount;
+ private String cvsAmount;
+ private String payAmounts;
+ private String counts;
+ private String goodsNums;
+ /**
+ * 所属店铺ID
+ */
+ private Integer storeId;
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/OilOrderVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/OilOrderVo.java
index ec1b90b03..1c22c6396 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/OilOrderVo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/OilOrderVo.java
@@ -34,4 +34,17 @@ public class OilOrderVo extends OilOrder {
@TableField(exist = false)
private Double oilCardAmount1;
+ private String sum;
+ private String amount92;
+ private String num92;
+ private String count92;
+ private String amount95;
+ private String num95;
+ private String count95;
+ private String amount98;
+ private String num98;
+ private String count98;
+ private String amount0;
+ private String num0;
+ private String count0;
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/UserBalanceController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/UserBalanceController.java
new file mode 100644
index 000000000..2fe235251
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/UserBalanceController.java
@@ -0,0 +1,35 @@
+package com.fuint.business.userManager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.userManager.service.UserBalanceService;
+import com.fuint.business.userManager.vo.LJUserVo;
+import com.fuint.business.userManager.vo.UserBalanceVo;
+import com.fuint.framework.web.BaseController;
+import com.fuint.framework.web.ResponseObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/business/userManager/userbalance")
+public class UserBalanceController extends BaseController {
+ @Autowired
+ UserBalanceService userBalanceService;
+ @GetMapping("/listByZt")
+ public ResponseObject listByZt(UserBalanceVo user,
+ @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+ Page page =new Page(pageNo,pageSize);
+ IPage list = userBalanceService.listByZt(page,user);
+ return getSuccessResult(list);
+ }
+ @GetMapping("/getUser")
+ public ResponseObject getUser(UserBalanceVo user){
+ return getSuccessResult(userBalanceService.getDataByZt(user));
+ }
+
+
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/UserBalanceMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/UserBalanceMapper.java
index aa1135fa6..f5be2f9bd 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/UserBalanceMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/UserBalanceMapper.java
@@ -1,10 +1,14 @@
package com.fuint.business.userManager.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.userManager.entity.UserBalance;
import com.fuint.business.userManager.vo.UserBalanceVo;
import org.apache.ibatis.annotations.Param;
+import java.util.Map;
+
public interface UserBalanceMapper extends BaseMapper {
int subtractUserBalanceByLock(UserBalanceVo balance);
@@ -12,4 +16,8 @@ public interface UserBalanceMapper extends BaseMapper {
int updateRefuelMoney(UserBalance userBalance);
int addUserBalance(@Param("id") Integer id, @Param("changeCardBalance") Double changeCardBalance);
+
+ IPage listByZt(Page page, UserBalanceVo user);
+
+ Map getDataByZt(UserBalanceVo user);
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/UserBalanceMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/UserBalanceMapper.xml
index b19abd212..8a7f0e78c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/UserBalanceMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/UserBalanceMapper.xml
@@ -31,5 +31,27 @@
card_balance = card_balance +#{changeCardBalance}
where id = #{id}
+
+
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/UserBalanceService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/UserBalanceService.java
index 8052041e8..25952521f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/UserBalanceService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/UserBalanceService.java
@@ -1,16 +1,23 @@
package com.fuint.business.userManager.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.fuint.business.userManager.entity.UserBalance;
+import com.fuint.business.userManager.vo.LJUserVo;
import com.fuint.business.userManager.vo.UserBalanceVo;
import java.util.List;
+import java.util.Map;
/**
* 会员储值卡信息 业务层
*/
public interface UserBalanceService extends IService {
+
+ IPage listByZt(Page page, UserBalanceVo user);
+ Map getDataByZt(UserBalanceVo user);
/**
* 增加会员储值信息信息
* @param balance
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
index 76b2b10e4..df7572c80 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
@@ -5,14 +5,21 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
+import com.fuint.business.marketingActivity.cardValue.mapper.CardValueRecordMapper;
+import com.fuint.business.order.mapper.AllOrderInfoMapper;
import com.fuint.business.storeInformation.entity.LJStore;
import com.fuint.business.storeInformation.service.ILJStoreService;
import com.fuint.business.userManager.entity.LJUserGrade;
import com.fuint.business.userManager.entity.UserBalance;
+import com.fuint.business.userManager.mapper.LJUserGradeMapper;
import com.fuint.business.userManager.mapper.UserBalanceMapper;
import com.fuint.business.userManager.service.LJUserGradeService;
import com.fuint.business.userManager.service.UserBalanceService;
+import com.fuint.business.userManager.vo.LJUserVo;
import com.fuint.business.userManager.vo.UserBalanceVo;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.RedisLock;
@@ -39,6 +46,61 @@ public class UserBalanceServiceImpl extends ServiceImpl listByZt(Page page, UserBalanceVo user) {
+ IPage userBalanceVoIPage = userBalanceMapper.listByZt(page, user);
+ for (UserBalanceVo record : userBalanceVoIPage.getRecords()) {
+ LJStore ljStore = storeService.selectStoreByIdUni(record.getStoreId());
+ if (ObjectUtil.isNotEmpty(ljStore)) {
+ record.setStoreName(ljStore.getName());
+
+ }
+ // 会员等级
+ LJUserGrade ljUserGrade = ljUserGradeMapper.selectById(record.getGradeId());
+ if (ObjectUtil.isNotEmpty(ljUserGrade)) {
+ record.setGradeName(ljUserGrade.getName());
+ }else {record.setGradeName("--");}
+ // 累计充值金额
+ Map amountAndConsume = cardValueRecordMapper.getAmountAndConsume(record);
+ if (ObjectUtil.isNotEmpty(amountAndConsume)) {
+ record.setCountNum(amountAndConsume.get("consumeNum").toString()); // 累计重置次数
+ record.setAmount(amountAndConsume.get("amount").toString());
+ }
+
+
+ Map leiJiInfo = allOrderInfoMapper.getLeiJiInfo(record);
+ if (ObjectUtil.isNotEmpty(leiJiInfo)) {
+ record.setLeijiMoney(leiJiInfo.get("leijiMoney").toString());// 累计消费金额
+ record.setLeijiNum(leiJiInfo.get("leijiNum").toString()); // 累计消费次数
+ record.setLeijiMoneyRef(leiJiInfo.get("leijiMoneyRef").toString()); // 累计退款余额
+ record.setLeijiNumRef(leiJiInfo.get("leijiNum").toString()); // 累计退款笔数
+ }
+
+ // 电子礼品卡余额
+
+
+ }
+ return userBalanceVoIPage;
+ }
+
+ public Map getDataByZt(UserBalanceVo user) {
+ Map dataByZt = userBalanceMapper.getDataByZt(user);
+ Map leiJiInfo = allOrderInfoMapper.getShuJuVipInfo(user);
+ dataByZt.put("tongjMoney",leiJiInfo.get("tongjMoney"));
+ dataByZt.put("tongjXfMoney",leiJiInfo.get("tongjXfMoney"));
+ return dataByZt;
+ }
+
@Override
public int insertUserBalance(UserBalance balance) {
int row = baseMapper.insert(balance);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/UserBalanceVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/UserBalanceVo.java
index 4034e2546..85d410c0e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/UserBalanceVo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/UserBalanceVo.java
@@ -17,5 +17,28 @@ public class UserBalanceVo extends UserBalance {
* 成长值变化
*/
private Integer changeGrowthValue;
+ /**
+ * 会员姓名
+ */
+ private String userName;
+ /**
+ * 会员手机号
+ */
+ private String mobile;
+ /**
+ * 会员卡号
+ */
+ private String physicalCard;
+ private String storeName;
+ private String gradeName;
+
+ public String amount;
+ public String countNum;
+
+ public String leijiMoney;
+ public String leijiNum;
+ public String leijiMoneyRef;
+ public String leijiNumRef;
+
}