From 82ad64281ee6e3428e8b4a5cd4c90e6b8a1c99bb Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 22 Apr 2022 19:27:36 +0800 Subject: [PATCH] //update --- .../com/iformall/domain/po/OrderSnapshot.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java b/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java index 835c152fd..0bf75d06c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java @@ -1,11 +1,13 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponStatisVo; +import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.EnumCouponType; import com.iformall.enums.EnumValidStatus; import com.iformall.utils.Constant; @@ -13,6 +15,7 @@ import com.iformall.utils.DateUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; import java.util.Date; @@ -170,6 +173,12 @@ public class OrderSnapshot extends TenantEntity { @TableField(exist = false) private String subsidyNumStr; + @TableField(exist = false) + private List giftCouponList; + + @TableField(exist = false) + private List merchantVoList; + public String getSalePriceStr() { if(salePrice!=null) { salePriceStr = new BigDecimal(salePrice).divide(new BigDecimal(100)).toString(); @@ -336,6 +345,29 @@ public class OrderSnapshot extends TenantEntity { return valid_date; } + public List getGiftCouponList(){ + if(StringUtils.isNotBlank(giftList)){ + try{ + return JSON.parseArray(giftList, WxCoupon.class); + }catch(Exception e){ + } + + } + return null; + } + + public List getMerchantVoList(){ + if(StringUtils.isNotBlank(merchantList)){ + try{ + return JSON.parseArray(merchantList, WxMerchantVo.class); + }catch(Exception e){ + } + + } + return null; + + } + public void initByCoupon(WxCoupon c) { this.setType(c.getType());