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-03-06 11:28:57 +08:00
parent f9be9ea02d
commit cddb9231a5
4 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fuintAdmin/src/api/EventMarketing/cardExchange.js
View File

@ -9,6 +9,14 @@ export function listExchange(query) {
}) })
} }
// 查询兑换券列表
export function exchangeInfo(id) {
return request({
url: 'business/marketingActivity/cardExchange/'+id,
method: 'get',
})
}
// 查询兑换券详细 // 查询兑换券详细
export function getExchange(id) { export function getExchange(id) {
return request({ return request({

32
fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
View File

@ -17,12 +17,12 @@
<el-option label="下线" value="1"></el-option> <el-option label="下线" value="1"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="" prop="status"> <!-- <el-form-item label="" prop="status">-->
<el-select clearable v-model="queryParams.status" placeholder="兑换券状态"> <!-- <el-select clearable v-model="queryParams.status" placeholder="兑换券状态">-->
<el-option label="启用" value="0"></el-option> <!-- <el-option label="启用" value="0"></el-option>-->
<el-option label="禁用" value="1"></el-option> <!-- <el-option label="禁用" value="1"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="" prop="type"> <el-form-item label="" prop="type">
<el-select clearable v-model="queryParams.type" placeholder="兑换券类型"> <el-select clearable v-model="queryParams.type" placeholder="兑换券类型">
<el-option label="商品兑换券" value="0"></el-option> <el-option label="商品兑换券" value="0"></el-option>
@ -83,12 +83,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="使用说明" align="center" prop="useInstructions"/> <el-table-column label="使用说明" align="center" prop="useInstructions"/>
<el-table-column label="二维码链接" align="center" prop="qrCodeLink"> <!-- <el-table-column label="二维码链接" align="center" prop="qrCodeLink">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<i class="el-icon-picture" style="size: 20px;cursor: pointer" @click="qrcodelook(scope.row.qrCodeLink)"></i> <!-- <i class="el-icon-picture" style="size: 20px;cursor: pointer" @click="qrcodelook(scope.row.qrCodeLink)"></i>-->
<!-- <span>{{ scope.row.qrCodeLink }}</span>--> <!-- &lt;!&ndash; <span>{{ scope.row.qrCodeLink }}</span>&ndash;&gt;-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<!-- <el-table-column label="参与次数" align="center" prop="count"/>--> <!-- <el-table-column label="参与次数" align="center" prop="count"/>-->
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
@ -225,7 +225,7 @@ import {
delExchange, delExchange,
addExchange, addExchange,
updateExchange, updateExchange,
getqueryGoods getqueryGoods, exchangeInfo
} from '@/api/EventMarketing/cardExchange' } from '@/api/EventMarketing/cardExchange'
export default { export default {
@ -395,7 +395,10 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset() this.reset()
this.form = row exchangeInfo(row.id).then(res => {
this.form = res.data
})
// this.form = row
this.open = true this.open = true
this.title = '修改兑换券' this.title = '修改兑换券'
}, },
@ -427,6 +430,7 @@ export default {
updateExchange(data).then(res => { updateExchange(data).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success('下线成功') this.$message.success('下线成功')
this.getList()
} }
}) })
}, },

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

