bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单-下单退单

This commit is contained in:
gaowdong 2025-04-17 17:33:55 +08:00
parent bfff4d73a1
commit eafc296fcb
6 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/DeviceOrderAddParam.java
View File

@ -3,6 +3,7 @@ package com.bonus.canteen.core.order.domain.param;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
@ -33,5 +34,6 @@ public class DeviceOrderAddParam {
@NotNull(message = "订单来源不能为空")
private Integer sourceType;
private Integer isOnline;
List<DeviceOrderInfoAddParam> orderList;
@Valid
private List<DeviceOrderInfoAddParam> orderList;
}

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/DeviceOrderInfoAddParam.java
View File

@ -3,6 +3,7 @@ package com.bonus.canteen.core.order.domain.param;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
@ -29,5 +30,6 @@ public class DeviceOrderInfoAddParam {
private String deviceSn;
@NotNull(message = "设备编号不能为空")
private String deviceNum;
List<DeviceOrderDetailInfoAddParam> orderDetailList;
@Valid
private List<DeviceOrderDetailInfoAddParam> orderDetailList;
}

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderAddParam.java
View File

@ -3,6 +3,7 @@ package com.bonus.canteen.core.order.domain.param;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
@ -33,5 +34,6 @@ public class OrderAddParam {
@NotNull(message = "订单来源不能为空")
private Integer sourceType;
private Integer isOnline;
List<OrderInfoAddParam> orderList;
@Valid
private List<OrderInfoAddParam> orderList;
}

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderInfoAddParam.java
View File

@ -4,6 +4,7 @@ import com.bonus.common.core.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
@ -29,5 +30,6 @@ public class OrderInfoAddParam {
private String deviceOrderId;
private String deviceSn;
private String deviceNum;
@Valid
List<OrderDetailInfoAddParam> orderDetailList;
}

19
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderAddParam.java
View File

@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import javax.validation.Valid;
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
@ -44,14 +45,16 @@ public class ShopOrderAddParam {
private Integer payType;
@NotNull(message = "订单来源不能为空")
private Integer sourceType;
@NotNull(message = "订单在线离线状态为空")
private Integer isOnline;
List<OrderInfoAddParam> orderList;
@Valid
private List<ShopOrderInfoAddParam> orderList;
public List<OrderInfo> of(ShopOrderAddParam param) {
List<OrderInfo> orderInfoList = new ArrayList<>();
List<OrderInfoAddParam> orderList = param.getOrderList();
List<ShopOrderInfoAddParam> orderList = param.getOrderList();
if(CollUtil.isNotEmpty(orderList)) {
for(OrderInfoAddParam orderInfoAddParam : orderList) {
for(ShopOrderInfoAddParam orderInfoAddParam : orderList) {
OrderInfo orderInfo = new OrderInfo();
orderInfo.setOrderId(Id.next());
orderInfo.setDeviceOrderId(StringUtils.defaultString(orderInfoAddParam.getDeviceOrderId(), StringUtils.EMPTY));
@ -66,15 +69,8 @@ public class ShopOrderAddParam {
orderInfo.setUpdateBy(SecurityUtils.getUsername());
orderInfo.setUpdateTime(DateUtils.getNowDate());
orderInfo.setPayType(param.getPayType());
Long canteenId = orderInfoAddParam.getCanteenId();
orderInfo.setCanteenId(Objects.isNull(canteenId) ? -1 : canteenId);
Long stallId = orderInfoAddParam.getStallId();
orderInfo.setStallId(Objects.isNull(stallId) ? -1 : stallId);
orderInfo.setOrderDate(orderInfoAddParam.getOrderDate());
orderInfo.setOrderType(orderInfoAddParam.getOrderType());
Integer mealtimeType = orderInfoAddParam.getMealtimeType();
orderInfo.setMealtimeType(Objects.isNull(mealtimeType) ? -1 : mealtimeType);
orderInfo.setMealtimeName(orderInfoAddParam.getMealtimeName());
orderInfo.setIsOnline(Objects.isNull(param.getIsOnline()) ? 1 : param.getIsOnline());
orderInfo.setOrderState(OrderStateEnum.WAIT_PLACE.getKey());
orderInfo.setOrderRefundState(OrderRefundStateEnum.UN_REFUND.getKey());
@ -87,9 +83,6 @@ public class ShopOrderAddParam {
orderInfo.setDeliveryType(DeliveryTypeEnum.SELF_TAKE.getKey());
orderInfo.setCommentState(CommentStateEnum.UN_COMMENT.getKey());
orderInfo.setOrderTime(DateUtils.getNowDate());
orderInfo.setPayableAmount(BigDecimal.ZERO);
orderInfo.setDiscountsAmount(BigDecimal.ZERO);
orderInfo.setRealAmount(BigDecimal.ZERO);
orderInfo.setExternalPayAmount(BigDecimal.ZERO);
orderInfo.setRefundAmount(BigDecimal.ZERO);
orderInfo.setPayableAmount(param.getRealAmount());

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderInfoAddParam.java
View File

@ -11,7 +11,13 @@ import java.util.List;
public class ShopOrderInfoAddParam {
@NotNull(message = "订单类型不能为空")
private Integer orderType;
@NotNull(message = "设备订单编号不能为空")
private String deviceOrderId;
@NotNull(message = "设备SN不能为空")
private String deviceSn;
@NotNull(message = "设备编号不能为空")
private String deviceNum;
@NotNull(message = "订单日期不能为空")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date orderDate;
}