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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2025-04-18 16:35:44 +08:00
parent 36e3c749bc 144559884a
commit 610999008c
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java
View File

@ -284,6 +284,7 @@ public class OrderInfo extends BaseEntity
orderInfo.setDeviceOrderId(StringUtils.defaultString(orderInfoAddParam.getDeviceOrderId(), StringUtils.EMPTY));
orderInfo.setDeviceSn(StringUtils.defaultString(orderInfoAddParam.getDeviceSn(), StringUtils.EMPTY));
orderInfo.setDeviceNum(StringUtils.defaultString(orderInfoAddParam.getDeviceNum(), StringUtils.EMPTY));
orderInfo.setIdentityVerification(orderInfoAddParam.getIdentityVerification());
orderInfo.setUserId(param.getUserId());
orderInfo.setPayableAmount(param.getPayableAmount());
orderInfo.setRealAmount(param.getRealAmount());

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

@ -30,6 +30,8 @@ public class DeviceOrderInfoAddParam {
private String deviceSn;
@NotNull(message = "设备编号不能为空")
private String deviceNum;
@NotNull(message = "核身方式不能为空")
private Integer identityVerification;
@Valid
private List<DeviceOrderDetailInfoAddParam> orderDetailList;
}