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:
zhaohengkun 2024-10-29 11:41:06 +08:00
parent bafcf724f1
commit 05c85707dc
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,10 +64,6 @@ public class AllOrderInfo extends BaseEntity implements Serializable {
* 优惠金额 * 优惠金额
*/ */
private Double discountAmount; private Double discountAmount;
/**
* 找零金额
*/
private Double seekZero;
/** /**
* 支付时间 * 支付时间
*/ */

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

@ -433,7 +433,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
// 商品实付金额 // 商品实付金额
Double goodsActualPay = Double.valueOf(map.get("goodsActualPay")); Double goodsActualPay = Double.valueOf(map.get("goodsActualPay"));
// 找零金额 // 找零金额
BigDecimal seekZero = new BigDecimal(map.get("seekZero")); Double seekZero = Double.valueOf(map.get("seekZero"));
// 油枪id // 油枪id
String oilGunId = map.get("oilGunId"); String oilGunId = map.get("oilGunId");
// 活动营销优惠金额 // 活动营销优惠金额
@ -687,7 +687,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
} else { } else {
cashierOrder.setPayAmount(oilActualPay + goodsActualPay); cashierOrder.setPayAmount(oilActualPay + goodsActualPay);
} }
cashierOrder.setSeekZero(seekZero); cashierOrder.setSeekZero(BigDecimal.valueOf(seekZero));
cashierOrder.setOrderNo(orderNo); cashierOrder.setOrderNo(orderNo);
cashierOrder.setGoodsOrderAmount(goodsAmount); cashierOrder.setGoodsOrderAmount(goodsAmount);
cashierOrder.setGoodsDiscountAmount(goodsDiscount); cashierOrder.setGoodsDiscountAmount(goodsDiscount);