From b107c8dfc2263d5107f3a9c43eef04edb0a96f92 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 8 Dec 2023 15:56:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E3=80=81=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusDeliveredApplyService.java                | 16 ++++++++--------
 .../biz/bussalesorder/BusSalesOrderService.java  |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index b6d4a8ca9a..094e35beb8 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -2657,10 +2657,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     busDeliveredDetailsDiscountService.insert(busDeliveredDetailsDiscount);
                     discountAll = discountAll.add(new BigDecimal(busDeliveredDetailsDiscount.getPrice()).multiply(new BigDecimal(busDeliveredDetailsDiscount.getGiveNum())));
                     if (j == 0 || j == discountUse.size() - 1) {
-                        String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "X" + busDeliveredDetailsDiscount.getGiveNum();
+                        String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "*" + busDeliveredDetailsDiscount.getGiveNum();
                         discountRemarks = discountRemarks.append(disInfo).append(",");
                     } else {
-                        String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "X" + busDeliveredDetailsDiscount.getGiveNum();
+                        String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "*" + busDeliveredDetailsDiscount.getGiveNum();
                         discountRemarks = discountRemarks.append(disInfo);
                     }
                 }
@@ -2840,10 +2840,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     busDeliveredDetailsDiscountService.insert(busDeliveredDetailsDiscount);
                     discountAll = discountAll.add(new BigDecimal(busDeliveredDetailsDiscount.getPrice()).multiply(new BigDecimal(busDeliveredDetailsDiscount.getGiveNum())));
                     if (j == 0 || j == discountUse.size() - 1) {
-                        String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "X" + busDeliveredDetailsDiscount.getGiveNum();
+                        String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "*" + busDeliveredDetailsDiscount.getGiveNum();
                         discountRemarks = discountRemarks.append(disInfo).append(",");
                     } else {
-                        String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "X" + busDeliveredDetailsDiscount.getGiveNum();
+                        String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "*" + busDeliveredDetailsDiscount.getGiveNum();
                         discountRemarks = discountRemarks.append(disInfo);
                     }
                 }
@@ -3662,10 +3662,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     busDeliveredDetailsDiscountService.insert(busDeliveredDetailsDiscount);
                     discountAll = discountAll.add(new BigDecimal(busDeliveredDetailsDiscount.getPrice()).multiply(new BigDecimal(busDeliveredDetailsDiscount.getGiveNum())));
                     if (j == 0 || j == discountUse.size() - 1) {
-                        String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "X" + busDeliveredDetailsDiscount.getGiveNum();
+                        String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "*" + busDeliveredDetailsDiscount.getGiveNum();
                         discountRemarks = discountRemarks.append(disInfo).append(",");
                     } else {
-                        String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "X" + busDeliveredDetailsDiscount.getGiveNum();
+                        String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "*" + busDeliveredDetailsDiscount.getGiveNum();
                         discountRemarks = discountRemarks.append(disInfo);
                     }
                 }
@@ -3853,10 +3853,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     busDeliveredDetailsDiscountService.insert(busDeliveredDetailsDiscount);
                     discountAll = discountAll.add(new BigDecimal(busDeliveredDetailsDiscount.getPrice()).multiply(new BigDecimal(busDeliveredDetailsDiscount.getGiveNum())));
                     if (j == 0 || j == discountUse.size() - 1) {
-                        String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "X" + busDeliveredDetailsDiscount.getGiveNum();
+                        String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "*" + busDeliveredDetailsDiscount.getGiveNum();
                         discountRemarks = discountRemarks.append(disInfo).append(",");
                     } else {
-                        String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "X" + busDeliveredDetailsDiscount.getGiveNum();
+                        String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "*" + busDeliveredDetailsDiscount.getGiveNum();
                         discountRemarks = discountRemarks.append(disInfo);
                     }
                 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 038408845d..23c6bf09be 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -6850,7 +6850,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //赠送客户物品
             String zskhwp = "";
             for (AppOrderDiscountListVo appOrderDiscountListVo : appOrderDiscountListVos) {
-                zskhwp = zskhwp + appOrderDiscountListVo.getDiscountExplain() + "，" + "数量" + appOrderDiscountListVo.getNumber() + "，价值" + appOrderDiscountListVo.getTotal() + "元。 ";
+                zskhwp = zskhwp + appOrderDiscountListVo.getDiscountName() + "(" + appOrderDiscountListVo.getDiscountExplain() + ")，" + "数量" + appOrderDiscountListVo.getNumber() + "，价值" + appOrderDiscountListVo.getTotal() + "元。 ";
             }
             dataMap.put("zskhwp", zskhwp);
         }