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

bug

Browse Source
This commit is contained in:
cun-nan 2024-05-23 09:26:04 +08:00
parent 14a3c56a73
commit 1b2af2f8a2
26 changed files with 135 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,9 +3,17 @@ import request from '@/utils/request'
// 分页查询
export function getFavourableList(query) {
return request({
url: 'business/allOrderInfo/getPageList',
url: 'business/marketingActivity/favorableRecords',
method: 'get',
params: query
})
}
// 分页查询
export function getCount(query) {
return request({
url: 'business/marketingActivity/favorableRecords/count',
method: 'get',
})
}

129
fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue
View File

@ -36,9 +36,9 @@
<el-form-item label="优惠来源" prop="favFrom">
<el-input v-model="queryParams.favFrom"></el-input>
</el-form-item>
<!-- <el-form-item label="优惠类型" prop="favType">-->
<!-- <el-input v-model="queryParams.favType"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="消费类型" prop="favConsumptionType">
<el-input v-model="queryParams.favConsumptionType"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@ -47,18 +47,18 @@
</el-form-item>
</el-form>
</el-card>
<!-- <el-card class="box-card">-->
<!-- <div class="box-gang">-->
<!-- <div class="box">-->
<!-- <div class="size-hui">总优惠笔数</div>-->
<!-- <div class="size-bole">{{ orderStatistics.cash?orderStatistics.cash:0 }}元/{{orderStatistics.cashcount}}笔</div>-->
<!-- </div>-->
<!-- <div class="box">-->
<!-- <div class="size-hui">总优惠金额</div>-->
<!-- <div class="size-bole">{{ orderStatistics.wechat?orderStatistics.wechat:0 }}元/{{orderStatistics.wechatcount}}笔</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-card>-->
<el-card class="box-card">
<div class="box-gang">
<div class="box">
<div class="size-hui">总优惠笔数</div>
<div class="size-bole">{{ count.count || 0 }}笔</div>
</div>
<div class="box">
<div class="size-hui">总优惠金额</div>
<div class="size-bole">{{ count.allMoney || 0 }}元</div>
</div>
</div>
</el-card>
<el-card class="box-card">
<div class="wgang">
<div>交易明细分析列表</div>
@ -68,54 +68,12 @@
:data="list"
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="payTime" align="center" label="支付时间" width="220"> </el-table-column>
<el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
<el-table-column prop="storeName" align="center" label="门店"> </el-table-column>
<el-table-column prop="createBy" align="center" label="收银员"> </el-table-column>
<el-table-column prop="payChannel" align="center" label="支付渠道"> </el-table-column>
<el-table-column prop="mchntCd" align="center" label="商户号"> </el-table-column>
<el-table-column prop="amount" align="center" label="费率"> </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="amount" align="center" label="所属模块"> </el-table-column>-->
<el-table-column prop="payType" align="center" label="支付方式">
<template slot-scope="scope">
<span v-if="scope.row.payType=='CASH'">现金</span>
<span v-else-if="scope.row.payType=='WECHAT'">微信</span>
<span v-else-if="scope.row.payType=='ALIPAY'">支付宝</span>
<span v-else="">余额</span>
</template>
</el-table-column>
<el-table-column prop="status" 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 type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>
<el-table-column prop="goodsMoney" align="center" label="订单金额"> </el-table-column>
<el-table-column prop="payMoney" align="center" label="优惠后应付金额"> </el-table-column>
<el-table-column prop="refMoney" align="center" label="退款金额">
<template slot-scope="scope">
<span v-if="scope.row.status == 'refund'">{{scope.row.payMoney}}</span>
<span type="danger" v-else>--</span>
</template>
</el-table-column>
<el-table-column prop="payMoney" align="center" label="实收金额"> </el-table-column>
<!-- <el-table-column prop="payAmount" align="center" label="手续费"> </el-table-column>-->
<el-table-column prop="userName" align="center" label="付款用户" > </el-table-column>
<el-table-column prop="content" align="content" label="备注" > </el-table-column>
<el-table-column prop="favType" align="center" label="优惠类型" width="220"> </el-table-column>
<el-table-column prop="favFrom" align="center" label="优惠来源"> </el-table-column>
<el-table-column prop="favMoney" align="center" label="优惠金额"> </el-table-column>
<el-table-column prop="favConsumptionType" align="center" label="消费类型"> </el-table-column>
<el-table-column prop="createTime" align="center" label="创建时间"> </el-table-column>
</el-table>
</div>
<!-- <div class="pagination-box">-->
@ -144,6 +102,8 @@
<script>
import {getCount, getFavourableList} from "@/api/favourable/favourable";
export default {
name: "reconciliation-favourable",
data(){
@ -159,11 +119,29 @@ export default {
dateRange: [],
beginTime:"",
endTime:"",
count:{}
}
},
created() {
this.getList();
},
methods:{
getList(){
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFavourableList(this.addDateRange(this.queryParams,dateRange)).then(res => {
this.list = res.data.records
this.total = res.data.total
})
this.getCount()
},
getCount(){
getCount(this.addDateRange(this.queryParams)).then(res => {
this.count = res.data
})
},
// 搜索按钮操作
handleQuery() {
@ -198,4 +176,29 @@ export default {
<style lang="scss" scoped>
.box-card{
width: 100%;
margin-bottom: 15px;
}
.box-gang{
width: 100%;
display: flex;
align-items: center;
}
.box{
width: 200px;
box-sizing: border-box;
padding: 10px;
background: #f9f9f9;
height: 86px;
margin-right: 10px;
}
.size-hui{
font-size: 14px;
margin-bottom: 10px;
margin-top: 10px;
}
.size-bole{
font-weight: bold;
}
</style>

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/controller/FavorableRecordsController.java
View File

@ -38,7 +38,7 @@ public class FavorableRecordsController extends BaseController {
* @return
*/
@GetMapping
public ResponseObject selectAll(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
public ResponseObject selectAll(@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
@Param("cardValueOrders") FavorableRecords favorableRecords) {
Page page = new Page(pageNo, pageSize);

16
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/service/impl/FavorableRecordsServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.fuint.business.marketingActivity.favorableRecords.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -16,6 +17,8 @@ import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -55,9 +58,12 @@ public class FavorableRecordsServiceImpl extends ServiceImpl<FavorableRecordsMap
LambdaQueryWrapper<FavorableRecords> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(FavorableRecords::getStoreId, nowAccountInfo.getStoreId());
queryWrapper.eq(FavorableRecords::getChainStoreId, nowAccountInfo.getChainStoreId());
queryWrapper.eq(FavorableRecords::getFavFrom, favorableRecords.getFavFrom());
queryWrapper.eq(FavorableRecords::getFavType, favorableRecords.getFavType());
queryWrapper.eq(FavorableRecords::getFavConsumptionType, favorableRecords.getFavConsumptionType());
if (ObjectUtil.isNotEmpty(favorableRecords.getFavFrom()))
queryWrapper.eq(FavorableRecords::getFavFrom, favorableRecords.getFavFrom());
if (ObjectUtil.isNotEmpty(favorableRecords.getFavType()))
queryWrapper.eq(FavorableRecords::getFavType, favorableRecords.getFavType());
if (ObjectUtil.isNotEmpty(favorableRecords.getFavConsumptionType()))
queryWrapper.eq(FavorableRecords::getFavConsumptionType, favorableRecords.getFavConsumptionType());
IPage page1 = page(page, queryWrapper);
return page1;
}
@ -79,7 +85,9 @@ public class FavorableRecordsServiceImpl extends ServiceImpl<FavorableRecordsMap
for (FavorableRecords records : list) {
allTotalCount += records.getFavMoney();
}
objectObjectHashMap.put("allMoney",allTotalCount);
BigDecimal bd = BigDecimal.valueOf(allTotalCount).setScale(2, RoundingMode.HALF_UP);
double roundedValue = bd.doubleValue();
objectObjectHashMap.put("allMoney",roundedValue);
return objectObjectHashMap;
}

8
fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/AccountDto.java
View File

@ -1,10 +1,13 @@
package com.fuint.common.dto;
import lombok.Data;
import java.util.Date;
/**
* 后台账户实体类
*/
@Data
public class AccountDto {
/**
@ -21,6 +24,11 @@ public class AccountDto {
* 账户名称
*/
private String accountName;
/**
* 头像
*/
private String avatar;
/**
* 密码
*/

1
fuintBackend/fuint-application/src/main/java/com/fuint/system/user/controller/BackendAccountController.java
View File

@ -150,6 +150,7 @@ public class BackendAccountController extends BaseController {
accountDto.setAccountStatus(tAccount.getAccountStatus());
// accountDto.setCreateDate(tAccount.getCreateTime());
accountDto.setRealName(tAccount.getRealName());
accountDto.setAvatar(tAccount.getAvatar());
// accountDto.setModifyDate(tAccount.getUpdateTime());
accountDto.setStaffId(tAccount.getStaffId());
accountDto.setMerchantId(tAccount.getMerchantId());

19
pos-uni/pages/my/my.vue
View File

@ -3,14 +3,17 @@
<view class="container">
<headers :titles="titles"></headers>
<view class="top-box">
<view class="title_top">京博加油站</view>
<view class="title_top">{{userInfo.storeName || "京博加油站"}}</view>
<view class="user_info">
<view class="user_head">
<view class="user_head" v-if="userInfo.avatar">
<image :src="baseUrl + userInfo.avatar" mode=""></image>
</view>
<view class="user_head" v-else>
<image src="../../static/imgs/mm.jpg" mode=""></image>
</view>
<view class="">
<view class="user_anme">柳如烟</view>
<view class="user_num">账号：lisha99587</view>
<view class="user_anme">{{userInfo.realName}}</view>
<view class="user_num">账号：{{userInfo.accountName}}</view>
</view>
</view>
<view class="jg-box">
@ -53,6 +56,8 @@
export default {
data() {
return {
// url信息
baseUrl: this.$baseUrl,
titles: "",
msg: "1",
List: [],
@ -84,10 +89,10 @@
// 获取用户登录信息
getUserInfo(){
request({
url: 'backendApi/login/doLoginApp',
method: 'post',
url: 'backendApi/account/info/'+uni.getStorageSync("accountId"),
method: 'get',
}).then((res) => {
this.userInfo = res.data
this.userInfo = res.data.account
})
},
gologin() {

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/components/header/headers.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/components/tabbar/tabbar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/AddVip/AddVip.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/BusinessData/BusinessData.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/CardPayment/CardPayment.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/Collection/Collection.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/MemberRecharge/MemberRecharge.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/MemberRecharge/list.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/PaymentResults/PaymentResults.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/changeShifts/changeShifts.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/orderList/orderList.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/searchVip/searchVip.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
pos-uni/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map vendored
View File

File diff suppressed because one or more lines are too long

11
pos-uni/unpackage/dist/dev/mp-weixin/pages/my/my.js vendored
View File

@ -217,6 +217,9 @@ var _request = _interopRequireDefault(__webpack_require__(/*! ../../utils/reques
//
//
//
//
//
//
var headers = function headers() {
__webpack_require__.e(/*! require.ensure | components/header/headers */ "components/header/headers").then((function () {
return resolve(__webpack_require__(/*! ../../components/header/headers.vue */ 291));
@ -230,6 +233,8 @@ var tabbar = function tabbar() {
var _default = {
data: function data() {
return {
// url信息
baseUrl: this.$baseUrl,
titles: "",
msg: "1",
List: [],
@ -262,10 +267,10 @@ var _default = {
getUserInfo: function getUserInfo() {
var _this = this;
(0, _request.default)({
url: 'backendApi/login/doLoginApp',
method: 'post'
url: 'backendApi/account/info/' + uni.getStorageSync("accountId"),
method: 'get'
}).then(function (res) {
_this.userInfo = res.data;
_this.userInfo = res.data.account;
});
},
gologin: function gologin() {

2
pos-uni/unpackage/dist/dev/mp-weixin/pages/my/my.wxml vendored
View File

@ -1 +1 @@
<view class="content data-v-0be17cc6"><view class="container data-v-0be17cc6"><headers vue-id="704e9d00-1" titles="{{titles}}" class="data-v-0be17cc6" bind:__l="__l"></headers><view class="top-box data-v-0be17cc6"><view class="title_top data-v-0be17cc6">京博加油站</view><view class="user_info data-v-0be17cc6"><view class="user_head data-v-0be17cc6"><image src="../../static/imgs/mm.jpg" mode class="data-v-0be17cc6"></image></view><view class="data-v-0be17cc6"><view class="user_anme data-v-0be17cc6">柳如烟</view><view class="user_num data-v-0be17cc6">账号：lisha99587</view></view></view><view class="jg-box data-v-0be17cc6"><view class="h-box data-v-0be17cc6"><view class="data-v-0be17cc6">消息通知</view><u-icon vue-id="704e9d00-2" name="arrow-right" size="18" class="data-v-0be17cc6" bind:__l="__l"></u-icon></view><view class="h-box data-v-0be17cc6"><view class="data-v-0be17cc6">服务条款</view><u-icon vue-id="704e9d00-3" name="arrow-right" size="18" class="data-v-0be17cc6" bind:__l="__l"></u-icon></view><view class="h-box data-v-0be17cc6"><view class="data-v-0be17cc6">关于我们</view><u-icon vue-id="704e9d00-4" name="arrow-right" size="18" class="data-v-0be17cc6" bind:__l="__l"></u-icon></view><view class="h-box data-v-0be17cc6"><view class="data-v-0be17cc6">隐私协议</view><u-icon vue-id="704e9d00-5" name="arrow-right" size="18" class="data-v-0be17cc6" bind:__l="__l"></u-icon></view><view class="h-box data-v-0be17cc6" style="border:none;"><view class="data-v-0be17cc6">当前版本</view><view class="b_ data-v-0be17cc6">1.0.0</view></view></view></view><view data-event-opts="{{[['tap',[['gologin']]]]}}" class="anniu data-v-0be17cc6" bindtap="__e">退出登录</view></view><tabbar vue-id="704e9d00-6" msg="{{msg}}" class="data-v-0be17cc6" bind:__l="__l"></tabbar></view>
<view class="content data-v-0be17cc6"><view class="container data-v-0be17cc6"><headers vue-id="704e9d00-1" titles="{{titles}}" class="data-v-0be17cc6" bind:__l="__l"></headers><view class="top-box data-v-0be17cc6"><view class="title_top data-v-0be17cc6">{{userInfo.storeName||"京博加油站"}}</view><view class="user_info data-v-0be17cc6"><block wx:if="{{userInfo.avatar}}"><view class="user_head data-v-0be17cc6"><image src="{{baseUrl+userInfo.avatar}}" mode class="data-v-0be17cc6"></image></view></block><block wx:else><view class="user_head data-v-0be17cc6"><image src="../../static/imgs/mm.jpg" mode class="data-v-0be17cc6"></image></view></block><view class="data-v-0be17cc6"><view class="user_anme data-v-0be17cc6">{{userInfo.realName}}</view><view class="user_num data-v-0be17cc6">{{"账号："+userInfo.accountName}}</view></view></view><view class="jg-box data-v-0be17cc6"><view class="h-box data-v-0be17cc6"><view class="data-v-0be17cc6">消息通知</view><u-icon vue-id="704e9d00-2" name="arrow-right" size="18" class="data-v-0be17cc6" bind:__l="__l"></u-icon></view><view class="h-box data-v-0be17cc6"><view class="data-v-0be17cc6">服务条款</view><u-icon vue-id="704e9d00-3" name="arrow-right" size="18" class="data-v-0be17cc6" bind:__l="__l"></u-icon></view><view class="h-box data-v-0be17cc6"><view class="data-v-0be17cc6">关于我们</view><u-icon vue-id="704e9d00-4" name="arrow-right" size="18" class="data-v-0be17cc6" bind:__l="__l"></u-icon></view><view class="h-box data-v-0be17cc6"><view class="data-v-0be17cc6">隐私协议</view><u-icon vue-id="704e9d00-5" name="arrow-right" size="18" class="data-v-0be17cc6" bind:__l="__l"></u-icon></view><view class="h-box data-v-0be17cc6" style="border:none;"><view class="data-v-0be17cc6">当前版本</view><view class="b_ data-v-0be17cc6">1.0.0</view></view></view></view><view data-event-opts="{{[['tap',[['gologin']]]]}}" class="anniu data-v-0be17cc6" bindtap="__e">退出登录</view></view><tabbar vue-id="704e9d00-6" msg="{{msg}}" class="data-v-0be17cc6" bind:__l="__l"></tabbar></view>