diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderAddParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderAddParam.java index f94b3f0..5748335 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderAddParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderAddParam.java @@ -2,6 +2,7 @@ package com.bonus.canteen.core.order.domain.param; import cn.hutool.core.collection.CollUtil; import com.bonus.canteen.core.order.constants.*; +import com.bonus.canteen.core.order.domain.OrderDetail; import com.bonus.canteen.core.order.domain.OrderInfo; import com.bonus.canteen.core.pay.constants.PayChannelEnum; import com.bonus.canteen.core.pay.constants.PayStateEnum; @@ -88,6 +89,30 @@ public class ShopOrderAddParam { orderInfo.setStallId(-1L); orderInfo.setMealtimeType(-1L); orderInfo.setIdentityVerification(orderInfoAddParam.getIdentityVerification()); + List orderDetailList = new ArrayList<>(); + OrderDetail bb = new OrderDetail(); + bb.setGoodsName("按键金额"); + bb.setGoodsId(0L); + bb.setRecipeId(-1L); + bb.setRecipeDetailId(0L); + bb.setSalePrice(param.getRealAmount()); + bb.setFinalPrice(param.getRealAmount()); + bb.setDetailType(orderInfoAddParam.getOrderType()); + bb.setTotalAmount(param.getRealAmount()); + bb.setCalcTotalAmount(param.getRealAmount()); + bb.setRealAmount(param.getRealAmount()); + bb.setDeviceSn(orderInfoAddParam.getDeviceSn()); + bb.setSerialNum(StringUtils.EMPTY); + bb.setOrderDate(orderInfoAddParam.getOrderDate()); + bb.setDiscountPrice(BigDecimal.ZERO); + bb.setQuantity(1); + bb.setRefundAmount(BigDecimal.ZERO); + bb.setDetailState(OrderDetailStateEnum.NORMAL.getKey()); + bb.setRefundNum(0); + bb.setCreateBy(SecurityUtils.getUsername()); + bb.setSalesMode(1); + orderDetailList.add(bb); + orderInfo.setOrderDetailList(orderDetailList); orderInfoList.add(orderInfo); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderInfoAddParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderInfoAddParam.java index 42cdd3e..2c5e89b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderInfoAddParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderInfoAddParam.java @@ -22,4 +22,5 @@ public class ShopOrderInfoAddParam { private LocalDate orderDate; @NotNull(message = "核身方式不能为空") private Integer identityVerification; + private String goodsName; }