| @@ -1,11 +1,13 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import cn.afterturn.easypoi.excel.annotation.Excel; | import cn.afterturn.easypoi.excel.annotation.Excel; | ||||
| import com.alibaba.fastjson.JSON; | |||||
| import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.common.SortColumn; | import com.iformall.common.SortColumn; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import com.iformall.domain.vo.WxCouponStatisVo; | import com.iformall.domain.vo.WxCouponStatisVo; | ||||
| import com.iformall.domain.vo.WxMerchantVo; | |||||
| import com.iformall.enums.EnumCouponType; | import com.iformall.enums.EnumCouponType; | ||||
| import com.iformall.enums.EnumValidStatus; | import com.iformall.enums.EnumValidStatus; | ||||
| import com.iformall.utils.Constant; | import com.iformall.utils.Constant; | ||||
| @@ -13,6 +15,7 @@ import com.iformall.utils.DateUtils; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import lombok.ToString; | import lombok.ToString; | ||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
| import java.util.Date; | import java.util.Date; | ||||
| @@ -170,6 +173,12 @@ public class OrderSnapshot extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String subsidyNumStr; | private String subsidyNumStr; | ||||
| @TableField(exist = false) | |||||
| private List<WxCoupon> giftCouponList; | |||||
| @TableField(exist = false) | |||||
| private List<WxMerchantVo> merchantVoList; | |||||
| public String getSalePriceStr() { | public String getSalePriceStr() { | ||||
| if(salePrice!=null) { | if(salePrice!=null) { | ||||
| salePriceStr = new BigDecimal(salePrice).divide(new BigDecimal(100)).toString(); | salePriceStr = new BigDecimal(salePrice).divide(new BigDecimal(100)).toString(); | ||||
| @@ -336,6 +345,29 @@ public class OrderSnapshot extends TenantEntity { | |||||
| return valid_date; | return valid_date; | ||||
| } | } | ||||
| public List<WxCoupon> getGiftCouponList(){ | |||||
| if(StringUtils.isNotBlank(giftList)){ | |||||
| try{ | |||||
| return JSON.parseArray(giftList, WxCoupon.class); | |||||
| }catch(Exception e){ | |||||
| } | |||||
| } | |||||
| return null; | |||||
| } | |||||
| public List<WxMerchantVo> getMerchantVoList(){ | |||||
| if(StringUtils.isNotBlank(merchantList)){ | |||||
| try{ | |||||
| return JSON.parseArray(merchantList, WxMerchantVo.class); | |||||
| }catch(Exception e){ | |||||
| } | |||||
| } | |||||
| return null; | |||||
| } | |||||
| public void initByCoupon(WxCoupon c) { | public void initByCoupon(WxCoupon c) { | ||||
| this.setType(c.getType()); | this.setType(c.getType()); | ||||