diff --git a/fuintAdmin_zt/src/api/allOrder.js b/fuintAdmin_zt/src/api/allOrder.js
index d83760bde..98abf5ba4 100644
--- a/fuintAdmin_zt/src/api/allOrder.js
+++ b/fuintAdmin_zt/src/api/allOrder.js
@@ -9,6 +9,15 @@ export function getOrderListApi(query) {
})
}
+
+export function getOrderListApis(query) {
+ return request({
+ url: 'business/allOrderInfo/getPageLists',
+ method: 'get',
+ params: query
+
+ })
+}
// 分页查询所有的订单信息
export function getSumPayMoneyApi(query) {
return request({
diff --git a/fuintAdmin_zt/src/views/components/Service/allOrder.vue b/fuintAdmin_zt/src/views/components/Service/allOrder.vue
index 793eeb64f..ed0362826 100644
--- a/fuintAdmin_zt/src/views/components/Service/allOrder.vue
+++ b/fuintAdmin_zt/src/views/components/Service/allOrder.vue
@@ -13,51 +13,42 @@
/>
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
@@ -86,44 +77,23 @@
-
-
- {{ getType(scope.row.type) }}
-
+
-
-
- 小程序
- 收银台
- 收银台
-
+
-
-
-
-
-
-
-
-
- {{ scope.row.userMobile?scope.row.userMobile: '散户'}}
-
-
-
- {{ scope.row.paymentChannel?scope.row.paymentChannel: '--'}}
-
+
@@ -140,9 +110,9 @@
-
+
- {{ parseTime(scope.row.payTime) || '--'}}
+ {{ parseTime(scope.row.updateTime) || '--'}}
@@ -165,7 +135,7 @@
import {getName} from "../../../utils/fuint";
import {addStaff, delStaff, getStaff, listStaff, updateStaff} from "../../../api/staff/staff";
// import {getDuty, listDuty} from "@/api/staff/duty";
- import { getOrderListApi,getSumPayMoneyApi } from "../../../api/allOrder";
+ import { getOrderListApis,getSumPayMoneyApi } from "../../../api/allOrder";
export default {
name: "asdf",
dicts: ['transaction','handover','handover_quit','payment_type','pay_status',
@@ -251,7 +221,7 @@
getList() {
this.loading = true;
this.queryParams.storeId = this.id
- getOrderListApi(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+ getOrderListApis(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.list = response.data.records;
this.total = response.data.total;
this.getSumPayMoney()
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
index 27382e8cb..cc1892bce 100644
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
@@ -198,7 +198,7 @@ export default {
start.setMinutes(0)
start.setSeconds(0)
start.setMilliseconds(0)
- this.value2 = [start, new Date()];
+ this.value2 = [parseTime(start),parseTime(new Date())];
} else if (this.timeList[index] == '近一周') {
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
index 593f50bca..68377980a 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
@@ -7,20 +7,20 @@
-
-
-
+
+
+
@@ -30,7 +30,7 @@
@@ -42,11 +42,11 @@
-
-
-
+
+
+
@@ -82,12 +82,12 @@
-
+
收银台兑换
@@ -112,20 +112,20 @@
-
+
+
+
+ {{scope.row.amount}}
+ 0
+
+
-
+
-
-
-
-
-
-
-
+
-
+
@@ -86,18 +86,20 @@
-
-
+
+
-
+
-
+
+ {{this.value2[0]}} 至 {{this.value2[1]}}
+
@@ -210,7 +212,7 @@ import {parseTime} from "@/utils/fuint";
start.setMinutes(0)
start.setSeconds(0)
start.setMilliseconds(0)
- this.value2 = [start,new Date()];
+ this.value2 = [parseTime(start),parseTime(new Date())];
} else if (this.timeList[index]=='近一周'){
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
index 8f34f9c3b..66f08a88b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
@@ -47,6 +47,22 @@ public class AllOrderInfoController extends BaseController {
IPage list = allOrderInfoService.getPageList(page, allOrderInfo);
return getSuccessResult(list);
}
+ /**
+ * 分页查询全部订单信息
+ * @param allOrderInfo
+ * @param pageNo
+ * @param pageSize
+ * @return
+ */
+ @GetMapping("getPageLists")
+ public ResponseObject getPageLists(AllOrderInfo allOrderInfo,
+ @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+ Page page =new Page(pageNo,pageSize);
+ IPage list = allOrderInfoService.getPageLists(page, allOrderInfo);
+ return getSuccessResult(list);
+ }
+
@GetMapping("/findOrderStatistics")
public ResponseObject findOrderStatistics(AllOrderInfoRes allOrderInfoRes){
Map map = allOrderInfoService.findOrderStatistics(allOrderInfoRes);
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 bb05f3b0b..656f0983e 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
@@ -29,6 +29,7 @@ import java.util.Map;
public interface AllOrderInfoMapper extends BaseMapper {
IPage getPageList(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo);
+ IPage getPageLists(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo);
Map findOrderStatistics(@Param("allOrderInfo") AllOrderInfoRes allOrderInfoRes,@Param("beginTime") String startTime, @Param("endTime") String endTime);
List getAllOrderInfo(@Param("obj") AllOrderInfoRes allOrderInfoRes,
@Param("beginTime") String beginTime, @Param("endTime") String endTime);
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 ad74fb830..35639b75c 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
@@ -38,12 +38,16 @@ public interface OrderGoodsMapper extends BaseMapper {
List selectGoodsSalesRankYestoday(int i);
OrderGoodsVO selectInfoByStoreId(LJOrderVo record);
- OrderGoodsVO selectInfoByStoreId1(LJOrderVo record);
- OrderGoodsVO selectInfoByStoreId2(LJOrderVo record);
+ // OrderGoodsVO selectInfoByStoreId1(LJOrderVo record);
+ OrderGoodsVO selectInfoByStoreId1(@Param("record") LJOrderVo record, @Param("order")LJOrderVo order);
+ // OrderGoodsVO selectInfoByStoreId2(LJOrderVo record);
+ OrderGoodsVO selectInfoByStoreId2(@Param("record") LJOrderVo record, @Param("order")LJOrderVo order);
// 热销品类
- OrderGoodsVO selectInfoByStoreIdType(LJOrderVo record);
+ // OrderGoodsVO selectInfoByStoreIdType(LJOrderVo record);
+ OrderGoodsVO selectInfoByStoreIdType(@Param("record") LJOrderVo record, @Param("order")LJOrderVo order);
// 热销商品
- OrderGoodsVO selectInfoByStoreIdGoods(LJOrderVo record);
+ // OrderGoodsVO selectInfoByStoreIdGoods(LJOrderVo record);
+ OrderGoodsVO selectInfoByStoreIdGoods(@Param("record") LJOrderVo record, @Param("order")LJOrderVo order);
Map selectOrderByBuySum( @Param("order") LJOrderVo order);
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 7994b5eac..2a8cfcf28 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
@@ -2019,4 +2019,87 @@
LEFT JOIN mt_goods mt on ig.goods_id=mt.id
where ig.store_id=#{obj.storeId}
+
+
+
+
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 0682b4b28..a43e728d3 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
@@ -302,8 +302,9 @@
sum(goods_num) goodsNums
from mt_order
+ status = 'paid'
- store_id in
+ and store_id in
#{item}
@@ -325,8 +326,9 @@
sum(goods_num) goodsNum
from mt_order
+ status = 'paid'
- store_id in
+ and store_id in
#{item}
@@ -344,11 +346,12 @@
select
count(distinct mg.cvs_good_id) cvg
from mt_order mo
- left join mt_order_goods mog on mog.goods_id = mo.id
- left join mt_goods mg on mog.goods_id = mg.id
+ left join mt_order_goods mog on mog.order_id = mo.id
+ left join mt_goods mg on mg.id = mog.goods_id
+ mo.status = 'paid'
- mo.store_id in
+ and mo.store_id in
#{item}
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 6e243bb01..6ddbd0169 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
@@ -44,15 +44,34 @@
+
+