dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-07-19 09:13:22 +08:00
parent ca96dc4594
commit 7619de2ccf
35 changed files with 640 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
fuintAdmin_zt/src/api/financialStatement/jiaoyiduizhang.js Normal file
View File

@ -0,0 +1,40 @@
import request from '@/utils/request'
// 会员充值订单
export function getDuiZhangVipListApi(query) {
return request({
url: 'business/marketingActivity/activeExchange/cardValueOrders/selectCardValueOrdersByZtDz',
method: 'get',
params: query
})
}
// 油品订单
export function getDuiZhangOilListApi(query) {
return request({
url: 'business/oilOrder/selectOilOrderListByZtDz',
method: 'get',
params: query
})
}
// 油品订单
export function getDuiZhangGoodsListApi(query) {
return request({
url: 'business/order/selectOrderListByZtDz',
method: 'get',
params: query
})
}
// 积分订单
export function getDuiZhangIntegralListApi(query) {
return request({
url: 'business/integral/integralOrders/queryByPageByZtDz',
method: 'get',
params: query
})
}

69
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
View File

@ -81,9 +81,14 @@
:data="orderList"
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="payTime" align="center" label="机构名称"> </el-table-column>
<el-table-column prop="orderNo" align="center" label="订单号" > </el-table-column>
<el-table-column prop="goodsMoney" align="center" label="订单金额（万元）"></el-table-column>
<el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
<el-table-column prop="orderNumber" align="center" label="订单号" > </el-table-column>
<el-table-column prop="amount" align="center" label="订单金额（万元）">
<template slot-scope="scope">
<span v-if="scope.row.amount">{{scope.row.amount}}</span>
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column prop="payChannel" align="center" label="订单类型">
<template slot-scope="scope">
<span v-if="scope.row.payChannel=='cashier'">收银台</span>
@ -110,22 +115,21 @@
</template>
</el-table-column>
<el-table-column align="center" label="消费信息">
<el-table-column prop="payTime" align="center" label="商品名称" > </el-table-column>
<el-table-column prop="payTime" align="center" label="消耗积分" > </el-table-column>
<el-table-column prop="payTime" align="center" label="数量" > </el-table-column>
<el-table-column prop="giftName" align="center" label="商品名称" > </el-table-column>
<el-table-column prop="integral" align="center" label="消耗积分" > </el-table-column>
<el-table-column prop="exchangeQuantity" align="center" label="数量" > </el-table-column>
</el-table-column>
<el-table-column prop="payTime" align="center" label="支付通道">
</el-table-column>
<el-table-column prop="mchntCd" align="center" label="商户号编码" width="150"> </el-table-column>
<el-table-column prop="payTime" align="center" label="订单创建时间" > </el-table-column>
<el-table-column prop="payTime" align="center" label="订单完成时间" > </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button style="width: 60px" size="mini"
@click="getOrdersInfo(scope.row)"
type="success" plain round>详情</el-button>
</template>
<el-table-column prop="mchntCd" align="center" label="支付通道">
</el-table-column>
<el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150"> </el-table-column>
<el-table-column prop="createTime" align="center" label="订单创建时间" > </el-table-column>
<!-- <el-table-column prop="payTime" align="center" label="订单完成时间" >-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.payTime">{{scope.row.payTime}}</span>-->
<!-- <span v-else>&#45;&#45;</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</div>
<pagination
@ -149,6 +153,7 @@ import {
getTissueByDataApi,
getTradingPageApi
} from "@/api/allOrder";
import {getDuiZhangIntegralListApi} from "@/api/financialStatement/jiaoyiduizhang";
export default {
name: "jiaoyiduizhang-int",
@ -219,30 +224,7 @@ import {
this.deptList = response.data.records;
})
},
exportExcelCashier() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
this.$download.saveAs(blob,'交易明细统计.xLsx')
})
},
// 获取订单统计信息
getOrderStatistics() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getTissueByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data
console.log("res.data1111",res.data)
})
},
// 获取列表信息
getList(val){
@ -251,17 +233,14 @@ import {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getTradingPageApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
getDuiZhangIntegralListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
})
this.getOrderStatistics()
},
getOrdersInfo(data) {
this.dialogVisible = true;
this.ordersInfo = data
},
// 搜索按钮操作
handleQuery() {
this.queryParams.page = 1;

77
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
View File

@ -80,16 +80,18 @@
<el-table
:data="orderList"
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="payTime" align="center" label="机构名称"> </el-table-column>
<el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
<el-table-column prop="orderNo" align="center" label="订单号" > </el-table-column>
<el-table-column prop="goodsMoney" align="center" label="订单金额（万元）"></el-table-column>
<el-table-column prop="payChannel" align="center" label="订单类型">
<el-table-column prop="payAmount" align="center" label="订单金额（万元）"></el-table-column>
<el-table-column prop="terminal" align="center" label="订单类型">
<template slot-scope="scope">
<span v-if="scope.row.payChannel=='cashier'">收银台</span>
<span v-else-if="scope.row.payChannel=='POS'">POS机</span>
<span v-else-if="scope.row.payChannel=='PC'">平台</span>
<span v-else-if="scope.row.payChannel=='applet'">小程序</span>
<span v-if="scope.row.terminal=='cashier'">收银台</span>
<span v-else-if="scope.row.terminal=='POS'">POS机</span>
<span v-else-if="scope.row.terminal=='PC'">平台</span>
<span v-else-if="scope.row.terminal=='applet'">小程序</span>
<span v-else>其他</span>
</template>
</el-table-column>
@ -101,24 +103,29 @@
<span v-else="">余额</span>
</template>
</el-table-column>
<el-table-column prop="status" align="center" label="支付状态">
<el-table-column prop="orderStatus" align="center" label="支付状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
<el-tag type="danger" v-else-if="scope.row.status == 'refund'">已退款</el-tag>
<el-tag v-if="scope.row.orderStatus == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.orderStatus == 'paid'">已支付</el-tag>
<el-tag type="danger" v-else-if="scope.row.orderStatus == 'refund'">已退款</el-tag>
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="消费信息">
<el-table-column prop="payTime" align="center" label="油号" > </el-table-column>
<el-table-column prop="payTime" align="center" label="油枪" > </el-table-column>
<el-table-column prop="payTime" align="center" label="升数" > </el-table-column>
<el-table-column prop="oilName" align="center" label="油号" > </el-table-column>
<el-table-column prop="gunName" align="center" label="油枪" > </el-table-column>
<el-table-column prop="oilNum" align="center" label="升数" > </el-table-column>
</el-table-column>
<el-table-column prop="payTime" align="center" label="支付通道">
<el-table-column prop="mchntCd" align="center" label="支付通道">
</el-table-column>
<el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150"> </el-table-column>
<el-table-column prop="createTime" align="center" label="订单创建时间" > </el-table-column>
<el-table-column prop="payTime" align="center" label="订单完成时间" >
<template slot-scope="scope">
<span v-if="scope.row.payTime">{{scope.row.payTime}}</span>
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column prop="mchntCd" align="center" label="商户号编码" width="150"> </el-table-column>
<el-table-column prop="payTime" align="center" label="订单创建时间" > </el-table-column>
<el-table-column prop="payTime" align="center" label="订单完成时间" > </el-table-column>
</el-table>
</div>
<pagination
@ -136,12 +143,7 @@
<script>
import {
exportExcelTradingApi,
getRunningWaterByTissueApi,
getTissueByDataApi,
getTradingPageApi
} from "@/api/allOrder";
import {getDuiZhangOilListApi} from "@/api/financialStatement/jiaoyiduizhang";
export default {
name: "jiaoyiduizhang-oil",
@ -212,30 +214,6 @@ import {
this.deptList = response.data.records;
})
},
exportExcelCashier() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
this.$download.saveAs(blob,'交易明细统计.xLsx')
})
},
// 获取订单统计信息
getOrderStatistics() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getTissueByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data
console.log("res.data1111",res.data)
})
},
// 获取列表信息
getList(val){
@ -244,12 +222,11 @@ import {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getTradingPageApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
getDuiZhangOilListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
})
this.getOrderStatistics()
},
getOrdersInfo(data) {
this.dialogVisible = true;

52
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
View File

@ -81,9 +81,9 @@
:data="orderList"
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="payTime" align="center" label="机构名称"> </el-table-column>
<el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
<el-table-column prop="orderNo" align="center" label="订单号" > </el-table-column>
<el-table-column prop="goodsMoney" align="center" label="订单金额（万元）"></el-table-column>
<el-table-column prop="payAmount" align="center" label="订单金额（万元）"></el-table-column>
<el-table-column prop="payChannel" align="center" label="订单类型">
<template slot-scope="scope">
<span v-if="scope.row.payChannel=='cashier'">收银台</span>
@ -110,20 +110,18 @@
</template>
</el-table-column>
<el-table-column align="center" label="消费信息">
<el-table-column prop="payTime" align="center" label="商品品类" > </el-table-column>
<el-table-column prop="payTime" align="center" label="商品名称" > </el-table-column>
<el-table-column prop="payTime" align="center" label="数量" > </el-table-column>
<el-table-column prop="cvsGoodsName" align="center" label="商品品类" > </el-table-column>
<el-table-column prop="goodsName" align="center" label="商品名称" > </el-table-column>
<el-table-column prop="goodsNum" align="center" label="数量" > </el-table-column>
</el-table-column>
<el-table-column prop="payTime" align="center" label="支付通道">
<el-table-column prop="mchntCd" align="center" label="支付通道">
</el-table-column>
<el-table-column prop="mchntCd" align="center" label="商户号编码" width="150"> </el-table-column>
<el-table-column prop="payTime" align="center" label="订单创建时间" > </el-table-column>
<el-table-column prop="payTime" align="center" label="订单完成时间" > </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150"> </el-table-column>
<el-table-column prop="createTime" align="center" label="订单创建时间" > </el-table-column>
<el-table-column prop="payTime" align="center" label="订单完成时间" >
<template slot-scope="scope">
<el-button style="width: 60px" size="mini"
@click="getOrdersInfo(scope.row)"
type="success" plain round>详情</el-button>
<span v-if="scope.row.payTime">{{scope.row.payTime}}</span>
<span v-else>--</span>
</template>
</el-table-column>
</el-table>
@ -149,6 +147,7 @@ import {
getTissueByDataApi,
getTradingPageApi
} from "@/api/allOrder";
import {getDuiZhangGoodsListApi} from "@/api/financialStatement/jiaoyiduizhang";
export default {
name: "jiaoyiduizhang-store",
@ -219,30 +218,10 @@ import {
this.deptList = response.data.records;
})
},
exportExcelCashier() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
this.$download.saveAs(blob,'交易明细统计.xLsx')
})
},
// 获取订单统计信息
getOrderStatistics() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getTissueByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data
console.log("res.data1111",res.data)
})
},
// 获取列表信息
getList(val){
@ -251,12 +230,11 @@ import {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getTradingPageApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
getDuiZhangGoodsListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
})
this.getOrderStatistics()
},
getOrdersInfo(data) {
this.dialogVisible = true;

77
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
View File

@ -80,10 +80,23 @@
<el-table
:data="orderList"
style="width: 100%">
"storeId": "",
"orderNo": "",
"payChannel": "",
"payAmount": "",
"payType": "",
"status": "",
"name": "",
"mobile": "",
"rechargeType": "",
"mchntCd": "",
"paymentChannel": "",
"createTime": "",
"payTime": ""
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="payTime" align="center" label="机构名称"> </el-table-column>
<el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
<el-table-column prop="orderNo" align="center" label="订单号" > </el-table-column>
<el-table-column prop="goodsMoney" align="center" label="订单金额（万元）"></el-table-column>
<el-table-column prop="payAmount" align="center" label="订单金额（万元）"></el-table-column>
<el-table-column prop="payChannel" align="center" label="订单类型">
<template slot-scope="scope">
<span v-if="scope.row.payChannel=='cashier'">收银台</span>
@ -110,15 +123,25 @@
</template>
</el-table-column>
<el-table-column align="center" label="消费信息">
<el-table-column prop="payTime" align="center" label="会员名称" > </el-table-column>
<el-table-column prop="payTime" align="center" label="会员手机号" > </el-table-column>
<el-table-column prop="payTime" align="center" label="卡类型" > </el-table-column>
<el-table-column prop="name" align="center" label="会员名称" > </el-table-column>
<el-table-column prop="mobile" align="center" label="会员手机号" > </el-table-column>
<el-table-column prop="rechargeType" align="center" label="卡类型" >
<template slot-scope="scope">
<span v-if="scope.row.rechargeType=='0'">充值卡</span>
<span v-else-if="scope.row.rechargeType=='1'">自定义</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column prop="payTime" align="center" label="支付通道">
<el-table-column prop="mchntCd" align="center" label="支付通道">
</el-table-column>
<el-table-column prop="mchntCd" align="center" label="商户号编码" width="150"> </el-table-column>
<el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150"> </el-table-column>
<el-table-column prop="createTime" align="center" label="订单创建时间" > </el-table-column>
<el-table-column prop="payTime" align="center" label="订单完成时间" > </el-table-column>
<el-table-column prop="payTime" align="center" label="订单完成时间" >
<template slot-scope="scope">
<span v-if="scope.row.payTime">{{scope.row.payTime}}</span>
<span v-else>--</span>
</template>
</el-table-column>
</el-table>
</div>
@ -136,12 +159,7 @@
<script>
import {
exportExcelTradingApi,
getRunningWaterByTissueApi,
getTissueByDataApi,
getTradingPageApi
} from "@/api/allOrder";
import {getDuiZhangVipListApi, getVipListApi} from "@/api/financialStatement/jiaoyiduizhang";
export default {
name: "jiaoyiduizhang-vip",
@ -212,30 +230,6 @@ import {
this.deptList = response.data.records;
})
},
exportExcelCashier() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
this.$download.saveAs(blob,'交易明细统计.xLsx')
})
},
// 获取订单统计信息
getOrderStatistics() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getTissueByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data
console.log("res.data1111",res.data)
})
},
// 获取列表信息
getList(val){
@ -244,16 +238,11 @@ import {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getTradingPageApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
getDuiZhangVipListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
})
this.getOrderStatistics()
},
getOrdersInfo(data) {
this.dialogVisible = true;
this.ordersInfo = data
},
// 搜索按钮操作
handleQuery() {

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
View File

@ -47,6 +47,14 @@ public class IntegralOrdersController extends BaseController {
IPage<IntegralOrdersVO> integralOrdersIPage = this.integralOrdersService.queryByPage(pages, integralOrders);
return getSuccessResult(integralOrdersIPage);
}
@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<IntegralOrdersVO> integralOrdersIPage = this.integralOrdersService.queryByPageByZtDz(pages, integralOrders);
return getSuccessResult(integralOrdersIPage);
}
@GetMapping("queryByPageUni")
public ResponseObject queryByPageUni(@RequestParam(value = "page",defaultValue = "1") Integer page,

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/dto/IntegralOrdersDTO.java
View File

@ -4,6 +4,8 @@ package com.fuint.business.integral.dto;
import com.fuint.business.integral.entity.IntegralOrders;
import lombok.Data;
import java.util.List;
/**
* 查询参数
*/
@ -13,5 +15,8 @@ public class IntegralOrdersDTO extends IntegralOrders {
private String userNo;
private String name;
private String giftName;
private String storeName;
private String coverImage;
private Long deptId;
private List<Long> storeIds;
}

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java
View File

@ -40,6 +40,7 @@ public interface IntegralOrdersMapper {
* @return 对象列表
*/
IPage<IntegralOrdersVO> queryAllByLimit(@Param("page") Page page, @Param("integralOrders") IntegralOrdersDTO integralOrders);
IPage<IntegralOrdersVO> queryAllByLimitByZtDz(@Param("page") Page page, @Param("integralOrders") IntegralOrdersDTO integralOrders);
IPage<IntegralOrdersVO> queryByPageUni(@Param("page") Page page, @Param("integralOrders") IntegralOrdersDTO integralOrders);

104
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
View File

@ -153,6 +153,110 @@
</select>
<!--查询指定行数据-->
<select id="queryAllByLimitByZtDz" resultMap="IntegralOrdersMap">
select
io.id,
io.user_id,
io.order_number,
io.gift_id,
io.shipping_type,
io.amount,
io.integral,
io.come_on,
io.exchange_quantity,
io.order_status,
io.status,
io.order_type,
io.processing_result,
io.notes,
io.store_id,
io.create_time,
io.update_time,
io.courier_companies,
io.the_tracking_number,
io.actual_payment,
io.make_change,
io.payment_type,
mu.mobile,
mu.user_no,
mu.name,
ig.gift_name,
ig.cover_image,
ea.name addrName,
ea.mobile addrMobile,
ea.address
from integral_orders io
left join mt_user mu ON io.user_id = mu.id
left join integral_gift ig ON io.gift_id = ig.id
left join mt_user_express_address ea ON io.address_id = ea.id
<where>
<if test="integralOrders.storeIds != null">
and io.store_id in
<foreach collection="integralOrders.storeIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="integralOrders.giftName != null">
and ig.gift_name like CONCAT ('%',#{integralOrders.giftName},'%')
</if>
<if test="integralOrders.mobile != null">
and mu.mobile like CONCAT ('%',#{integralOrders.mobile},'%')
</if>
<if test="integralOrders.params.beginTime != null and integralOrders.params.beginTime != ''">
and date_format(io.create_time,'%y%m%d') &gt;= date_format(#{integralOrders.params.beginTime},'%y%m%d')
</if>
<if test="integralOrders.params.endTime != null and integralOrders.params.endTime != ''">
and date_format(io.create_time,'%y%m%d') &lt;= date_format(#{integralOrders.params.endTime},'%y%m%d')
</if>
<if test="integralOrders.orderNumber != null and integralOrders.orderNumber != ''">
and io.order_number like CONCAT ('%',#{integralOrders.orderNumber},'%')
</if>
<if test="integralOrders.shippingType != null and integralOrders.shippingType != ''">
and io.shipping_type = #{integralOrders.shippingType}
</if>
<if test="integralOrders.orderStatus != null and integralOrders.orderStatus != '' and integralOrders.orderStatus != 0 ">
and (
(#{integralOrders.orderStatus} = 1 and (io.order_status = '待处理' or io.order_status = '待发货')) or
(#{integralOrders.orderStatus} = 2 and (io.order_status = '已完成' or io.order_status = '已发货')) or
(#{integralOrders.orderStatus} = 3 and (io.order_status = '已退款' or io.order_status = '已拒绝')) or
(#{integralOrders.orderStatus} = 4 and io.order_status = '未支付')
)
</if>
<if test="integralOrders.id != null">
and io.id = #{integralOrders.id}
</if>
<if test="integralOrders.userId != null">
and io.user_id = #{integralOrders.userId}
</if>
<if test="integralOrders.giftId != null">
and io.gift_id = #{integralOrders.giftId}
</if>
<if test="integralOrders.exchangeQuantity != null">
and io.exchange_quantity = #{integralOrders.exchangeQuantity}
</if>
<if test="integralOrders.status != null and integralOrders.status != ''">
and io.status = #{integralOrders.status}
</if>
<if test="integralOrders.orderType != null">
and io.order_type = #{integralOrders.orderType}
</if>
<if test="integralOrders.processingResult != null and integralOrders.processingResult != ''">
and io.processing_result = #{integralOrders.processingResult}
</if>
<if test="integralOrders.createTime != null">
and io.create_time = #{integralOrders.createTime}
</if>
<if test="integralOrders.updateTime != null">
and io.update_time = #{integralOrders.updateTime}
</if>
</where>
order by io.create_time desc
</select>
<select id="queryByPageUni" resultMap="IntegralOrdersMap">
select

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java
View File

@ -38,6 +38,7 @@ public interface IntegralOrdersService {
* @return 查询结果
*/
IPage<IntegralOrdersVO> queryByPage(@Param("page") Page page, @Param("integralGift") IntegralOrdersDTO integralOrders);
IPage<IntegralOrdersVO> queryByPageByZtDz(@Param("page") Page page, @Param("integralGift") IntegralOrdersDTO integralOrders);
IPage<IntegralOrdersVO> queryByPageUni(@Param("page") Page page, @Param("integralGift") IntegralOrdersDTO integralOrders);

30
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
View File

@ -13,6 +13,7 @@ import com.fuint.business.integral.dto.IntegralOrdersDTO;
import com.fuint.business.integral.entity.IntegralDetail;
import com.fuint.business.integral.entity.IntegralGift;
import com.fuint.business.integral.entity.IntegralOrders;
import com.fuint.business.integral.mapper.IntegralGiftMapper;
import com.fuint.business.integral.mapper.IntegralOrdersMapper;
import com.fuint.business.integral.service.IntegralDetailService;
import com.fuint.business.integral.service.IntegralGiftService;
@ -32,6 +33,8 @@ import com.fuint.business.member.entity.LJStaff;
import com.fuint.business.member.mapper.LJStaffMapper;
import com.fuint.business.order.entity.AllOrderInfo;
import com.fuint.business.order.service.AllOrderInfoService;
import com.fuint.business.store.entity.MtStore;
import com.fuint.business.store.mapper.MtStoreMapper;
import com.fuint.business.userManager.entity.UserBalance;
import com.fuint.business.userManager.mapper.LJUserMapper;
import com.fuint.business.userManager.service.UserBalanceService;
@ -39,6 +42,7 @@ import com.fuint.business.userManager.vo.LJUserVo;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.RedisLock;
import com.fuint.common.util.TokenUtil;
import com.fuint.system.dept.mapper.SysDeptMapper;
import io.swagger.models.auth.In;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
@ -103,6 +107,32 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
return integralOrdersVOIPage;
}
@Resource
SysDeptMapper sysDeptMapper;
@Resource
MtStoreMapper mtStoreMapper;
@Resource
IntegralGiftMapper integralGiftMapper;
@Override
public IPage<IntegralOrdersVO> queryByPageByZtDz(@Param("page") Page page, @Param("integralOrders") IntegralOrdersDTO order) {
if (ObjectUtil.isEmpty(order.getDeptId())) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
order.setDeptId(nowAccountInfo.getDeptId());
}
List<Long> strings = sysDeptMapper.selectChildByDeptIdR(order.getDeptId());
List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
order.setStoreIds(longs);
IPage<IntegralOrdersVO> integralOrdersVOIPage = integralOrdersDao.queryAllByLimitByZtDz(page, order);
for (IntegralOrdersVO record : integralOrdersVOIPage.getRecords()) {
MtStore mtStore = mtStoreMapper.selectById(record.getStoreId());
record.setStoreName(mtStore.getName());
// IntegralGift integralGift = integralGiftMapper.queryById(record.getGiftId());
}
return integralOrdersVOIPage;
}
@Override
public IPage<IntegralOrdersVO> queryByPageUni(@Param("page") Page page, @Param("integralOrders") IntegralOrdersDTO integralOrders) {

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralOrdersVO.java
View File

@ -18,5 +18,5 @@ public class IntegralOrdersVO extends IntegralOrders {
private String addrName;
private String addrMobile;
private String address;
private String storeName;
}

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/controller/CardValueOrdersController.java
View File

@ -62,6 +62,13 @@ public class CardValueOrdersController extends BaseController {
Page page = new Page(pageNo, pageSize);
return getSuccessResult(this.cardValueOrdersService.selectCardValueOrders(page, cardValueOrders));
}
@GetMapping("/selectCardValueOrdersByZtDz")
public ResponseObject selectCardValueOrdersByZtDz(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
@Param("cardValueOrders") CardValueOrders cardValueOrders) {
Page page = new Page(pageNo, pageSize);
return getSuccessResult(this.cardValueOrdersService.selectCardValueOrdersByZtDz(page, cardValueOrders));
}
/**
* 通过主键查询单条数据

32
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/entity/CardValueOrders.java
View File

@ -3,12 +3,17 @@ package com.fuint.business.marketingActivity.cardValueOrders.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 储值卡订单表(CardValueOrders)表实体类
@ -95,5 +100,32 @@ public class CardValueOrders extends Model<CardValueOrders> {
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@TableField(exist = false)
private String storeName;
@TableField(exist = false)
private Long deptId;
@TableField(exist = false)
private List<Long> storeIds;
/** 请求参数 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@TableField(exist = false)
private Map<String, Object> params;
public Map<String, Object> getParams()
{
if (params == null)
{
params = new HashMap<>();
}
return params;
}
public void setParams(Map<String, Object> params)
{
this.params = params;
}
}

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/CardValueOrdersMapper.java
View File

@ -27,5 +27,8 @@ public interface CardValueOrdersMapper extends BaseMapper<CardValueOrders> {
* @return
*/
IPage<CardValueOrders> selectCardValueOrders(Page page,@Param("order") CardValueOrders order);
IPage<CardValueOrders> selectCardValueOrdersByZtDz(Page page,@Param("order") CardValueOrders order);
}

23
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/xml/CardValueOrdersMapper.xml
View File

@ -20,6 +20,29 @@
</where>
order by pay_time desc
</select>
<select id="selectCardValueOrdersByZtDz"
resultType="com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders">
<include refid="selectOrders"></include>
<where>
<if test="order.status != null and order.status != ''">
and status = #{order.status}
</if>
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(pay_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
</if>
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(pay_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
</if>
<if test="order.storeIds != null">
and store_id in
<foreach collection="order.storeIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</where>
</select>
</mapper>

11
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java
View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders;
import com.fuint.business.order.entity.AllOrderInfo;
import org.apache.ibatis.annotations.Param;
/**
* 储值卡订单表(CardValueOrders)表服务接口
@ -29,6 +30,14 @@ public interface CardValueOrdersService extends IService<CardValueOrders> {
*/
IPage<CardValueOrders> selectCardValueOrders(Page page, CardValueOrders order);
/**
* 中台数据对账
* @param page
* @param order
* @return
*/
IPage<CardValueOrders> selectCardValueOrdersByZtDz(Page page,@Param("order") CardValueOrders order);
/**
* 修改订单支付状态
* @param orderNo 订单号
@ -38,5 +47,7 @@ public interface CardValueOrdersService extends IService<CardValueOrders> {
void updateBalance(String orderNo,String status);
void updateBalances(String orderNo,String status);
}

27
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java
View File

@ -11,15 +11,19 @@ import com.fuint.business.order.entity.AllOrderInfo;
import com.fuint.business.order.mapper.AllOrderInfoMapper;
import com.fuint.business.order.service.AllOrderInfoService;
import com.fuint.business.order.vo.AllOrderInfoVo;
import com.fuint.business.store.mapper.MtStoreMapper;
import com.fuint.business.storeInformation.entity.LJStore;
import com.fuint.business.storeInformation.service.ILJStoreService;
import com.fuint.business.userManager.entity.UserBalance;
import com.fuint.business.userManager.service.UserBalanceService;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import com.fuint.system.dept.mapper.SysDeptMapper;
import com.fuint.system.dept.service.ISysDeptService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* 储值卡订单表(CardValueOrders)表服务实现类
@ -41,6 +45,10 @@ public class CardValueOrdersServiceImpl extends ServiceImpl<CardValueOrdersMappe
@Resource
private ILJStoreService iljStoreService;
@Resource
private MtStoreMapper mtStoreMapper;
@Resource
private SysDeptMapper sysDeptMapper;
/**
* 根据订单编号返回订单信息
* @param orderNo
@ -64,6 +72,25 @@ public class CardValueOrdersServiceImpl extends ServiceImpl<CardValueOrdersMappe
return baseMapper.selectCardValueOrders(page,order);
}
@Override
public IPage<CardValueOrders> selectCardValueOrdersByZtDz(Page page, CardValueOrders order) {
if (ObjectUtil.isEmpty(order.getDeptId())) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
order.setDeptId(nowAccountInfo.getDeptId());
}
List<Long> strings = sysDeptMapper.selectChildByDeptIdR(order.getDeptId());
List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
order.setStoreIds(longs);
IPage<CardValueOrders> cardValueOrdersIPage = baseMapper.selectCardValueOrdersByZtDz(page, order);
cardValueOrdersIPage.getRecords().forEach(item->{
item.setStoreName(mtStoreMapper.selectById(Long.valueOf(item.getStoreId())).getName());
});
return cardValueOrdersIPage;
}
@Override
public void updateOrderStatus(String orderNo, String status) {
CardValueOrders oneByOrderNo = cardValueOrdersMapper.getOneByOrderNo(orderNo);

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/LJOrderController.java
View File

@ -40,6 +40,15 @@ public class LJOrderController extends BaseController {
return getSuccessResult(list);
}
@GetMapping("/selectOrderListByZtDz")
public ResponseObject selectOrderList(LJOrder order,
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize);
IPage<LJOrder> list = orderService.selectOrderListByZtDz(page,order);
return getSuccessResult(list);
}
/**
*导出订单
*@paramresponse

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
View File

@ -31,6 +31,7 @@ public class OilOrderController extends BaseController {
* @param pageSize
* @return
*/
@GetMapping("/list")
public ResponseObject list(OilOrder order,
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@ -40,6 +41,17 @@ public class OilOrderController extends BaseController {
return getSuccessResult(list);
}
@GetMapping("/selectOilOrderListByZtDz")
public ResponseObject selectOilOrderListByZtDz(OilOrder order,
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize);
IPage<OilOrder> list = orderService.selectOilOrderListByZtDz(page,order);
return getSuccessResult(list);
}
/**
*导出订单
*@paramresponse

11
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java
View File

@ -1,6 +1,7 @@
package com.fuint.business.order.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -11,6 +12,7 @@ import lombok.Data;
import java.util.Date;
import java.io.Serializable;
import java.util.List;
/**
* 商品订单表(Order)实体类
@ -99,5 +101,14 @@ public class LJOrder extends BaseEntity implements Serializable {
* 操作员工
*/
private Integer staffId;
@TableField(exist = false)
private String goodsName;
@TableField(exist = false)
private String cvsGoodsName;
@TableField(exist = false)
private Long deptId;
@TableField(exist = false)
private List<Long> storeIds;
}

17
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java
View File

@ -13,6 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.io.Serializable;
import java.util.List;
/**
* 油品订单表(OilOrder)实体类
@ -149,5 +150,21 @@ public class OilOrder extends BaseEntity implements Serializable {
*/
// @TableField(exist = false)
private Integer tankId;
@TableField(exist = false)
private String tankName;
@TableField(exist = false)
private String gunName;
@TableField(exist = false)
private String oilName;
@TableField(exist = false)
private String StoreName;
@TableField(exist = false)
private Long deptId;
@TableField(exist = false)
private List<Long> storeIds;
}

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java
View File

@ -23,6 +23,7 @@ public interface LJOrderMapper extends BaseMapper<LJOrder> {
* @return
*/
public IPage<LJOrder> selectOrderList(Page page, @Param("order") LJOrder order);
public IPage<LJOrder> selectOrderListByZtDz(Page page, @Param("order") LJOrder order);
List<LJOrderExcel> selectOrderListExcel(@Param("order") LJOrder order);

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java
View File

@ -30,6 +30,8 @@ public interface OilOrderMapper extends BaseMapper<OilOrder> {
*/
public IPage<OilOrder> selectOilOrderList(Page page, @Param("order") OilOrder order);
public IPage<OilOrder> selectOilOrderListByZtDz(Page page, @Param("order") OilOrder order);
List<OilOrderExcel> selectOilOrderListExcel(@Param("order") OilOrder order);
/**

35
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
View File

@ -8,7 +8,12 @@
<select id="selectOrderList" resultType="com.fuint.business.order.entity.LJOrder">
<include refid="selectOrders"></include>
<where>
store_id = #{order.storeId}
<if test="order.storeIds != null">
and store_id in
<foreach collection="order.storeIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="order.staffId != null and order.staffId != ''">
and staff_id = #{order.staffId}
</if>
@ -209,6 +214,34 @@
and mo.create_time &gt;= #{time}
</if>
</select>
<select id="selectOrderListByZtDz" resultType="com.fuint.business.order.entity.LJOrder">
<include refid="selectOrders"></include>
<where>
store_id = #{order.storeId}
<if test="order.staffId != null and order.staffId != ''">
and staff_id = #{order.staffId}
</if>
<if test="order.userId != null and order.userId != ''">
and user_id = #{order.userId}
</if>
<if test="order.payType != null and order.payType != ''">
and pay_type = #{order.payType}
</if>
<if test="order.orderNo != null and order.orderNo != ''">
and order_no like concat('%', #{order.orderNo}, '%')
</if>
<if test="order.payUser != null and order.payUser != ''">
and pay_user like concat('%', #{order.payUser}, '%')
</if>
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
</if>
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
</if>
order by create_time desc
</where>
</select>
</mapper>

42
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
View File

@ -42,6 +42,48 @@
order by create_time desc
</where>
</select>
<select id="selectOilOrderListByZtDz" resultType="com.fuint.business.order.entity.OilOrder">
<include refid="selectOrders"></include>
<where>
<if test="order.storeIds != null">
and store_id in
<foreach collection="order.storeIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="order.userId != null and order.userId != ''">
and user_id = #{order.userId}
</if>
<if test="order.staffId != null and order.staffId != ''">
and staff_id = #{order.staffId}
</if>
<if test="order.terminal != null and order.terminal != ''">
and terminal = #{order.terminal}
</if>
<if test="order.oilGunNum != null and order.oilGunNum != ''">
and oil_gun_num = #{order.oilGunNum}
</if>
<if test="order.payType != null and order.payType != ''">
and pay_type = #{order.payType}
</if>
<if test="order.orderStatus != null and order.orderStatus != ''">
and order_status = #{order.orderStatus}
</if>
<if test="order.orderNo != null and order.orderNo != ''">
and order_no like concat('%', #{order.orderNo}, '%')
</if>
<if test="order.payUser != null and order.payUser != ''">
and pay_user like concat('%', #{order.payUser}, '%')
</if>
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
</if>
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
</if>
order by create_time desc
</where>
</select>
<select id="selectOilOrderByOrderNo" resultType="com.fuint.business.order.vo.OilOrderVo"
parameterType="string">
select oil.*,onu.oil_price from oil_order oil

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java
View File

@ -25,6 +25,7 @@ public interface LJOrderService extends IService<LJOrder> {
* @return
*/
public IPage<LJOrder> selectOrderList(Page page, LJOrder order);
public IPage<LJOrder> selectOrderListByZtDz(Page page, LJOrder order);
void export(HttpServletResponse response, LJOrder order);

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
View File

@ -30,6 +30,7 @@ public interface OilOrderService extends IService<OilOrder> {
* @return
*/
public IPage<OilOrder> selectOilOrderList(Page page, OilOrder order);
public IPage<OilOrder> selectOilOrderListByZtDz(Page page, OilOrder order);
void export(HttpServletResponse response, OilOrder order);

46
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
View File

@ -6,7 +6,9 @@ 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.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.marketingActivity.favorableRecords.entity.FavorableRecords;
import com.fuint.business.marketingActivity.favorableRecords.service.FavorableRecordsService;
@ -18,8 +20,11 @@ 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.mapper.MtStoreMapper;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import com.fuint.system.dept.mapper.SysDeptMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -48,6 +53,47 @@ public class LJOrderServiceImpl extends ServiceImpl<LJOrderMapper, LJOrder> impl
IPage<LJOrder> ljOrderIPage = baseMapper.selectOrderList(page, order);
return ljOrderIPage;
}
@Resource
CvsGoodsMapper cvsGoodsMapper;
@Resource
SysDeptMapper sysDeptMapper;
@Resource
MtStoreMapper mtStoreMapper;
@Override
public IPage<LJOrder> selectOrderListByZtDz(Page page, LJOrder order) {
if (ObjectUtil.isEmpty(order.getDeptId())) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
order.setDeptId(nowAccountInfo.getDeptId());
}
List<Long> strings = sysDeptMapper.selectChildByDeptIdR(order.getDeptId());
List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
order.setStoreIds(longs);
IPage<LJOrder> ljOrderIPage = baseMapper.selectOrderList(page, order);
for (LJOrder item : ljOrderIPage.getRecords()) {
List<OrderGoodsVo> orderGoodsVos = orderGoodsService.selectOrderGoods(item.getId());
if (ObjectUtil.isNotEmpty(orderGoodsVos)) {
item.setGoodsName("");
item.setCvsGoodsName("");
for (OrderGoodsVo orderGoodsVo : orderGoodsVos) {
LJGoods byId = goodsService.getById(orderGoodsVo.getGoodsId());
if (ObjectUtil.isNotEmpty(byId) && ObjectUtil.isNotEmpty(byId.getName()) ) {
item.setGoodsName(item.getGoodsName()+byId.getName()+",");
}
CvsGoods cvsGoods = cvsGoodsMapper.selectById(byId.getCvsGoodId());
if (ObjectUtil.isNotEmpty(cvsGoods) && ObjectUtil.isNotEmpty(cvsGoods.getName()) ) {
item.setCvsGoodsName(item.getCvsGoodsName()+cvsGoods.getName()+",");
}
}
item.getGoodsName().substring(0,item.getGoodsName().length()-2);
item.getCvsGoodsName().substring(0,item.getCvsGoodsName().length()-2);
}
}
return ljOrderIPage;
}
public void export(HttpServletResponse response, LJOrder order) {

48
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
View File

@ -50,9 +50,14 @@ import com.fuint.business.order.service.*;
import com.fuint.business.order.vo.Excel.OilOrderExcel;
import com.fuint.business.order.vo.OilOrderVo;
import com.fuint.business.petrolStationManagement.entity.*;
import com.fuint.business.petrolStationManagement.mapper.OilGunMapper;
import com.fuint.business.petrolStationManagement.mapper.OilNameMapper;
import com.fuint.business.petrolStationManagement.mapper.OilNumberMapper;
import com.fuint.business.petrolStationManagement.mapper.OilTankMapper;
import com.fuint.business.petrolStationManagement.service.*;
import com.fuint.business.printer.service.PrinterService;
import com.fuint.business.store.entity.MtStore;
import com.fuint.business.store.mapper.MtStoreMapper;
import com.fuint.business.storeInformation.entity.LJStore;
import com.fuint.business.storeInformation.service.ILJStoreService;
import com.fuint.business.tag.entity.OilTag;
@ -73,6 +78,7 @@ import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.StringUtils;
import com.fuint.common.util.TokenUtil;
import com.fuint.system.config.service.SysConfigService;
import com.fuint.system.dept.mapper.SysDeptMapper;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.springframework.beans.factory.annotation.Autowired;
@ -144,6 +150,10 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
@Resource
private TagCodeService tagCodeService;
@Resource
private SysDeptMapper sysDeptMapper;
@Resource
private MtStoreMapper mtStoreMapper;
@Override
public IPage<OilOrder> selectOilOrderList(Page page, OilOrder order) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
@ -152,6 +162,44 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
IPage<OilOrder> oilOrderIPage = baseMapper.selectOilOrderList(page, order);
return oilOrderIPage;
}
@Resource
OilGunMapper oilGunMapper;
@Resource
OilNameMapper oilNameMapper;
@Resource
OilTankMapper oilTankMapper;
@Override
public IPage<OilOrder> selectOilOrderListByZtDz(Page page, OilOrder order) {
if (ObjectUtil.isEmpty(order.getDeptId())) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
order.setDeptId(nowAccountInfo.getDeptId());
}
List<Long> strings = sysDeptMapper.selectChildByDeptIdR(order.getDeptId());
List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
order.setStoreIds(longs);
IPage<OilOrder> oilOrderIPage = baseMapper.selectOilOrderListByZtDz(page, order);
for (OilOrder record : oilOrderIPage.getRecords()) {
MtStore mtStore = mtStoreMapper.selectById(record.getStoreId());
if (ObjectUtil.isNotEmpty(mtStore)) {
record.setStoreName(mtStore.getName());
}
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 void export(HttpServletResponse response, OilOrder order) {

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java
View File

@ -48,6 +48,7 @@ public interface MtStoreMapper extends BaseMapper<MtStore> {
MtStore getByStroeName(@Param("name") String name);
MtStore getByDeptId(@Param("deptId") Long deptId);
List<MtStore> queryStoresByDeptIds(@Param("list") List<Long> deptIds);
List<Long> queryStoresByDeptIdsR(@Param("list") List<Long> deptIds);
}

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/MtStoreMapper.xml
View File

@ -37,10 +37,19 @@
#{item}
</foreach>
</select>
<select id="getByDeptId" resultType="com.fuint.business.store.entity.MtStore">
select * from mt_store
where
contract_dept_id = #{deptId}
</select>
<select id="queryStoresByDeptIdsR" resultType="java.lang.Long">
select id from mt_store
where
contract_dept_id in
<foreach collection="list" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</select>
</mapper>

8
fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/SysDeptMapper.java
View File

@ -66,6 +66,14 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
List<SysDeptVo> selectChildByDeptId(Long deptId);
/**
* 查询下面id
* @param deptId
* @return
*/
List<Long> selectChildByDeptIdR(Long deptId);
int selectStatusByParentId(Long parentId);
/**

5
fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml
View File

@ -107,6 +107,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select * from sys_dept where status = 'qy' and (find_in_set(#{deptId}, ancestors) or dept_id = #{deptId}) and if_delete = 0
</select>
<select id="selectChildByDeptIdR" resultType="java.lang.Long">
select dept_id from sys_dept where status = 'qy' and (find_in_set(#{deptId}, ancestors) or dept_id = #{deptId}) and if_delete = 0
</select>
<select id="selectStatusByParentId" resultType="java.lang.Integer">
select count(*) from sys_dept where status = 'jy' and dept_id= #{parentId} and if_delete = 0
</select>

1
fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/ISysDeptService.java
View File

@ -28,6 +28,7 @@ public interface ISysDeptService extends IService<SysDept>
List<SysDept> selectDeptByDeptId(Long parentId);
List<SysDept> selectDeptListss(Long parentId);
List<SysDept> selectDeptListsss(Long parentId);
// 根据父级id查询所有deptId
/**
* 查询部门树结构信息