czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 订单保存优惠券信息修改

Browse Source
This commit is contained in:
张松
2024-11-21 11:43:10 +08:00
parent 43303a76af
commit eae6676b6c
3 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/OrderInfoCouponInfoDTO.java Normal file
View File

@@ -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;
}

11
src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/OrderInfoUserCouponVo.java Normal file
View File

@@ -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;
}

21
src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
View File

@@ -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));
}
// 修改订单详情并打票