From eae6676b6cd8518d141cf8171b9e9f584c32d707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 21 Nov 2024 11:43:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/dto/OrderInfoCouponInfoDTO.java    | 14 +++++++++++++
 .../entity/dto/OrderInfoUserCouponVo.java     | 11 ++++++++++
 .../cashierservice/service/CartService.java   | 21 ++++++++++++++-----
 3 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/OrderInfoCouponInfoDTO.java
 create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/OrderInfoUserCouponVo.java

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/OrderInfoCouponInfoDTO.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/OrderInfoCouponInfoDTO.java
new file mode 100644
index 0000000..b961219
--- /dev/null
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/OrderInfoCouponInfoDTO.java
@@ -0,0 +1,14 @@
+package com.chaozhanggui.system.cashierservice.entity.dto;
+
+import com.chaozhanggui.system.cashierservice.entity.TbActivateOutRecord;
+import lombok.Data;
+
+import java.util.Collection;
+import java.util.List;
+
+@Data
+public class OrderInfoCouponInfoDTO {
+    private List<TbActivateOutRecord> outRecordList;
+    private Collection<OrderInfoUserCouponVo> fullReductionCoupon;
+    private Collection<OrderInfoUserCouponVo> productCoupon;
+}
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/OrderInfoUserCouponVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/OrderInfoUserCouponVo.java
new file mode 100644
index 0000000..c99a42e
--- /dev/null
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/OrderInfoUserCouponVo.java
@@ -0,0 +1,11 @@
+package com.chaozhanggui.system.cashierservice.entity.dto;
+
+import com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class OrderInfoUserCouponVo extends TbUserCouponVo {
+    private int returnNum = 0;
+}
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
index b6d25f9..c640c55 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -1474,11 +1474,22 @@ public class CartService {
                 }
 
                 couponInfo.setProductCouponMap(BeanUtil.copyProperties(couponInfo.getProductCouponMap(), HashMap.class));
-                HashMap<String, Object> map = new HashMap<>();
-                map.put("outRecordList", couponInfo.getOutRecordList());
-                map.put("fullReductionCoupon", couponInfo.getFullReductionCouponMap().values());
-                map.put("productCoupon", couponInfo.getProductCouponMap().values());
-                orderInfo.setCouponInfoList(JSONObject.toJSONString(map));
+
+                OrderInfoCouponInfoDTO infoDTO = new OrderInfoCouponInfoDTO();
+                infoDTO.setOutRecordList(couponInfo.getOutRecordList());
+
+                ArrayList<OrderInfoUserCouponVo> productArr = new ArrayList<>();
+                couponInfo.getProductCouponMap().values().forEach(item -> {
+                    productArr.add(BeanUtil.copyProperties(item, OrderInfoUserCouponVo.class));
+                });
+                infoDTO.setProductCoupon(productArr);
+
+                ArrayList<OrderInfoUserCouponVo> fullArr = new ArrayList<>();
+                couponInfo.getFullReductionCouponMap().values().forEach(item -> {
+                    fullArr.add(BeanUtil.copyProperties(item, OrderInfoUserCouponVo.class));
+                });
+                infoDTO.setFullReductionCoupon(fullArr);
+                orderInfo.setCouponInfoList(JSONObject.toJSONString(infoDTO));
             }
 
             // 修改订单详情并打票