1
This commit is contained in:
zhaohengkun
parent
dc6551a581
commit
bafcf724f1
@ -36,6 +36,17 @@ export function getTradingPageApi(query) {
|
||||
|
||||
})
|
||||
}
|
||||
// 油站端 - 财务报表 -交易对账-交易明细 表格数据
|
||||
export function transactionList(query) {
|
||||
return request({
|
||||
url: 'business/allOrderInfo/transactionList',
|
||||
method: 'get',
|
||||
params: query
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
export function getInstituionListApi(query) {
|
||||
return request({
|
||||
url: 'business/allOrderInfo/runningWaterByInstituion',
|
||||
@ -107,6 +118,15 @@ export function getTissueByDataApi(query) {
|
||||
|
||||
})
|
||||
}
|
||||
// 油站端- 交易明细-统计数据
|
||||
export function orderStatistics(query) {
|
||||
return request({
|
||||
url: 'business/allOrderInfo/orderStatistics',
|
||||
method: 'get',
|
||||
params: query
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
export function exportExcelTradingApi(data) {
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
<el-select
|
||||
v-model="queryParams.payChannel"
|
||||
clearable
|
||||
placeholder="请选择订单类型"
|
||||
placeholder="请选择订单类型啊"
|
||||
>
|
||||
<el-option label="小程序" value="applet"/>
|
||||
<el-option label="收银台" value="cashier"/>
|
||||
@ -112,8 +112,8 @@
|
||||
<div class="wit_box">
|
||||
<div class="box-gang">
|
||||
<div class="box">
|
||||
<el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start" >
|
||||
<div class="size-bole">{{ wechat}}/{{ wechats}}</div>
|
||||
<el-tooltip class="item" effect="dark" placement="top-start">
|
||||
<div class="size-bole">{{ map.s1 || 0 }}/{{ map.s2 || 0 }}</div>
|
||||
</el-tooltip>
|
||||
<div class="size-hui">
|
||||
<div class="dian" style="background: #0DC291"></div>
|
||||
@ -121,8 +121,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="box">
|
||||
<el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
|
||||
<div class="size-bole" style="color:#00CAFF;">{{ orderStatistics.alipay?orderStatistics.alipay:0 }}/0</div>
|
||||
<el-tooltip class="item" effect="dark" placement="top-start">
|
||||
<div class="size-bole" style="color:#00CAFF;">{{ map.s3 || 0 }}/{{ map.s4 || 0 }}</div>
|
||||
</el-tooltip>
|
||||
|
||||
<div class="size-hui">
|
||||
@ -131,28 +131,19 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="box">
|
||||
<el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
|
||||
<div class="size-bole" style="color:#F44522;" >{{ orderStatistics.balance?orderStatistics.balance:0 }}/0</div>
|
||||
<el-tooltip class="item" effect="dark" placement="top-start">
|
||||
<div class="size-bole" style="color:#F44522;">{{ map.s5 || 0 }}/{{ map.s6 || 0 }}</div>
|
||||
</el-tooltip>
|
||||
|
||||
<div class="size-hui">
|
||||
<div class="dian" style="background: #F44522"></div>
|
||||
<div class="nei">云闪付收款（元）/笔数</div>
|
||||
<div class="nei">银联二维码（元）/笔数</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box">
|
||||
<el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
|
||||
<div class="size-bole" style="color:#FF7E00;" >{{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}/0</div>
|
||||
</el-tooltip>
|
||||
|
||||
<div class="size-hui">
|
||||
<div class="dian" style="background: #FF7E00"></div>
|
||||
<div class="nei">pos机收款（元）/笔数</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box">
|
||||
<el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
|
||||
<div class="size-bole" style="color:#0D2ED8;">{{ orderStatistics.cash?orderStatistics.cash:0 }}/0</div>
|
||||
<div class="size-bole" style="color:#0D2ED8;">{{ map.s7 || 0 }}/{{ map.s8 || 0 }}</div>
|
||||
</el-tooltip>
|
||||
|
||||
|
||||
@ -162,8 +153,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="box">
|
||||
<el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
|
||||
<div class="size-bole" style="color:#790DD8;">{{orderStatistics.cashcount?orderStatistics.cashcount:0}}/0</div>
|
||||
<el-tooltip class="item" effect="dark" placement="top-start">
|
||||
<div class="size-bole" style="color:#790DD8;">{{ map.s9 || 0 }}/{{ map.s10 || 0 }} </div>
|
||||
</el-tooltip>
|
||||
|
||||
<div class="size-hui">
|
||||
@ -172,8 +163,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="box">
|
||||
<el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
|
||||
<div class="size-bole" style="color:#D80D54;">999999/999999999999</div>
|
||||
<el-tooltip class="item" effect="dark" placement="top-start">
|
||||
<div class="size-bole" style="color:#D80D54;">{{ map.s11 || 0 }}/{{ map.s12 || 0 }}</div>
|
||||
</el-tooltip>
|
||||
|
||||
<div class="size-hui">
|
||||
@ -200,26 +191,29 @@
|
||||
</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-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>
|
||||
<span v-else-if="scope.row.type=='8'">POS订单</span>
|
||||
<span v-else>其他</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="goodsMoney" align="center" label="订单金额（元）">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.type=='3'">{{scope.row.goodsMoney + scope.row.payMoney}}</span>
|
||||
<span v-else>{{scope.row.goodsMoney}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="payMoney" align="center" label="优惠金额（元）"> </el-table-column>
|
||||
<el-table-column prop="discountAmount" align="center" label="优惠金额（元）"></el-table-column>
|
||||
<el-table-column prop="payMoney" align="center" label="实收金额（元）"></el-table-column>
|
||||
<el-table-column prop="payMoney" align="center" label="会员付款金额（元）"></el-table-column>
|
||||
<el-table-column prop="payMoney" align="center" label="挂账/归还金额（元）"> </el-table-column>
|
||||
|
||||
<el-table-column prop="payMoney" align="center" label="归还金额（元）">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.type == 7">{{ scope.row.goodsMoney}}</span>
|
||||
<span v-else> -- </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="userName" align="center" label="付款用户"></el-table-column>
|
||||
<el-table-column prop="payType" align="center" label="支付方式">
|
||||
<template slot-scope="scope">
|
||||
@ -237,7 +231,7 @@
|
||||
<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="merchantName" 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>
|
||||
|
||||
@ -304,18 +298,16 @@
|
||||
<script>
|
||||
|
||||
import {
|
||||
exportExcelTradingApi, getmyDataApi,
|
||||
getRunningWaterByTissueApi,
|
||||
getTissueByDataApi,
|
||||
getTradingPageApi
|
||||
exportExcelTradingApi,
|
||||
orderStatistics,
|
||||
transactionList
|
||||
} from "@/api/allOrder";
|
||||
|
||||
export default {
|
||||
name: "reconciliation-trading",
|
||||
data() {
|
||||
return {
|
||||
wechat:999999999999999,
|
||||
wechats:999999999999999,
|
||||
map:{},
|
||||
radio1: "油号选错",
|
||||
loading: false,
|
||||
dialogVisible: false,
|
||||
@ -378,14 +370,7 @@ import {
|
||||
},
|
||||
methods: {
|
||||
async getDeptList() {
|
||||
// getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
|
||||
// this.deptList = response.data.records;
|
||||
// })
|
||||
await getmyDataApi(this.addDateRange(this.queryParams)).then( response => {
|
||||
this.queryParams.deptId = response.data.deptId;
|
||||
this.getList()
|
||||
|
||||
})
|
||||
},
|
||||
exportExcelCashier() {
|
||||
let dateRange = []
|
||||
@ -401,31 +386,27 @@ import {
|
||||
// 获取订单统计信息
|
||||
|
||||
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=>{
|
||||
this.orderStatistics = res.data
|
||||
orderStatistics(this.addDateRange(this.queryParams, dateRange)).then(res => {
|
||||
this.map = 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 => {
|
||||
transactionList(this.addDateRange(this.queryParams, dateRange)).then(response => {
|
||||
this.orderList = response.data.records;
|
||||
this.total = response.data.total;
|
||||
this.isSysDate = false
|
||||
// this.getDeptList()
|
||||
this.getOrderStatistics()
|
||||
|
||||
})
|
||||
@ -466,6 +447,7 @@ import {
|
||||
padding-bottom: 8px;
|
||||
//height: 87.5vh;
|
||||
}
|
||||
|
||||
.app-top {
|
||||
width: 100%;
|
||||
|
||||
@ -473,20 +455,24 @@ import {
|
||||
box-sizing: border-box;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.clearfix {
|
||||
width: 100%;
|
||||
|
||||
}
|
||||
|
||||
.box-card {
|
||||
width: 100%;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.box-gang {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.box {
|
||||
//box-sizing: border-box;
|
||||
padding: 5px;
|
||||
@ -500,6 +486,7 @@ import {
|
||||
border: 1px solid #FF9655;
|
||||
|
||||
}
|
||||
|
||||
.size-hui {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -516,6 +503,7 @@ import {
|
||||
width: 150px;
|
||||
}
|
||||
}
|
||||
|
||||
.dian {
|
||||
width: 6px;
|
||||
height: 6px;
|
||||
@ -527,12 +515,14 @@ import {
|
||||
margin-bottom: 15px;
|
||||
margin-right: 21px;
|
||||
}
|
||||
|
||||
.icon-img {
|
||||
|
||||
//margin-left: 110px;
|
||||
width: 100%;
|
||||
height: 20px;
|
||||
margin-right: 5px;
|
||||
|
||||
img {
|
||||
float: right;
|
||||
//width: 100%;
|
||||
@ -541,11 +531,13 @@ import {
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.f-button {
|
||||
width: 100%;
|
||||
float: right;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.size-bole {
|
||||
//font-weight: bold;
|
||||
|
||||
@ -564,6 +556,7 @@ import {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.wgang {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
@ -572,11 +565,13 @@ import {
|
||||
margin-bottom: 20px;
|
||||
|
||||
}
|
||||
|
||||
.table-box {
|
||||
width: 100%;
|
||||
height: 58vh;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.pagination-box {
|
||||
width: 100%;
|
||||
margin: 10px auto;
|
||||
@ -584,14 +579,17 @@ import {
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.top-app-sou {
|
||||
width: 20%;
|
||||
}
|
||||
|
||||
.tk {
|
||||
text-align: center;
|
||||
color: grey;
|
||||
margin: 10px 0;
|
||||
}
|
||||
|
||||
.new-top {
|
||||
width: 98%;
|
||||
background: #FFFFFF;
|
||||
@ -602,6 +600,7 @@ import {
|
||||
border-radius: 4px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
.wit_box {
|
||||
width: 98%;
|
||||
background: #FFFFFF;
|
||||
|
||||
@ -58,6 +58,18 @@ public class CardCouponUserController extends BaseController {
|
||||
return getSuccessResult(this.cardCouponUserService.getById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过主键查询 单条数据 并关联查询优惠券名称
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 单条数据
|
||||
*/
|
||||
@GetMapping("/selectOneCardName")
|
||||
public ResponseObject selectOneCardName(@RequestParam("id") Serializable id) {
|
||||
return getSuccessResult(this.cardCouponUserService.selectOneCardName(Integer.parseInt(id.toString())));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 新增数据
|
||||
*
|
||||
|
||||
@ -48,5 +48,10 @@ public interface CardCouponUserMapper extends BaseMapper<CardCouponUser> {
|
||||
List<Map<String, Object>> selectUserCardVerification(@Param("str") String str);
|
||||
|
||||
CardCouponUser selectByOrderId(String orderNo);
|
||||
|
||||
CardCouponUserVo selectOneCardName(Integer id);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -2,19 +2,17 @@
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.fuint.business.marketingActivity.cardCoupon.mapper.CardCouponUserMapper">
|
||||
<select id="selectAllList" resultType="com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponVO">
|
||||
SELECT
|
||||
cc.*,
|
||||
SELECT cc.*,
|
||||
main.id AS dataId,
|
||||
main.mt_user_id AS mtUserId
|
||||
FROM
|
||||
card_coupon_user main
|
||||
FROM card_coupon_user main
|
||||
INNER JOIN card_coupon cc ON main.card_coupon_id = cc.id
|
||||
WHERE
|
||||
main.store_id = #{storeId}
|
||||
WHERE main.store_id = #{storeId}
|
||||
AND main.mt_user_id = #{userId}
|
||||
AND main.`status` = '0'
|
||||
AND cc.`type` != '2'
|
||||
AND main.start_time <= #{nowDate} AND main.end_time >= #{nowDate}
|
||||
AND main.start_time <= #{nowDate}
|
||||
AND main.end_time >= #{nowDate}
|
||||
</select>
|
||||
<select id="queryPage" resultType="com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponUserVo">
|
||||
SELECT ccu.*,cc.`name` couponName,cc.type,cc.use_condition FROM card_coupon_user ccu
|
||||
@ -30,11 +28,11 @@
|
||||
</where>
|
||||
</select>
|
||||
<select id="selectCouponCount" resultType="com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponUniVo">
|
||||
SELECT
|
||||
card_coupon_id id,
|
||||
SELECT card_coupon_id id,
|
||||
count(1) count
|
||||
FROM card_coupon_user
|
||||
WHERE store_id = #{storeId} AND mt_user_id = #{userId}
|
||||
WHERE store_id = #{storeId}
|
||||
AND mt_user_id = #{userId}
|
||||
group by card_coupon_id
|
||||
</select>
|
||||
<select id="selectCardCouponUserList"
|
||||
@ -56,24 +54,31 @@
|
||||
</where>
|
||||
</select>
|
||||
<select id="selectUserCardVerification" resultType="map">
|
||||
SELECT
|
||||
userCard.id as id ,
|
||||
SELECT userCard.id as id,
|
||||
mtUser.NAME as mobile,
|
||||
userCard.verification_code as ticketCode,
|
||||
card.name as exchangeName,
|
||||
card.exchange_content as exchangeContent
|
||||
FROM
|
||||
( SELECT * FROM card_coupon_user WHERE mobile = #{str} OR verification_code = #{str} ) userCard
|
||||
FROM (SELECT * FROM card_coupon_user WHERE mobile = #{str} OR verification_code = #{str}) userCard
|
||||
INNER JOIN card_coupon card ON userCard.card_coupon_id = card.id
|
||||
LEFT JOIN mt_user mtUser ON mtUser.id = userCard.mt_user_id
|
||||
WHERE
|
||||
card.type IN ( 2, 5 )
|
||||
WHERE card.type IN (2, 5)
|
||||
AND userCard.STATUS = 0
|
||||
AND userCard.start_time <= NOW() AND userCard.end_time >= NOW()
|
||||
AND userCard.start_time <= NOW()
|
||||
AND userCard.end_time >= NOW()
|
||||
</select>
|
||||
<select id="selectByOrderId"
|
||||
resultType="com.fuint.business.marketingActivity.cardCoupon.entity.CardCouponUser">
|
||||
select * from card_coupon_user where order_id = #{orderId}
|
||||
select *
|
||||
from card_coupon_user
|
||||
where order_id = #{orderId}
|
||||
</select>
|
||||
<select id="selectOneCardName"
|
||||
resultType="com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponUserVo">
|
||||
select cu.*, cc.name as couponName
|
||||
from card_coupon_user cu
|
||||
JOIN card_coupon cc on cu.card_coupon_id = cc.id
|
||||
where cu.id = #{id}
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
@ -21,6 +21,10 @@ import java.util.Map;
|
||||
public interface CardCouponUserService extends IService<CardCouponUser> {
|
||||
|
||||
|
||||
|
||||
CardCouponUserVo selectOneCardName(Integer id);
|
||||
|
||||
|
||||
List<CardCouponUser> selectByMap(Map<String,Object> map);
|
||||
|
||||
/**
|
||||
|
||||
@ -36,6 +36,12 @@ public class CardCouponUserServiceImpl extends ServiceImpl<CardCouponUserMapper,
|
||||
@Autowired
|
||||
private CardCouponUserMapper cardCouponUserMapper;
|
||||
|
||||
@Override
|
||||
public CardCouponUserVo selectOneCardName(Integer id) {
|
||||
CardCouponUserVo cardCouponUserVo = super.baseMapper.selectOneCardName(id);
|
||||
return cardCouponUserVo;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<CardCouponUser> selectByMap(Map<String, Object> map) {
|
||||
return baseMapper.selectByMap(map);
|
||||
|
||||
@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.fuint.business.integral.entity.IntegralDetail;
|
||||
import com.fuint.business.order.dto.AllOrderInfoDto;
|
||||
import com.fuint.business.order.dto.AllOrderInfoRes;
|
||||
import com.fuint.business.order.entity.AllOrderInfo;
|
||||
import com.fuint.business.order.entity.CardBalanceChange;
|
||||
import com.fuint.business.order.entity.CashierOrder;
|
||||
@ -99,6 +100,21 @@ public class AllOrderInfoController extends BaseController {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 退款
|
||||
* @param map
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/cashierRefund")
|
||||
public ResponseObject cashierRefund(@RequestBody Map<String,String> map){
|
||||
try {
|
||||
return getSuccessResult(allOrderInfoService.cashierRefund(map));
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return getFailureResult(500,"退款失败");
|
||||
}
|
||||
|
||||
/**
|
||||
* 退款
|
||||
* @param map
|
||||
@ -109,6 +125,8 @@ public class AllOrderInfoController extends BaseController {
|
||||
return getSuccessResult(allOrderInfoService.refund(map));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@GetMapping("/getOrderInfo")
|
||||
public ResponseObject getOrderInfo(String orderNo, String type) {
|
||||
return getSuccessResult(allOrderInfoService.getOrderInfo(orderNo,type));
|
||||
@ -128,6 +146,21 @@ public class AllOrderInfoController extends BaseController {
|
||||
return getSuccessResult(list);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* 油站端 - 财务报表 -交易对账-交易明细 表格数据
|
||||
*/
|
||||
@GetMapping("/transactionList")
|
||||
public ResponseObject transactionList(AllOrderInfoRes allOrderInfoRes,
|
||||
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
|
||||
Page page =new Page(pageNo,pageSize);
|
||||
IPage<AllOrderInfoVo> list = allOrderInfoService.transactionList(page, allOrderInfoRes);
|
||||
return getSuccessResult(list);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 导出订单
|
||||
* @param response
|
||||
@ -147,6 +180,13 @@ public class AllOrderInfoController extends BaseController {
|
||||
return getSuccessResult(list);
|
||||
}
|
||||
|
||||
// 油站端- 交易明细-统计数据
|
||||
@GetMapping("/orderStatistics")
|
||||
public ResponseObject getTradingData(AllOrderInfoRes allOrderInfoRes){
|
||||
Map<String, Object> map = allOrderInfoService.orderStatistics(allOrderInfoRes);
|
||||
return getSuccessResult(map);
|
||||
}
|
||||
|
||||
/**
|
||||
* 机构流水分析
|
||||
*/
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
package com.fuint.business.order.dto;
|
||||
|
||||
import com.fuint.business.order.entity.AllOrderInfo;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 油站端 - 封装请求参数实体
|
||||
*/
|
||||
@Data
|
||||
public class AllOrderInfoRes extends AllOrderInfo {
|
||||
}
|
||||
@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
@ -47,6 +48,10 @@ public class AllOrderInfo extends BaseEntity implements Serializable {
|
||||
* 店铺id
|
||||
*/
|
||||
private Integer storeId;
|
||||
/**
|
||||
* 找零金额
|
||||
*/
|
||||
private Double seekZero;
|
||||
/**
|
||||
* 原价
|
||||
*/
|
||||
@ -104,6 +109,10 @@ public class AllOrderInfo extends BaseEntity implements Serializable {
|
||||
*支付通道
|
||||
*/
|
||||
private String paymentChannel;
|
||||
/**
|
||||
* 退款金额
|
||||
*/
|
||||
private Double refMoney;
|
||||
/**
|
||||
*商户id
|
||||
*/
|
||||
|
||||
@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.io.Serializable;
|
||||
|
||||
@ -98,7 +99,7 @@ public class CashierOrder extends BaseEntity implements Serializable {
|
||||
/**
|
||||
* 找零金额
|
||||
*/
|
||||
private Double seekZero;
|
||||
private BigDecimal seekZero;
|
||||
/**
|
||||
* 订单状态：已支付、未支付、支付失败
|
||||
*/
|
||||
|
||||
@ -7,6 +7,7 @@ import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrde
|
||||
import com.fuint.business.marketingActivity.cardValueRule.dto.CardValueOrdersDTO;
|
||||
import com.fuint.business.marketingActivity.cardValueRule.vo.CardValueOrdersVo;
|
||||
import com.fuint.business.order.dto.AllOrderInfoDto;
|
||||
import com.fuint.business.order.dto.AllOrderInfoRes;
|
||||
import com.fuint.business.order.entity.AllOrderInfo;
|
||||
import com.fuint.business.order.entity.CardBalanceChange;
|
||||
import com.fuint.business.order.entity.HandoverRecord;
|
||||
@ -107,4 +108,7 @@ public interface AllOrderInfoMapper extends BaseMapper<AllOrderInfo> {
|
||||
Double getCountMemberBalance(@Param("storeId") Integer storeId,@Param("endTime") String endTime);
|
||||
|
||||
AllOrderInfoVo selectByOrderNo(String orderNo);
|
||||
IPage<AllOrderInfoVo> transactionList(Page page,@Param("obj") AllOrderInfoRes allOrderInfoRes);
|
||||
|
||||
Map<String, Object> orderStatistics(@Param("obj") AllOrderInfoRes allOrderInfoRes);
|
||||
}
|
||||
@ -624,16 +624,20 @@
|
||||
</if>
|
||||
and s.if_delete = '0'
|
||||
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
|
||||
and (a.create_time IS NULL OR date_format(a.create_time,'%y%m%d') >= date_format(#{order.params.beginTime},'%y%m%d'))
|
||||
and (a.create_time IS NULL OR date_format(a.create_time,'%y%m%d') >=
|
||||
date_format(#{order.params.beginTime},'%y%m%d'))
|
||||
</if>
|
||||
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
|
||||
and ( a.create_time IS NULL OR date_format(a.create_time,'%y%m%d') <= date_format(#{order.params.endTime},'%y%m%d') )
|
||||
and ( a.create_time IS NULL OR date_format(a.create_time,'%y%m%d') <=
|
||||
date_format(#{order.params.endTime},'%y%m%d') )
|
||||
</if>
|
||||
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
|
||||
and (s.create_time IS NULL OR date_format(s.create_time,'%y%m%d') >= date_format(#{order.params.beginTime},'%y%m%d'))
|
||||
and (s.create_time IS NULL OR date_format(s.create_time,'%y%m%d') >=
|
||||
date_format(#{order.params.beginTime},'%y%m%d'))
|
||||
</if>
|
||||
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
|
||||
and ( s.create_time IS NULL OR date_format(s.create_time,'%y%m%d') <= date_format(#{order.params.endTime},'%y%m%d') )
|
||||
and ( s.create_time IS NULL OR date_format(s.create_time,'%y%m%d') <=
|
||||
date_format(#{order.params.endTime},'%y%m%d') )
|
||||
</if>
|
||||
GROUP BY s.id
|
||||
ORDER BY payMoney DESC
|
||||
@ -729,16 +733,20 @@
|
||||
</if>
|
||||
and s.if_delete = '0'
|
||||
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
|
||||
and (a.create_time IS NULL OR date_format(a.create_time,'%y%m%d') >= date_format(#{order.params.beginTime},'%y%m%d'))
|
||||
and (a.create_time IS NULL OR date_format(a.create_time,'%y%m%d') >=
|
||||
date_format(#{order.params.beginTime},'%y%m%d'))
|
||||
</if>
|
||||
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
|
||||
and ( a.create_time IS NULL OR date_format(a.create_time,'%y%m%d') <= date_format(#{order.params.endTime},'%y%m%d') )
|
||||
and ( a.create_time IS NULL OR date_format(a.create_time,'%y%m%d') <=
|
||||
date_format(#{order.params.endTime},'%y%m%d') )
|
||||
</if>
|
||||
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
|
||||
and (s.create_time IS NULL OR date_format(s.create_time,'%y%m%d') >= date_format(#{order.params.beginTime},'%y%m%d'))
|
||||
and (s.create_time IS NULL OR date_format(s.create_time,'%y%m%d') >=
|
||||
date_format(#{order.params.beginTime},'%y%m%d'))
|
||||
</if>
|
||||
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
|
||||
and ( s.create_time IS NULL OR date_format(s.create_time,'%y%m%d') <= date_format(#{order.params.endTime},'%y%m%d') )
|
||||
and ( s.create_time IS NULL OR date_format(s.create_time,'%y%m%d') <=
|
||||
date_format(#{order.params.endTime},'%y%m%d') )
|
||||
</if>
|
||||
|
||||
</select>
|
||||
@ -842,46 +850,54 @@
|
||||
</if>
|
||||
</select>
|
||||
<select id="getCountMemberBalance" resultType="java.lang.Double">
|
||||
SELECT
|
||||
SUM(CASE WHEN content like '%充值%' THEN pay_money ELSE 0 END) -
|
||||
SELECT SUM(CASE WHEN content like '%充值%' THEN pay_money ELSE 0 END) -
|
||||
SUM(CASE WHEN content like '%订单%' and type = '3' THEN pay_money ELSE 0 END) AS net_pay_money
|
||||
FROM
|
||||
all_order_info
|
||||
WHERE
|
||||
store_id = #{storeId}
|
||||
FROM all_order_info
|
||||
WHERE store_id = #{storeId}
|
||||
AND pay_time < #{endTime};
|
||||
</select>
|
||||
<select id="selectByOrderNo" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
|
||||
select * from all_order_info where order_no = #{orderNo}
|
||||
select *
|
||||
from all_order_info
|
||||
where order_no = #{orderNo}
|
||||
</select>
|
||||
<select id="transactionList" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
|
||||
SELECT
|
||||
ai.*,
|
||||
mu.NAME AS userName,
|
||||
mc.merchant_name as merchantName
|
||||
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
|
||||
<where>
|
||||
<if test="obj.storeId != null and obj.storeId != ''">
|
||||
ai.store_id = #{obj.storeId}
|
||||
</if>
|
||||
|
||||
</where>
|
||||
ORDER BY ai.create_time DESC
|
||||
</select>
|
||||
<select id="orderStatistics" resultType="java.util.Map">
|
||||
SELECT
|
||||
SUM( CASE WHEN ai.pay_type = 'WECHAT' THEN ai.pay_money ELSE 0 END ) AS s1,-- 微信实付
|
||||
SUM( CASE WHEN ai.pay_type = 'WECHAT' THEN 1 ELSE 0 END ) AS s2,-- 微信订单笔数
|
||||
SUM( CASE WHEN ai.pay_type = 'ALIPAY' THEN ai.pay_money ELSE 0 END ) AS s3,-- 支付宝实收
|
||||
SUM( CASE WHEN ai.pay_type = 'ALIPAY' THEN 1 ELSE 0 END ) AS s4,-- 支付宝订单笔数
|
||||
SUM( CASE WHEN ai.pay_type = 'UNIONPAY' THEN ai.pay_money ELSE 0 END ) AS s5,-- 银联实收
|
||||
SUM( CASE WHEN ai.pay_type = 'UNIONPAY' THEN 1 ELSE 0 END ) AS s6,-- 银联订单笔数
|
||||
SUM( CASE WHEN ai.pay_type = 'CASH' THEN ai.pay_money ELSE 0 END ) AS s7,-- 现金实收
|
||||
SUM( CASE WHEN ai.pay_type = 'CASH' THEN 1 ELSE 0 END ) AS s8,-- 订单笔数
|
||||
SUM( CASE WHEN mu.id IS NOT NULL THEN ai.pay_money ELSE 0 END ) AS s9,-- 会员实收
|
||||
SUM( CASE WHEN mu.id IS NOT NULL THEN 1 ELSE 0 END ) AS s10,-- 会员订单笔数
|
||||
SUM( CASE WHEN ai.pay_type = 'after_pay' THEN ai.pay_money ELSE 0 END ) AS s11,-- 挂账实收
|
||||
SUM( CASE WHEN ai.pay_type = 'after_pay' THEN 1 ELSE 0 END ) AS s12 -- 挂账订单笔数
|
||||
|
||||
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
|
||||
</select>
|
||||
|
||||
<!-- <where>-->
|
||||
<!-- store_id = #{order.storeId}-->
|
||||
<!-- <if test="order.params.beginTime != null and order.params.beginTime != ''"><!– 开始时间检索 –>-->
|
||||
<!-- and date_format(create_time,'%y%m%d') >= 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') <= date_format(#{order.params.endTime},'%y%m%d')-->
|
||||
<!-- </if>-->
|
||||
<!-- </where>-->
|
||||
<!-- SUM(CASE WHEN transaction_type = 'sale' THEN amount ELSE 0 END) AS total_sales-->
|
||||
|
||||
<!-- COUNT(CASE WHEN pay_type = 'WECHAT' THEN 0 END) AS wechat, -- 微信-->
|
||||
|
||||
<!-- WHERE-->
|
||||
<!-- DATE(pay_time) = CURDATE();-->
|
||||
<!-- <if test="startTime != null "><!– 开始时间检索 –>-->
|
||||
<!-- and date_format(pay_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')-->
|
||||
<!-- </if>-->
|
||||
<!-- <if test="endTime != null "><!– 结束时间检索 –>-->
|
||||
<!-- and date_format(pay_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')-->
|
||||
<!-- </if>-->
|
||||
|
||||
|
||||
<!-- <if test="startTime1 != null and startTime1 != ''">-->
|
||||
<!-- AND pay_time >= #{startTime1} -- 开始时间检索-->
|
||||
<!-- </if>-->
|
||||
<!-- <if test="endTime1 != null and endTime1 != ''">-->
|
||||
<!-- AND pay_time <= #{endTime} -- 结束时间检索-->
|
||||
<!-- </if>-->
|
||||
</mapper>
|
||||
|
||||
@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders;
|
||||
import com.fuint.business.order.dto.AllOrderInfoDto;
|
||||
import com.fuint.business.order.dto.AllOrderInfoRes;
|
||||
import com.fuint.business.order.entity.AllOrderInfo;
|
||||
import com.fuint.business.order.entity.CashierOrder;
|
||||
import com.fuint.business.order.entity.HandoverRecord;
|
||||
@ -18,6 +19,9 @@ import java.util.Map;
|
||||
@Transactional
|
||||
public interface AllOrderInfoService {
|
||||
|
||||
|
||||
Map<String, Object> orderStatistics(AllOrderInfoRes allOrderInfoRes);
|
||||
|
||||
/**
|
||||
* 分页查询全部订单信息
|
||||
* @param allOrderInfo
|
||||
@ -79,6 +83,7 @@ public interface AllOrderInfoService {
|
||||
AllOrderInfoVo getTradingData(AllOrderInfoDto allOrderInfo);
|
||||
IPage<AllOrderInfoVo> getTradingPage(Page page, AllOrderInfoDto allOrderInfo);
|
||||
|
||||
IPage<AllOrderInfoVo> transactionList(Page page, AllOrderInfoRes allOrderInfoRes);
|
||||
|
||||
IPage<SysDeptVo> runningWaterByInstituion(Page page, AllOrderInfoDto allOrderInfo);
|
||||
IPage<AllOrderInfoVo> runningWaterByInstituion2(Page page, AllOrderInfoDto allOrderInfo);
|
||||
@ -196,4 +201,6 @@ AllOrderActivityVo getOneByOrderId(Integer orderId);
|
||||
* @return
|
||||
*/
|
||||
HomeDataShowVo getDataCount(String startTime, String endTime);
|
||||
|
||||
Object cashierRefund(Map<String, String> map) throws Exception;
|
||||
}
|
||||
|
||||
@ -26,6 +26,7 @@ import com.fuint.business.marketingActivity.cardCoupon.mapper.CardCouponUserMapp
|
||||
import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableRecordService;
|
||||
import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders;
|
||||
import com.fuint.business.order.dto.AllOrderInfoDto;
|
||||
import com.fuint.business.order.dto.AllOrderInfoRes;
|
||||
import com.fuint.business.order.entity.*;
|
||||
import com.fuint.business.order.mapper.AllOrderInfoMapper;
|
||||
import com.fuint.business.order.mapper.OilOrderMapper;
|
||||
@ -96,6 +97,11 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
||||
OilNumberMapper oilNumberMapper;
|
||||
|
||||
|
||||
@Override
|
||||
public Map<String, Object> orderStatistics(AllOrderInfoRes allOrderInfoRes) {
|
||||
return allOrderInfoMapper.orderStatistics(allOrderInfoRes);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IPage<AllOrderInfoVo> getPageList(Page page, AllOrderInfo allOrderInfo) {
|
||||
IPage<AllOrderInfoVo> pageList = allOrderInfoMapper.getPageList(page, allOrderInfo);
|
||||
@ -381,7 +387,6 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
||||
@Resource
|
||||
CashierOrderService cashierOrderService;
|
||||
@Resource
|
||||
|
||||
LJGoodsService ljGoodsService;
|
||||
@Resource
|
||||
LJOrderService ljOrderService;
|
||||
@ -403,6 +408,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
||||
@Resource
|
||||
private CardCouponUserMapper cardCouponUserMapper;
|
||||
|
||||
// 此接口 只针对 消费订单进行退款 (不包含充值订单)
|
||||
@Override
|
||||
@Transactional
|
||||
public int refund(Map<String, String> map) {
|
||||
@ -540,6 +546,51 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
||||
return 0;
|
||||
}
|
||||
|
||||
// 注： 此接口是专门为 收银台订单退款使用 不是通用
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Object cashierRefund(Map<String, String> map) throws Exception {
|
||||
AccountInfo now = TokenUtil.getNowAccountInfo();
|
||||
// 参数
|
||||
String orderNo = map.get("orderNo");
|
||||
|
||||
|
||||
// 1.根据 orderNo 查询 总订单表 收银台表 进行退款
|
||||
AllOrderInfo allOrder = selectAllOrderInfoByOrderNo(orderNo);
|
||||
|
||||
// 3.如果支付类型 是 支付宝 微信 银联 则调用第三方支付接口 进行退款
|
||||
if (allOrder.getPayType().equals("WECHAT") || allOrder.getPayType().equals("UNIONPAY") || allOrder.getPayType().equals("ALIPAY")) {
|
||||
|
||||
int totalAmt = (int) ((allOrder.getPayMoney() - allOrder.getSeekZero()) * 100);
|
||||
map.put("totalAmt", String.valueOf(totalAmt));
|
||||
map.put("orderNo", allOrder.getOrderNo());
|
||||
map.put("payType", allOrder.getPayType());
|
||||
map.put("refundAmt", String.valueOf(totalAmt));
|
||||
map.putAll(getMerchantConfig(allOrder));
|
||||
|
||||
Map<String, String> refund = fyPayService.refund(map);
|
||||
} else {
|
||||
throw new RuntimeException("其它类型支付正在维护中！");
|
||||
}
|
||||
|
||||
|
||||
allOrder.setRefMoney(allOrder.getGoodsMoney());
|
||||
allOrder.setRefBy(String.valueOf(now.getId()));
|
||||
allOrder.setStatus("refund");
|
||||
allOrder.setRefOrderNo(map.get("refundOrderNo"));
|
||||
baseMapper.updateById(allOrder);
|
||||
CashierOrder cashierOrder = cashierOrderService.selectCashierOrder(orderNo);
|
||||
cashierOrder.setStatus("refund");
|
||||
cashierOrderService.updateById(cashierOrder);
|
||||
|
||||
// 2.根据 用户优惠券id 把优惠券还原状态
|
||||
|
||||
|
||||
// 4.如果是 囤油卡 车队卡 储值卡 则进行另外处理
|
||||
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
private static String formatBigDecimal(BigDecimal value) {
|
||||
DecimalFormat decimalFormat = new DecimalFormat("0.00");
|
||||
return decimalFormat.format(value);
|
||||
@ -817,6 +868,16 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
||||
return pageList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IPage<AllOrderInfoVo> transactionList(Page page, AllOrderInfoRes allOrderInfoRes) {
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
allOrderInfoRes.setStoreId(nowAccountInfo.getStoreId());
|
||||
|
||||
IPage<AllOrderInfoVo> allOrderInfoVoIPage = super.baseMapper.transactionList(page, allOrderInfoRes);
|
||||
|
||||
return allOrderInfoVoIPage;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void tradingExportExcel(HttpServletResponse response, AllOrderInfoDto order) {
|
||||
|
||||
@ -433,7 +433,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
|
||||
// 商品实付金额
|
||||
Double goodsActualPay = Double.valueOf(map.get("goodsActualPay"));
|
||||
// 找零金额
|
||||
Double seekZero = Double.valueOf(map.get("seekZero"));
|
||||
BigDecimal seekZero = new BigDecimal(map.get("seekZero"));
|
||||
// 油枪id
|
||||
String oilGunId = map.get("oilGunId");
|
||||
// 活动营销优惠金额
|
||||
@ -1120,7 +1120,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
|
||||
cashierOrder.setOilOrderAmount(oilAmount);
|
||||
cashierOrder.setTerminal(map.get("terminal"));
|
||||
cashierOrder.setOilOrderId(oilOrder.getId());
|
||||
cashierOrder.setSeekZero(0.0);
|
||||
cashierOrder.setSeekZero(BigDecimal.valueOf(0.0));
|
||||
cashierOrder.setPayType(map.get("payType"));
|
||||
cashierOrderService.insertCashierOrder(cashierOrder);
|
||||
this.insertAllOrderInfo(orderNo, storeId, oilAmount, oilAmount, 0.0, map.get("payType"), userId, "PC", "1", status,0.0);
|
||||
@ -1190,7 +1190,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
|
||||
cashierOrder.setOilOrderAmount(oilAmount);
|
||||
cashierOrder.setTerminal(map.get("terminal"));
|
||||
cashierOrder.setOilOrderId(oilOrder.getId());
|
||||
cashierOrder.setSeekZero(0.0);
|
||||
cashierOrder.setSeekZero(BigDecimal.valueOf(0.0));
|
||||
cashierOrder.setPayType(map.get("payType"));
|
||||
cashierOrderService.insertCashierOrder(cashierOrder);
|
||||
this.updateGrowthValue1(oilAmount, oilAmount, userId, Integer.valueOf(oilOrder.getOils()), 0.0, storeId, orderNo);
|
||||
@ -1306,7 +1306,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
|
||||
cashierOrder.setOilOrderAmount(oilAmount);
|
||||
cashierOrder.setTerminal(map.get("terminal"));
|
||||
cashierOrder.setOilOrderId(order.getId());
|
||||
cashierOrder.setSeekZero(0.0);
|
||||
cashierOrder.setSeekZero(BigDecimal.valueOf(0.0));
|
||||
cashierOrder.setPayType(map.get("payType"));
|
||||
cashierOrderService.insertCashierOrder(cashierOrder);
|
||||
this.insertAllOrderInfo(orderNo, storeId, oilAmount, oilAmount, 0.0, map.get("payType"), userId, "PC", "1", "paid",0.0);
|
||||
|
||||
@ -22,7 +22,7 @@ public class AllOrderInfoVo extends AllOrderInfo {
|
||||
private String cashMoney;
|
||||
private String balanceMoney;
|
||||
private String alipayMoney;
|
||||
private String refMoney;
|
||||
private Double refMoney;
|
||||
// 交易笔数
|
||||
private String strokeCount;
|
||||
// 笔单价
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
# \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=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
|
||||
#env.properties.path=D:/code/bulidmap/oil-station/fuintBackend/configure
|
||||
#env.properties.path=D:/work/oilSystem/fuintBackend/configure/
|
||||
#env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
|
||||
|
||||
@ -28,6 +29,9 @@ mybatis-plus.mapper-locations = classpath*:/mapper/*Mapper.xml,classpath*:com/fu
|
||||
mybatis-plus.configuration.intercepts=com.example.MyInterceptor
|
||||
# \u9ED8\u8BA4\u65F6\u95F4\u683C\u5F0F
|
||||
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
|
||||
# 配置mybatisplus 日志输出
|
||||
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
|
||||
logging.level.com.baomidou.mybatisplus=DEBUG
|
||||
|
||||
#logging.level.com.fuint.business.*.mapper:DEBUG
|
||||
#logging.level.org.springframework.web:DEBUG
|
||||
|
||||
@ -8,6 +8,17 @@ export function refundApi(data) {
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 退款 新的收银台专用
|
||||
export function cashierRefund(data) {
|
||||
return request({
|
||||
url: '/business/allOrderInfo/cashierRefund',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
export function getOrderInfoApi(data) {
|
||||
return request({
|
||||
url: '/business/allOrderInfo/getOrderInfo',
|
||||
|
||||
@ -8,6 +8,14 @@ export function getCouponList(query) {
|
||||
params: query
|
||||
})
|
||||
}
|
||||
// 根据 userCouponID 查询 当前用户的卡券 以及 卡券名称
|
||||
export function selectOneCardName(id) {
|
||||
return request({
|
||||
url: 'cardCouponUser/selectOneCardName',
|
||||
method: 'get',
|
||||
params:id
|
||||
})
|
||||
}
|
||||
|
||||
// 查询卡券信息
|
||||
export function getCouponInfo(id) {
|
||||
|
||||
@ -1291,6 +1291,9 @@ export default {
|
||||
this.payType = "ALIPAY"
|
||||
|
||||
this.loading = false;
|
||||
|
||||
this.restVipUser();
|
||||
|
||||
},
|
||||
// 查询订单支付状态
|
||||
queryPayStatus() {
|
||||
@ -1378,14 +1381,21 @@ export default {
|
||||
this.$modal.msgError("请输入正确的金额");
|
||||
return;
|
||||
}
|
||||
//找零金额
|
||||
this.payForm.seekZero = this.getChangeShould
|
||||
}
|
||||
if (!this.payForm.authCode && ((+this.oilActualPay) + (+this.goodsActualPay)) > 0) {
|
||||
this.$modal.msgError("请先扫码");
|
||||
return;
|
||||
}
|
||||
|
||||
//只有在现金时候才会有找零
|
||||
if (this.payForm.payType == "CASH"){
|
||||
//找零金额
|
||||
this.payForm.seekZero = this.getChangeShould
|
||||
}
|
||||
else {
|
||||
this.payForm.seekZero = 0
|
||||
}
|
||||
|
||||
|
||||
this.loading = true;
|
||||
let _this = this;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user