@ -823,7 +823,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
cashierOrder.setPayType(map.get("payType")); cashierOrder.setPayType(map.get("payType"));
cashierOrderService.insertCashierOrder(cashierOrder); cashierOrderService.insertCashierOrder(cashierOrder);
this.insertAllOrderInfo(orderNo, storeId, oilAmount, oilAmount, map.get("payType"), userId, "PC", "1", status); this.insertAllOrderInfo(orderNo, storeId, oilAmount, oilAmount, map.get("payType"), userId, "PC", "1", status);
staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,"1",orderNo); if (ObjectUtil.isNotEmpty(map.get("staffId"))) staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,"1",orderNo);
res.put("success","success"); res.put("success","success");
} }
} }
@ -889,7 +889,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
cashierOrderService.insertCashierOrder(cashierOrder); cashierOrderService.insertCashierOrder(cashierOrder);
this.updateGrowthValue1(oilAmount,oilAmount,userId, Integer.valueOf(oilOrder.getOils()),0.0,storeId,orderNo); this.updateGrowthValue1(oilAmount,oilAmount,userId, Integer.valueOf(oilOrder.getOils()),0.0,storeId,orderNo);
this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,oilAmount,map.get("payType"),userId,"PC","1","paid"); this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,oilAmount,map.get("payType"),userId,"PC","1","paid");
staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,"1",orderNo); if (ObjectUtil.isNotEmpty(map.get("staffId"))) staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,"1",orderNo);
// this.insertCardBalance(oilAmount,userId,storeId); // this.insertCardBalance(oilAmount,userId,storeId);
res.put("success","success"); res.put("success","success");
}else { }else {
@ -1205,7 +1205,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
this.insertCardOrder(oilOrder.getUserId(),oilOrder.getStoreId(),orderNo,oilOrder.getOrderAmount(),"paid", Double.valueOf(balanceAmount),payAmount); this.insertCardOrder(oilOrder.getUserId(),oilOrder.getStoreId(),orderNo,oilOrder.getOrderAmount(),"paid", Double.valueOf(balanceAmount),payAmount);
this.insertAllOrderInfo(orderNo,oilOrder.getStoreId(),oilOrder.getOrderAmount(),payAmount,oilOrder.getPayType(),oilOrder.getUserId(),"applet","1","paid"); this.insertAllOrderInfo(orderNo,oilOrder.getStoreId(),oilOrder.getOrderAmount(),payAmount,oilOrder.getPayType(),oilOrder.getUserId(),"applet","1","paid");
this.insertCardBalance(Double.valueOf(balanceAmount),userId,oilOrder.getStoreId(),orderNo); this.insertCardBalance(Double.valueOf(balanceAmount),userId,oilOrder.getStoreId(),orderNo);
staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getOrderAmount(),"1",orderNo); if (ObjectUtil.isNotEmpty(oilOrder.getStaffId())) staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getOrderAmount(),"1",orderNo);
oilOrder.setPayAmount(payAmount); oilOrder.setPayAmount(payAmount);
oilOrder.setDiscountAmount(Double.valueOf(discountAmount)); oilOrder.setDiscountAmount(Double.valueOf(discountAmount));
oilOrder.setPayTime(new Date()); oilOrder.setPayTime(new Date());
@ -1294,7 +1294,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
this.addOilTracks(oilOrder,oilOrder.getStoreId()); this.addOilTracks(oilOrder,oilOrder.getStoreId());
this.updateCardAndActiveById(oilOrder.getStoreId(),oilOrder.getUserId(),oilOrder.getActiveId(),oilOrder.getCouponId(),oilOrder.getActiveType(),oilOrder.getOrderAmount(), Integer.valueOf(oilOrder.getOils())); this.updateCardAndActiveById(oilOrder.getStoreId(),oilOrder.getUserId(),oilOrder.getActiveId(),oilOrder.getCouponId(),oilOrder.getActiveType(),oilOrder.getOrderAmount(), Integer.valueOf(oilOrder.getOils()));
this.insertCardBalance(oilOrder.getOrderAmount()-oilOrder.getDiscountAmount()-oilOrder.getPayAmount(),userId,oilOrder.getStoreId(),orderNo); this.insertCardBalance(oilOrder.getOrderAmount()-oilOrder.getDiscountAmount()-oilOrder.getPayAmount(),userId,oilOrder.getStoreId(),orderNo);
staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(),"1",orderNo); if (ObjectUtil.isNotEmpty(oilOrder.getStaffId())) staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(),"1",orderNo);
} }
row = baseMapper.updateById(oilOrder); row = baseMapper.updateById(oilOrder);
} }

10
gasStation-uni/pagesMy/details/details.vue
View File

@ -25,7 +25,7 @@
</view> </view>
<view class="dis-fx"> <view class="dis-fx">
<view class="hui-size">加油员工</view> <view class="hui-size">加油员工</view>
<view class="">{{oilOrder.realName}}</view> <view class="">{{oilOrder.realName || "--"}}</view>
</view> </view>
<view class="dis-fx"> <view class="dis-fx">
<view class="hui-size">油号油枪</view> <view class="hui-size">油号油枪</view>
@ -69,6 +69,14 @@
<view class="hui-size">优惠券优惠</view> <view class="hui-size">优惠券优惠</view>
<view class="">{{cardFavorable.discountAmount || oilOrder.discountAmount}}元</view> <view class="">{{cardFavorable.discountAmount || oilOrder.discountAmount}}元</view>
</view> </view>
<view class="dis-fx" v-if="AppToken && oilOrder.cardFavorableId && oilOrder.discountAmount>0 && (oilOrder.discountAmount - cardFavorable.discountAmount)>0">
<view class="hui-size">会员等级优惠</view>
<view class="">{{cardFavorable.discountAmount ? (oilOrder.discountAmount - cardFavorable.discountAmount) : oilOrder.discountAmount}}元</view>
</view>
<view class="dis-fx" v-if="AppToken && oilOrder.cardFavorableId && oilOrder.activeId && (oilOrder.discountAmount - fullOrDiscount.deductionAmount)>0">
<view class="hui-size">会员等级优惠</view>
<view class="">{{fullOrDiscount.deductionAmount ? (oilOrder.discountAmount - fullOrDiscount.deductionAmount) : oilOrder.discountAmount}}元</view>
</view>
<view class="dis-fx" v-if="AppToken && oilOrder.discountAmount>0"> <view class="dis-fx" v-if="AppToken && oilOrder.discountAmount>0">
<view class="hui-size">优惠合计金额</view> <view class="hui-size">优惠合计金额</view>