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

订单备注

This commit is contained in:
gaowdong 2025-06-10 17:26:20 +08:00
parent 753c74d8a6
commit ff2384bf6f
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,6 +183,8 @@ public class OrderInfo extends BaseEntity
private String areaName;
private String remark;
List<OrderDetail> orderDetailList;
public List<OrderInfo> of(OrderAddParam param) {
@ -226,6 +228,7 @@ public class OrderInfo extends BaseEntity
orderInfo.setRealAmount(BigDecimal.ZERO);
orderInfo.setExternalPayAmount(BigDecimal.ZERO);
orderInfo.setRefundAmount(BigDecimal.ZERO);
orderInfo.setRemark(param.getRemark());
List<OrderDetailInfoAddParam> orderDetailInfoAddParams =orderInfoAddParam.getOrderDetailList();
if(CollUtil.isNotEmpty(orderDetailInfoAddParams)) {
List<OrderDetail> orderDetailList = CollUtil.newArrayList();

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

@ -34,6 +34,7 @@ public class OrderAddParam {
@NotNull(message = "订单来源不能为空")
private Integer sourceType;
private Integer isOnline;
private String remark;
@Valid
@NotNull(message = "订单列表不能为空")
private List<OrderInfoAddParam> orderList;

7
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml
View File

@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="commentState" column="comment_state" />
<result property="deviceName" column="device_name" />
<result property="nickName" column="nick_name" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
@ -57,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
oi.deduction_type, oi.pay_time, oi.pay_type, oi.pay_channel, oi.pay_state, oi.pay_param,
oi.delivery_amount, oi.packing_amount, oi.delivery_type, oi.comment_state,
di.device_name, su.nick_name, oi.create_by, oi.create_time, oi.update_by, oi.update_time,
su.phonenumber as phoneNumber, sd.dept_full_name, ba.area_name
su.phonenumber as phoneNumber, sd.dept_full_name, ba.area_name, oi.remark
from order_info oi
left join basic_canteen bc on bc.canteen_id = oi.canteen_id
left join basic_stall bs on bs.stall_id = oi.stall_id
@ -215,6 +216,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="packingAmount != null">packing_amount,</if>
<if test="deliveryType != null">delivery_type,</if>
<if test="commentState != null">comment_state,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null and updateBy != ''">update_by,</if>
@ -254,6 +256,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="packingAmount != null">#{packingAmount},</if>
<if test="deliveryType != null">#{deliveryType},</if>
<if test="commentState != null">#{commentState},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
@ -296,6 +299,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
packing_amount,
delivery_type,
comment_state,
remark,
create_by,
update_by
)
@ -335,6 +339,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{orderInfo.packingAmount},
#{orderInfo.deliveryType},
#{orderInfo.commentState},
#{orderInfo.remark},
#{orderInfo.createBy},
#{orderInfo.updateBy}
)