From d46d4ca6df41c73efd1f756a3686c82cb0146424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Wed, 19 Jun 2024 17:27:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/OrderService.java       | 8 ++++----
 src/main/resources/mapper/TbOrderInfoMapper.xml           | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index 8098772..9612433 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -1018,8 +1018,8 @@ public class OrderService {
             orderOutNumber.setOutCode(outCode);
             Map<String,String> map= tbOrderInfoMapper.selectByOrderId(orderInfo.getId().toString());
             orderOutNumber.setShopId(shopId);
-            orderOutNumber.setProductName(map.containsKey("product_names")?map.get("product_names").substring(0,map.get("product_names").length()-1):"");
-            orderOutNumber.setProductSku(map.containsKey("product_sku_name")?map.get("product_sku_name").substring(0,map.get("product_sku_name").length()-1):"");
+            orderOutNumber.setProductName(map.containsKey("product_names")?map.get("product_names"):"");
+            orderOutNumber.setProductSku(map.containsKey("product_sku_name")?map.get("product_sku_name"):"");
             orderOutNumber.setStatus("0");
             orderOutNumber.setRemark("成功");
             orderOutNumber.setCreateTime(new Date());
@@ -1029,8 +1029,8 @@ public class OrderService {
         orderOutNumber.setOutCode(outCode);
         orderOutNumber.setShopId(shopId);
         Map<String,String> map= tbOrderInfoMapper.selectByOrderId(orderInfo.getId().toString());
-        orderOutNumber.setProductName(map.containsKey("product_names")?map.get("product_names").substring(0,map.get("product_names").length()-1):"");
-        orderOutNumber.setProductSku(map.containsKey("product_sku_name")?map.get("product_sku_name").substring(0,map.get("product_sku_name").length()-1):"");
+        orderOutNumber.setProductName(map.containsKey("product_names")?map.get("product_names"):"");
+        orderOutNumber.setProductSku(map.containsKey("product_sku_name")?map.get("product_sku_name"):"");
         orderOutNumber.setStatus("1");
         orderOutNumber.setRemark(linkedHashMap.containsKey(resObj.get("errcode")+"")?linkedHashMap.get(resObj.get("errcode")+""):"未知错误");
         orderOutNumber.setCreateTime(new Date());
diff --git a/src/main/resources/mapper/TbOrderInfoMapper.xml b/src/main/resources/mapper/TbOrderInfoMapper.xml
index a24346d..344708d 100644
--- a/src/main/resources/mapper/TbOrderInfoMapper.xml
+++ b/src/main/resources/mapper/TbOrderInfoMapper.xml
@@ -556,8 +556,8 @@ select * from tb_order_info where trade_day = #{day} and table_id = #{masterId}
 
     <select id="selectByOrderId" resultType="java.util.Map">
         SELECT
-            GROUP_CONCAT( d.product_name, ',' ) AS product_names,
-            GROUP_CONCAT( d.product_sku_name, ',' ) AS product_sku_name
+            GROUP_CONCAT( d.product_name ) AS product_names,
+            GROUP_CONCAT( d.product_sku_name ) AS product_sku_name
         FROM
             tb_order_detail d
         WHERE