退菜退款标识

cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoRefundDTO.java

@@ -50,6 +50,10 @@ public class OrderInfoRefundDTO implements Serializable {
      * 是否是现金退款
      */
     private boolean cash;
+    /**
+     * 是否打印退菜/退款票
+     */
+    private boolean print;
 
     private String refundReason;
 

cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java

@@ -184,7 +184,7 @@ public interface PrinterImpl {
                 .append(getFormatLabel("交班小票", signLabelInfo.s, signLabelInfo.center)).append(signLabelInfo.br)
                 .append(getFormatLabel("交班时间: " + DateUtil.format(handoverRecord.getHandoverTime(), "yyyy/MM/dd HH:mm:ss"), signLabelInfo.s)).append(signLabelInfo.br)
                 .append(getFormatLabel("收银员: " + handoverRecord.getStaffName(), signLabelInfo.s)).append(signLabelInfo.br)
-                .append(getFormatLabel("交班周期: " + DateUtil.format(handoverRecord.getLoginTime(), "dd日HH:mm") + " - " +
+                .append(getFormatLabel("交班周期: " + DateUtil.format(handoverRecord.getLoginTime(), "dd日HH:mm") + "--" +
                         DateUtil.format(handoverRecord.getHandoverTime(), "dd日HH:mm"), signLabelInfo.s)).append(signLabelInfo.br)
 
                 .append(signLabelInfo.br)

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java

@@ -510,9 +510,11 @@ public class OrderPayServiceImpl implements OrderPayService {
         orderInfo.setRefundRemark(orderInfo.getRefundRemark() + param.getRefundReason());
         orderInfoService.updateById(orderInfo);
         //退款后续 退款单/退菜单
-        printerHandler.refundOrderHandler(printTitle, StrUtil.isNotBlank(param.getOperator()) ? param.getOperator() : ""
+        if (param.isPrint()) {
-                , isPay ? param.getRefundAmount().toPlainString() : "0"
+            printerHandler.refundOrderHandler(printTitle, StrUtil.isNotBlank(param.getOperator()) ? param.getOperator() : ""
-                , param.getRefundReason(), orderInfo.getRefundType(), orderInfo, param.getRefundDetails());
+                    , isPay ? param.getRefundAmount().toPlainString() : "0"
+                    , param.getRefundReason(), orderInfo.getRefundType(), orderInfo, param.getRefundDetails());
+        }
         //退款返还库存
         if (!returnProMap.isEmpty()) {
             rabbitPublisher.sendOrderRefundMsg(JSONObject.toJSONString(Map.of("orderId", orderInfo.getId(), "returnProMap", returnProMap)));