diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java index 5e1591777..c55833f05 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java @@ -71,6 +71,7 @@ public class OrderDetail implements Serializable { * 是否赠送 0否 1是 */ private Integer isGift; + private boolean isUrgent; /** * 折扣金额(商品优惠券抵扣金额) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java index aaaad76a7..3d0f9c125 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java @@ -384,7 +384,7 @@ public interface PrinterImpl { * @return 元数据 */ default String buildDishPrintData(boolean isReturn, String pickupNumber, String date, String productName, String skuName, - BigDecimal number, String remark, String proGroupInfo, Long orderDetailId) { + BigDecimal number, String remark, String proGroupInfo, Long orderDetailId, boolean isUrgent) { PrintSignLabel signLabelInfo = getSignLabelInfo(); StringBuilder builder = new StringBuilder(); if (isReturn) { @@ -440,6 +440,10 @@ public interface PrinterImpl { // builder.append("(").append(i + 1).append(")").append(proName).append(" x ").append(qty).append("
"); } } + if (isUrgent) { + builder.append(getFormatLabel("【加急】", signLabelInfo.center, signLabelInfo.bold)) + .append(signLabelInfo.br); + } builder.append(getFormatLabel("UP_ORDER_DETAIL:" + orderDetailId, signLabelInfo.center, signLabelInfo.qr)) .append(signLabelInfo.br); builder.append(signLabelInfo.br) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java index 0482527d3..c6c6f158e 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java @@ -291,7 +291,11 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { } List orderDetails = cartService.getCartByTableCode(shopInfo.getId(), param.getTableCode(), param.getPlaceNum()); if (StrUtil.isNotBlank(param.getSubStatus())) { - orderDetails.forEach(item -> item.setSubStatus(param.getSubStatus())); + if ("URGENT".equals(param.getSubStatus())) { + orderDetails.forEach(item -> item.setUrgent(true)); + }else { + orderDetails.forEach(item -> item.setSubStatus(param.getSubStatus())); + } } AssertUtil.isListEmpty(orderDetails, "下单失败 购物车为空"); processOrderDetails(orderDetails, param.getLimitRate()); diff --git a/cash-service/order-service/src/main/resources/mapper/OrderDetailMapper.xml b/cash-service/order-service/src/main/resources/mapper/OrderDetailMapper.xml index d190e77ca..6c4e81bcf 100644 --- a/cash-service/order-service/src/main/resources/mapper/OrderDetailMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/OrderDetailMapper.xml @@ -9,7 +9,7 @@ sku_name, price,member_price,discount_sale_amount,unit_price, discount_amount, pack_amount, pay_amount, return_amount, num, pack_number, coupon_num, is_time_discount, return_num, refund_num, refund_no, discount_sale_note, status, place_num, is_temporary, is_print, is_wait_call, - pro_group_info, remark, refund_remark, create_time, update_time) + pro_group_info, remark, refund_remark, create_time, update_time, is_urgent, sub_status) VALUES (#{orderId}, #{entity.shopId}, #{entity.productId}, #{entity.productImg}, #{entity.productName}, @@ -19,7 +19,7 @@ #{entity.couponNum}, #{entity.isTimeDiscount}, #{entity.returnNum}, #{entity.refundNum}, #{entity.refundNo}, #{entity.discountSaleNote}, #{entity.status}, #{entity.placeNum}, #{entity.isTemporary}, #{entity.isPrint}, #{entity.isWaitCall}, #{entity.proGroupInfo}, #{entity.remark}, #{entity.refundRemark}, - now(), now()) + now(), now(), #{isUrgent}, #{subStatus})