From badd52ab7350c7e77c4056945fa891904de1dbc9 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Wed, 6 Mar 2024 11:03:31 +0800
Subject: [PATCH] 3/6

---
 .../yxt/yythmall/api/transferrecords/TransferRecordsVo.java | 1 +
 .../vegecallerreserveorder/VegeCellarReserveOrderVo.java    | 1 +
 .../biz/transferrecords/TransferRecordsService.java         | 2 +-
 .../VegeCellarReserveOrderService.java                      | 6 ++++--
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsVo.java b/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsVo.java
index 75ea2c0..2aee60d 100644
--- a/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsVo.java
+++ b/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsVo.java
@@ -20,6 +20,7 @@ public class TransferRecordsVo implements Vo {
     private String sid;
     private String customerSid;//客户sid
     private String transferCode;//转赠code
+    private String newCode;//转赠code  加空格
     private String affiliation;//所属菜窖
     private String state;//
     private String stateValue;//
diff --git a/src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java b/src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java
index eecacd6..f4b5660 100644
--- a/src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java
+++ b/src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java
@@ -43,5 +43,6 @@ public class VegeCellarReserveOrderVo implements Vo {
     private String stateValue;
     private String affiliationValue;
     private String reserveCode;
+    private String newCode;
     private boolean showLsit=false;
 }
diff --git a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java
index 7756c7e..fc06173 100644
--- a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java
+++ b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java
@@ -137,7 +137,7 @@ public class TransferRecordsService extends MybatisBaseService<TransferRecordsMa
                 }
             }
             if(StringUtils.isNotBlank(vo.getTransferCode())){
-                vo.setTransferCode(addSpaces(vo.getTransferCode()));
+                vo.setNewCode(addSpaces(vo.getTransferCode()));
             }
 //            vo.setGoodsVo(goodsVo);
         }
diff --git a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
index 2d020e2..ed9d710 100644
--- a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
+++ b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
@@ -343,7 +343,9 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
                     vo.setGoodss(vo.getGoodss() + "    " + lpkGoods.getName() + "：" + goods1.getNum() + lpkGoods.getUnitName());
                 }
             }
-            vo.setReserveCode(addSpaces(vo.getReserveCode()));
+            if(StringUtils.isNotBlank(vo.getReserveCode())){
+                vo.setNewCode(addSpaces(vo.getReserveCode()));
+            }
             vo.setGoodsVo(goodsVo);
         }
 
@@ -887,7 +889,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
     }
     /**
      * 单号每四位加空格
-     * @param newCode
+     * @param
      * @return
      */
     public static String addSpaces(String code) {