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 outRecordList; + private Collection fullReductionCoupon; + private Collection 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 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 productArr = new ArrayList<>(); + couponInfo.getProductCouponMap().values().forEach(item -> { + productArr.add(BeanUtil.copyProperties(item, OrderInfoUserCouponVo.class)); + }); + infoDTO.setProductCoupon(productArr); + + ArrayList fullArr = new ArrayList<>(); + couponInfo.getFullReductionCouponMap().values().forEach(item -> { + fullArr.add(BeanUtil.copyProperties(item, OrderInfoUserCouponVo.class)); + }); + infoDTO.setFullReductionCoupon(fullArr); + orderInfo.setCouponInfoList(JSONObject.toJSONString(infoDTO)); } // 修改订单详情并打票