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

1

Browse Source
This commit is contained in:
齐天大圣 2024-11-01 11:23:13 +08:00
parent 461965c760
commit a793ab76a9
11 changed files with 261 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fuintAdmin/src/api/allOrder.js
View File

@ -36,6 +36,16 @@ export function getTradingPageApi(query) {
})
}
export function getTradingOnsPageApi(query) {
return request({
url: 'business/allOrderInfo/tradingList',
method: 'get',
params: query
})
}
// 油站端 - 财务报表 -交易对账-交易明细 表格数据
export function transactionList(query) {
return request({

82
fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
View File

@ -44,19 +44,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="status">
<el-select
v-model="queryParams.status"
clearable
placeholder="请选择订单状态"
>
<el-option label="已支付" value="paid"/>
<el-option label="未支付" value="unpaid"/>
<el-option label="已退款" value="refund"/>
<el-option label="支付失败" value="payFail"/>
<el-option label="退款中" value="refunding"/>
</el-select>
</el-form-item>
<el-form-item label="" prop="paymentChannel">
<el-select v-model="queryParams.paymentChannel" placeholder="请选择支付通道" clearable>
<el-option
@ -71,9 +58,9 @@
<el-select v-model="queryParams.staffId" placeholder="请选择员工" clearable>
<el-option
v-for="dicts in this.staffList"
:key="dicts.id"
:label="dicts.realName"
:value="dicts.id"
:key="dicts.acctId"
:label="dicts.accountName"
:value="dicts.acctId"
/>
</el-select>
</el-form-item>
@ -101,7 +88,7 @@
<div class="box-gang">
<div class="box">
<el-tooltip class="item" effect="dark" content="退款金额（元）/笔数" placement="top-start">
<div class="size-bole">{{ orderStatistics.wechat?orderStatistics.wechat:0 }}/0</div>
<div class="size-bole">{{ orderStatistics.refBalance?orderStatistics.refBalance:0 }}/{{ orderStatistics.refBalanceCount?orderStatistics.refBalanceCount:0 }}</div>
</el-tooltip>
<div class="size-hui">
<div class="dian" style="background: #0DC291"></div>
@ -110,7 +97,7 @@
</div>
<div class="box">
<el-tooltip class="item" effect="dark" content="油品订单退款金额（元）/笔数" placement="top-start">
<div class="size-bole" style="color:#00CAFF;">{{ orderStatistics.alipay?orderStatistics.alipay:0 }}/0</div>
<div class="size-bole" style="color:#00CAFF;">{{ orderStatistics.oilOrder?orderStatistics.oilOrder:0 }}/{{ orderStatistics.oilOrderCount?orderStatistics.oilOrderCount:0 }}</div>
</el-tooltip>
<div class="size-hui">
@ -120,7 +107,7 @@
</div>
<div class="box">
<el-tooltip class="item" effect="dark" content="便利店订单退款金额（元）/笔数" placement="top-start">
<div class="size-bole" style="color:#F44522;" >{{ orderStatistics.balance?orderStatistics.balance:0 }}/0</div>
<div class="size-bole" style="color:#F44522;" >{{ orderStatistics.convenienceStore?orderStatistics.convenienceStore:0 }}/{{ orderStatistics.convenienceStoreCount?orderStatistics.convenienceStoreCount:0 }}</div>
</el-tooltip>
<div class="size-hui">
@ -130,7 +117,7 @@
</div>
<div class="box">
<el-tooltip class="item" effect="dark" content="积分商城订单退款金额（元）/笔数" placement="top-start">
<div class="size-bole" style="color:#FF7E00;" >{{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}/0</div>
<div class="size-bole" style="color:#FF7E00;" >{{orderStatistics.integral?orderStatistics.integral:0}}/{{orderStatistics.integralCount?orderStatistics.integralCount:0}}</div>
</el-tooltip>
<div class="size-hui">
@ -147,25 +134,8 @@
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
<el-table-column prop="payChannel" 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-else>其他</span>
</template>
</el-table-column>
<el-table-column prop="type" align="center" label="订单分类">
<template slot-scope="scope">
<span v-if="scope.row.type=='1'">油品</span>
<span v-else-if="scope.row.type=='2'">商品</span>
<span v-else-if="scope.row.type=='3'">储值卡</span>
<span v-else-if="scope.row.type=='4'">积分</span>
<span v-else-if="scope.row.type=='5'">囤油卡</span>
<span v-else-if="scope.row.type=='6'">油品加商品(收银台订单)</span>
<span v-else-if="scope.row.type=='7'">挂账订单</span>
<span v-else="">其他</span>
</template>
</el-table-column>
<el-table-column prop="goodsMoney" align="center" label="订单金额（元）">
<template slot-scope="scope">
@ -194,12 +164,12 @@
<el-table-column prop="status" align="center" label="支付状态">
<template slot-scope="scope">
<div v-if="scope.row.status == 'unpaid'" style="color: #F44522">未支付</div>
<div v-else-if="scope.row.status == 'paid'" style="color: #0DC291">已支付</div>
<div v-else-if="scope.row.status == 'refund'" style="color: #FF7E00">已退款</div>
<div v-else-if="scope.row.status == '退款中'" style="color: #FF7E00">退款中</div>
<div v-else-if="scope.row.status == '已退款'" style="color: #FF7E00">已退款</div>
<div v-else style="color: #F44522">支付失败</div>
</template>
</el-table-column>
<el-table-column prop="mchntCd" align="center" label="支付渠道"> </el-table-column>
<el-table-column prop="paymentChannel" align="center" label="支付渠道"> </el-table-column>
<el-table-column prop="mchntCd" align="center" label="商户号"> </el-table-column>
<el-table-column prop="createBy" align="center" label="关联员工"> </el-table-column>
@ -280,8 +250,10 @@ import {
getTissueByDataApi,
getTradingPageApi,
getDicts,
getStaffByStorId
getStaffByStorId,
getTradingOnsPageApi
} from "@/api/allOrder";
import {getTradingOnPageApi} from "../../../../api/allOrder";
export default {
name: "reconciliation-trading",
@ -331,6 +303,12 @@ export default {
balanceCount:"0",
refBalance:"0",
refBalanceCount:"0",
oilOrder:"0",
oilOrderCount:"0",
convenienceStore:"0",
convenienceStoreCount:"0",
integral:"0",
integralCount:"0",
},
total:0,
}
@ -360,6 +338,7 @@ export default {
this.getList()
this.getDicts()
this.getStaffByStorId()
this.getOrderStatistics()
})
},
exportExcelCashier() {
@ -376,34 +355,17 @@ export default {
// 获取订单统计信息
async getOrderStatistics() {
// await this.getDeptList()
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=>{
getTissueByDataApi(this.queryParams).then(res=>{
this.orderStatistics = res.data
})
},
// 获取列表信息
async getList(val){
// await this.getDeptList()
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getTradingPageApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
getTradingOnsPageApi(this.queryParams).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
// this.getDeptList()
this.getOrderStatistics()
})
},
// 获取字典

6
fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
View File

@ -95,9 +95,9 @@
<el-select v-model="queryParams.staffId" placeholder="请选择员工" clearable>
<el-option
v-for="dicts in this.staffList"
:key="dicts.id"
:label="dicts.realName"
:value="dicts.id"
:key="dicts.acctId"
:label="dicts.accountName"
:value="dicts.acctId"
/>
</el-select>
</el-form-item>

16
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
View File

@ -145,7 +145,18 @@ public class AllOrderInfoController extends BaseController {
IPage<AllOrderInfoVo> list = allOrderInfoService.getTradingPage(page, allOrderInfo);
return getSuccessResult(list);
}
/**
* 交易对账
* 交易明细分页查询
*/
@GetMapping("tradingList")
public ResponseObject gettradingListPage(AllOrderInfoDto allOrderInfo,
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize);
IPage<AllOrderInfoVo> list = allOrderInfoService.gettradingListPage(page, allOrderInfo);
return getSuccessResult(list);
}
/**
*
@ -175,8 +186,7 @@ public class AllOrderInfoController extends BaseController {
public ResponseObject getTradingData(AllOrderInfoDto allOrderInfo,
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize);
AllOrderInfoVo list = allOrderInfoService.getTradingData(allOrderInfo);
AllOrderInfoVo list = allOrderInfoService.getTradingsData(allOrderInfo);
return getSuccessResult(list);
}

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
View File

@ -44,6 +44,8 @@ public interface AllOrderInfoMapper extends BaseMapper<AllOrderInfo> {
BigDecimal allStream(@Param("list") List<MtStore> mtStoreList);
AllOrderInfoVo getTradingData(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo);
AllOrderInfoVo getTradingsData(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo,
@Param("beginTime") String beginTime,@Param("endTime") String endTime);
IPage<AllOrderInfoVo> getTradingPage(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo);
@ -115,4 +117,8 @@ public interface AllOrderInfoMapper extends BaseMapper<AllOrderInfo> {
List transactionAllList(@Param("obj") AllOrderInfoRes allOrderInfoRes,
@Param("beginTime") String beginTime,@Param("endTime") String endTime);
IPage<AllOrderInfoVo> gettradingListPage(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo,
@Param("beginTime") String beginTime,@Param("endTime") String endTime);
}

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

@ -41,8 +41,7 @@
mu.mobile userMobile
from all_order_info aoi
left join mt_user mu ON aoi.user_id = mu.id
<where>
where (aoi.status='refund' or aoi.status='refunding') and aoi.store_id=#{allOrderInfo.storeId}
<if test="allOrderInfo.type != null and allOrderInfo.type != ''">
and aoi.type = #{allOrderInfo.type}
</if>
@ -67,14 +66,6 @@
<if test="allOrderInfo.params.endTime != null and allOrderInfo.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(pay_time,'%y%m%d') &lt;= date_format(#{allOrderInfo.params.endTime},'%y%m%d')
</if>
<if test="allOrderInfo.storeIds != null">
and aoi.store_id in
<foreach collection="allOrderInfo.storeIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</where>
order by aoi.create_time desc
</select>
@ -866,16 +857,14 @@
ai.*,
mu.NAME AS userName,
mc.merchant_name as merchantName,
mt.real_name as createBy
mt.account_name as createBy
FROM
all_order_info ai
LEFT JOIN mt_user mu ON ai.user_id = mu.id
LEFT JOIN merchant_config mc on mc.id = ai.m_id
left join mt_staff mt on ai.create_by=mt.id
left join t_account mt on ai.create_by=mt.acct_id
where 1=1
<if test="obj.storeId != null and obj.storeId != ''">
and ai.store_id = #{obj.storeId}
</if>
and ai.store_id = #{obj.storeId}
<if test="obj.paymentChannel != null and obj.paymentChannel != ''">
and ai.payment_channel = #{obj.paymentChannel}
</if>
@ -1006,12 +995,12 @@
ai.update_time,
mu.NAME AS userName,
mc.merchant_name as merchantName,
mt.real_name as createBy
mt.account_name as createBy
FROM
all_order_info ai
LEFT JOIN mt_user mu ON ai.user_id = mu.id
LEFT JOIN merchant_config mc on mc.id = ai.m_id
left join mt_staff mt on ai.create_by=mt.id
left join t_account mt on ai.create_by=mt.acct_id
where 1=1
<if test="obj.storeId != null and obj.storeId != ''">
and ai.store_id = #{obj.storeId}
@ -1049,4 +1038,163 @@
ORDER BY ai.create_time DESC
</select>
<select id="gettradingListPage" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
select
aoi.id AS id,
aoi.order_no AS orderNo,
CASE WHEN aoi.type = '1' THEN '油品订单'
WHEN aoi.type = '2' THEN '商品订单'
WHEN aoi.type = '3' THEN '储值卡订单'
WHEN aoi.type = '4' THEN '积分商城订单'
WHEN aoi.type = '5' THEN '囤油卡订单'
WHEN aoi.type = '6' THEN '收银台订单'
WHEN aoi.type = '7' THEN '挂账订单'
WHEN aoi.type = '8' THEN 'POS订单'
END as type,
aoi.transaction_id AS transactionId,
aoi.store_id AS storeId,
aoi.goods_money AS goodsMoney,
aoi.pay_money AS payMoney,
aoi.pay_time AS payTime,
aoi.user_id AS userId,
CASE WHEN aoi.pay_channel = 'cashier' THEN '收银台'
WHEN aoi.pay_channel = 'POS' THEN 'POS机'
WHEN aoi.pay_channel = 'PC' THEN '平台'
WHEN aoi.pay_channel = 'applet' THEN '小程序'
END as payChannel,
CASE WHEN aoi.pay_type = 'ALIPAY' THEN '支付宝'
WHEN aoi.pay_type = 'WECHAT' THEN '微信'
WHEN aoi.pay_type = 'UNIONPAY' THEN '银联二维码'
WHEN aoi.pay_type = 'CASH' THEN '现金'
WHEN aoi.pay_type = 'APPLET_CODE' THEN '小程序码'
WHEN aoi.pay_type = 'card_value' THEN '储值卡'
WHEN aoi.pay_type = 'fule_card' THEN '囤油卡'
WHEN aoi.pay_type = 'car_card_value' THEN '车队卡'
WHEN aoi.pay_type = 'after_pay' THEN '挂账'
END as payType,
CASE WHEN aoi.status = 'paid' THEN '已支付'
WHEN aoi.status = 'unpaid' THEN '未支付'
WHEN aoi.status = 'refund' THEN '已退款'
WHEN aoi.status = 'payFail' THEN '支付失败'
WHEN aoi.status = 'refunding' THEN '退款中'
END as status,
aoi.content AS orderContent,
aoi.create_time AS createTime,
aoi.update_time AS updateTime,
aoi.update_by AS updateBy,
aoi.reason_Refund AS reasonRefund,
aoi.ref_order_no AS refOrderNo,
aoi.ref_money AS refMoney,
aoi.payment_channel AS paymentChannel,
aoi.ref_by AS refBy,
aoi.discount_amount AS discountAmount,
aoi.mchnt_cd AS mchntCd,
mu.name userName,
mu.mobile userMobile,
mc.merchant_name as merchantName,
mt.account_name as createBy
from all_order_info aoi
left join mt_user mu ON aoi.user_id = mu.id
LEFT JOIN merchant_config mc on mc.id = aoi.m_id
left join t_account mt on aoi.create_by=mt.acct_id
where (aoi.status='refund' or aoi.status='refunding') and aoi.store_id=#{allOrderInfo.storeId}
<if test="allOrderInfo.type != null and allOrderInfo.type != ''">
and aoi.type = #{allOrderInfo.type}
</if>
<if test="allOrderInfo.orderNo != null and allOrderInfo.orderNo != ''">
and aoi.order_no like concat('%', #{allOrderInfo.orderNo}, '%')
</if>
<if test="allOrderInfo.staffId != null and allOrderInfo.staffId != ''">
and aoi.create_by =#{allOrderInfo.staffId}
</if>
<if test="allOrderInfo.paymentChannel != null and allOrderInfo.paymentChannel != ''">
and aoi.payment_channel =#{allOrderInfo.paymentChannel}
</if>
<if test="allOrderInfo.payChannel != null and allOrderInfo.payChannel != ''">
and aoi.pay_channel = #{allOrderInfo.payChannel}
</if>
<if test="allOrderInfo.payType != null and allOrderInfo.payType != ''">
and aoi.pay_type = #{allOrderInfo.payType}
</if>
<if test="allOrderInfo.status != null and allOrderInfo.status != ''">
and aoi.status = #{allOrderInfo.status}
</if>
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
<![CDATA[ and aoi.create_time >= #{beginTime}]]>
</if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
<![CDATA[and aoi.create_time <= #{endTime}]]>
</if>
order by aoi.create_time desc
</select>
<select id="getTradingsData" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
select
SUM(CASE WHEN pay_type = 'CASH' THEN pay_money ELSE 0 END) AS CASH,
SUM(CASE WHEN pay_type = 'WECHAT' THEN pay_money ELSE 0 END) AS WECHAT,
SUM(CASE WHEN pay_type = 'ALIPAY' THEN pay_money ELSE 0 END) AS ALIPAY,
SUM(CASE WHEN pay_type = 'balance' THEN pay_money ELSE 0 END) AS balance,
COUNT(CASE WHEN pay_type = 'CASH' THEN 0 END) AS CASHCount,
COUNT(CASE WHEN pay_type = 'WECHAT' THEN 0 END) AS WECHATCount,
COUNT(CASE WHEN pay_type = 'ALIPAY' THEN 0 END) AS ALIPAYCount,
COUNT(CASE WHEN pay_type = 'balance' THEN 0 END) AS balanceCount,
SUM(CASE WHEN aoi.status = 'refund' THEN pay_money ELSE 0 END) AS refBalance,
COUNT(CASE WHEN aoi.status = 'refund' THEN 0 END) AS refBalanceCount,
SUM(pay_money) AS sumBalance,
count(*) AS countBalance,
SUM(CASE WHEN aoi.content = '储值卡订单' THEN pay_money ELSE 0 END) AS userBalance,
COUNT(CASE WHEN aoi.content = '储值卡订单' THEN 0 END) AS userBalanceCount,
SUM(CASE WHEN aoi.content = '油品充值' THEN pay_money ELSE 0 END) AS oilBalance,
COUNT(CASE WHEN aoi.content = '油品充值' THEN 0 END) AS oilBalanceCount,
SUM(CASE WHEN (aoi.content = '储值卡订单' or aoi.content = '油品充值') and pay_type = 'WECHAT' THEN pay_money ELSE 0 END)
AS userBalanceByWechat,
COUNT(CASE WHEN (aoi.content = '储值卡订单' or aoi.content = '油品充值') and pay_type = 'WECHAT' THEN 0 END) AS
userBalanceCountByWechat,
SUM(CASE WHEN (aoi.content = '储值卡订单' or aoi.content = '油品充值') and pay_type = 'ALIPAY' THEN pay_money ELSE 0 END)
AS userBalanceByAli,
COUNT(CASE WHEN (aoi.content = '储值卡订单' or aoi.content = '油品充值') and pay_type = 'ALIPAY' THEN 0 END) AS
userBalanceCountByali,
SUM(CASE WHEN aoi.type = '1' THEN pay_money ELSE 0 END) AS oilOrder,
COUNT(CASE WHEN aoi.type = '1' THEN 0 END) AS oilOrderCount,
SUM(CASE WHEN aoi.type = '6' THEN pay_money ELSE 0 END) AS convenienceStore,
COUNT(CASE WHEN aoi.type = '6' THEN 0 END) AS convenienceStoreCount,
SUM(CASE WHEN aoi.type = '4' THEN pay_money ELSE 0 END) AS integral,
COUNT(CASE WHEN aoi.type = '4' THEN 0 END) AS integralCount
from all_order_info aoi
left join mt_user mu ON aoi.user_id = mu.id
LEFT JOIN merchant_config mc on mc.id = aoi.m_id
left join t_account mt on aoi.create_by=mt.acct_id
where
(aoi.status='refund' or aoi.status='refunding') and aoi.store_id=#{allOrderInfo.storeId}
<if test="allOrderInfo.type != null and allOrderInfo.type != ''">
and aoi.type = #{allOrderInfo.type}
</if>
<if test="allOrderInfo.orderNo != null and allOrderInfo.orderNo != ''">
and aoi.order_no like concat('%', #{allOrderInfo.orderNo}, '%')
</if>
<if test="allOrderInfo.staffId != null and allOrderInfo.staffId != ''">
and aoi.create_by =#{allOrderInfo.staffId}
</if>
<if test="allOrderInfo.paymentChannel != null and allOrderInfo.paymentChannel != ''">
and aoi.payment_channel =#{allOrderInfo.paymentChannel}
</if>
<if test="allOrderInfo.payChannel != null and allOrderInfo.payChannel != ''">
and aoi.pay_channel = #{allOrderInfo.payChannel}
</if>
<if test="allOrderInfo.payType != null and allOrderInfo.payType != ''">
and aoi.pay_type = #{allOrderInfo.payType}
</if>
<if test="allOrderInfo.status != null and allOrderInfo.status != ''">
and aoi.status = #{allOrderInfo.status}
</if>
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
<![CDATA[ and aoi.create_time >= #{beginTime}]]>
</if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
<![CDATA[and aoi.create_time <= #{endTime}]]>
</if>
</select>
</mapper>

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
View File

@ -81,9 +81,9 @@ public interface AllOrderInfoService {
Map<String,String> getOrderInfo(String orderNo, String type);
AllOrderInfoVo getTradingData(AllOrderInfoDto allOrderInfo);
AllOrderInfoVo getTradingsData(AllOrderInfoDto allOrderInfo);
IPage<AllOrderInfoVo> gettradingListPage(Page page, AllOrderInfoDto allOrderInfo);
IPage<AllOrderInfoVo> getTradingPage(Page page, AllOrderInfoDto allOrderInfo);
IPage<AllOrderInfoVo> transactionList(Page page, AllOrderInfoRes allOrderInfoRes);
IPage<SysDeptVo> runningWaterByInstituion(Page page, AllOrderInfoDto allOrderInfo);

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

@ -70,6 +70,7 @@ import com.fuint.repository.mapper.MtStaffMapper;
import com.fuint.repository.mapper.MtUserMapper;
import com.fuint.repository.model.MtStaff;
import com.fuint.repository.model.MtUser;
import com.fuint.repository.model.TAccount;
import com.fuint.system.dept.entity.SysDept;
import com.fuint.system.dept.mapper.SysDeptMapper;
import com.fuint.system.dept.service.ISysDeptService;
@ -869,6 +870,15 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
return allOrderInfoMapper.getTradingData(allOrderInfo);
}
public AllOrderInfoVo getTradingsData(AllOrderInfoDto allOrderInfo) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
allOrderInfo.setStoreId(nowAccountInfo.getStoreId());
return allOrderInfoMapper.getTradingsData(allOrderInfo,
allOrderInfo.getDataRange()==null?"":allOrderInfo.getDataRange()[0],
allOrderInfo.getDataRange()==null?"":allOrderInfo.getDataRange()[1]);
}
@Resource
MtStaffMapper mtStaffMapper;
@ -953,6 +963,18 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
return pageList;
}
@Override
public IPage<AllOrderInfoVo> gettradingListPage(Page page, AllOrderInfoDto allOrderInfo) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
allOrderInfo.setStoreId(nowAccountInfo.getStoreId());
IPage<AllOrderInfoVo> pageList = allOrderInfoMapper.gettradingListPage(page, allOrderInfo,
allOrderInfo.getDataRange()==null?"":allOrderInfo.getDataRange()[0],
allOrderInfo.getDataRange()==null?"":allOrderInfo.getDataRange()[1]);
return pageList;
}
@Override
public IPage<AllOrderInfoVo> transactionList(Page page, AllOrderInfoRes allOrderInfoRes) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
@ -961,7 +983,6 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
IPage<AllOrderInfoVo> allOrderInfoVoIPage = super.baseMapper.transactionList(page, allOrderInfoRes,
allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[0],
allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[1]);
return allOrderInfoVoIPage;
}
@ -2491,7 +2512,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
public List getStaffByStorId() {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
nowAccountInfo.getStoreId();
List<MtStaff> mtStaffs= mtStaffMapper.getStaffByStorId(nowAccountInfo.getStoreId());
List<TAccount> mtStaffs= mtStaffMapper.getStaffByStorId(nowAccountInfo.getStoreId());
return mtStaffs;
}

14
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java
View File

@ -92,4 +92,18 @@ public class AllOrderInfoVo extends AllOrderInfo {
@TableField(exist = false)
private Double laKaLaCount;
@TableField(exist = false)
private String oilOrder;
@TableField(exist = false)
private String oilOrderCount;
@TableField(exist = false)
private String convenienceStore;
@TableField(exist = false)
private String convenienceStoreCount;
@TableField(exist = false)
private String integral;
@TableField(exist = false)
private String integralCount;
}

2
fuintBackend/fuint-application/src/main/resources/application.properties
View File

@ -1,7 +1,7 @@
# \u57FA\u672C\u914D\u7F6E
server.port=8080
env.profile=dev
env.properties.path=C:/Users/qq244432/Desktop/project/oil-station/fuintBackend/configure/
env.properties.path=D:/work/sw/fuintBackend/configure/
#env.properties.path=F:/work/oilSystem/fuintBackend/configure/
#env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
#env.properties.path=D:/code/bulidmap/oil-station/fuintBackend/configure

4
fuintBackend/fuint-repository/src/main/resources/mapper/MtStaffMapper.xml
View File

@ -16,7 +16,7 @@
<select id="queryStaffById" resultType="com.fuint.repository.model.MtStaff">
select * from mt_staff t where t.id = #{id}
</select>
<select id="getStaffByStorId" resultType="com.fuint.repository.model.MtStaff">
select * from mt_staff t where t.store_id = #{id}
<select id="getStaffByStorId" resultType="com.fuint.repository.model.TAccount">
select * from t_account t where t.store_id = #{id}
</select>
</mapper>