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-02-06 16:48:14 +08:00
parent fd0091634f
commit 3c6defd2c6
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintAdmin/src/views/order/order_Cashier.vue
View File

@ -115,12 +115,12 @@
<el-table-column align="center" label="实付订单金额组成"> <el-table-column align="center" label="实付订单金额组成">
<el-table-column prop="oilOrderAmount" align="center" label="油品实付金额" width="100"> <el-table-column prop="oilOrderAmount" align="center" label="油品实付金额" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.oilOrderAmount ? scope.row.oilOrderAmount : '0'}}</span> <span>{{scope.row.oilPayAmount ? scope.row.oilPayAmount : '0'}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodsOrderAmount" align="center" label="商品实付金额" width="110"> <el-table-column prop="goodsOrderAmount" align="center" label="商品实付金额" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.goodsOrderAmount ? scope.row.goodsOrderAmount : '0'}}</span> <span>{{scope.row.goodsPayAmount ? scope.row.goodsPayAmount : '0'}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java
View File

@ -76,11 +76,11 @@ public class CashierOrder extends BaseEntity implements Serializable {
*/ */
private Double goodsDiscountAmount; private Double goodsDiscountAmount;
/** /**
* 商品优惠金额 * 油品实付金额
*/ */
private Double oilPayAmount; private Double oilPayAmount;
/** /**
* 商品优惠金额 * 商品实付金额
*/ */
private Double goodsPayAmount; private Double goodsPayAmount;
/** /**

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

@ -410,6 +410,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
cashierOrder.setPayUser(payUser); cashierOrder.setPayUser(payUser);
cashierOrder.setAmount(oilAmount+goodsAmount); cashierOrder.setAmount(oilAmount+goodsAmount);
cashierOrder.setStatus(payStatus); cashierOrder.setStatus(payStatus);
cashierOrder.setOilPayAmount(oilActualPay);
cashierOrder.setGoodsPayAmount(goodsActualPay);
if (payType.equals("CASH")){ if (payType.equals("CASH")){
if (StringUtils.isNotEmpty(map.get("authCode"))){ if (StringUtils.isNotEmpty(map.get("authCode"))){
cashierOrder.setPayAmount(Double.valueOf(map.get("authCode"))); cashierOrder.setPayAmount(Double.valueOf(map.get("authCode")));
@ -742,6 +744,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
cashierOrder.setStoreId(accountInfo.getStoreId()); cashierOrder.setStoreId(accountInfo.getStoreId());
cashierOrder.setPayUser(userVo1.getMobile()); cashierOrder.setPayUser(userVo1.getMobile());
cashierOrder.setAmount(oilAmount); cashierOrder.setAmount(oilAmount);
cashierOrder.setOilPayAmount(oilAmount);
cashierOrder.setPayAmount(oilAmount); cashierOrder.setPayAmount(oilAmount);
cashierOrder.setStatus(status); cashierOrder.setStatus(status);
cashierOrder.setPayTime(new Date()); cashierOrder.setPayTime(new Date());
@ -806,6 +809,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
cashierOrder.setStoreId(accountInfo.getStoreId()); cashierOrder.setStoreId(accountInfo.getStoreId());
cashierOrder.setPayUser(userVo1.getMobile()); cashierOrder.setPayUser(userVo1.getMobile());
cashierOrder.setAmount(oilAmount); cashierOrder.setAmount(oilAmount);
cashierOrder.setOilPayAmount(oilAmount);
cashierOrder.setPayAmount(oilAmount); cashierOrder.setPayAmount(oilAmount);
cashierOrder.setStatus("paid"); cashierOrder.setStatus("paid");
cashierOrder.setPayTime(new Date()); cashierOrder.setPayTime(new Date());

4
fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
View File

@ -126,12 +126,12 @@
<el-table-column align="center" label="实付订单金额组成"> <el-table-column align="center" label="实付订单金额组成">
<el-table-column prop="oilOrderAmount" align="center" label="油品实付金额" width="100"> <el-table-column prop="oilOrderAmount" align="center" label="油品实付金额" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.oilOrderAmount ? scope.row.oilOrderAmount : '0'}}</span> <span>{{scope.row.oilPayAmount ? scope.row.oilPayAmount : '0'}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodsOrderAmount" align="center" label="商品实付金额" width="110"> <el-table-column prop="goodsOrderAmount" align="center" label="商品实付金额" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.goodsOrderAmount ? scope.row.goodsOrderAmount : '0'}}</span> <span>{{scope.row.goodsPayAmount ? scope.row.goodsPayAmount : '0'}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>