diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java index b324fd661..a02c47f2e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java @@ -2,6 +2,10 @@ package com.iformall.domain.po; import java.util.Date; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; @@ -38,4 +42,13 @@ public class WxFinancePrintTemplate extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "单价", name = "content") private String content; + @TableField(exist = false) + private JSONObject contentJson; + public JSONObject getContentJson() { + if (StringUtils.isNotBlank(content)) { + return JSON.parseObject(content); + } + return null; + } + } diff --git a/mallinkService/src/main/java/com/iformall/print/PrintDataHandler.java b/mallinkService/src/main/java/com/iformall/print/PrintDataHandler.java new file mode 100644 index 000000000..eecfd9000 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/print/PrintDataHandler.java @@ -0,0 +1,17 @@ +package com.iformall.print; + +import lombok.Data; +import java.io.Serializable; +import java.util.List; + +import com.iformall.print.entity.PrintDataBraidTableColumns; + +@Data +public class PrintDataHandler implements Serializable { + + private static final long serialVersionUID = 1L; + +// public static Object parseComponent() { +// +// } +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTable.java b/mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTable.java similarity index 95% rename from mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTable.java rename to mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTable.java index 5e96f506d..32eb0545b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTable.java +++ b/mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTable.java @@ -1,4 +1,4 @@ -package com.iformall.domain.vo.print; +package com.iformall.print.entity; import lombok.Data; import java.io.Serializable; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumns.java b/mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTableColumns.java similarity index 89% rename from mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumns.java rename to mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTableColumns.java index b8433e0e6..73076b027 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumns.java +++ b/mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTableColumns.java @@ -1,4 +1,4 @@ -package com.iformall.domain.vo.print; +package com.iformall.print.entity; import lombok.Data; import java.io.Serializable; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumnsTrSet.java b/mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTableColumnsTrSet.java similarity index 88% rename from mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumnsTrSet.java rename to mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTableColumnsTrSet.java index 4f64700a3..d9aa597a9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumnsTrSet.java +++ b/mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTableColumnsTrSet.java @@ -1,4 +1,4 @@ -package com.iformall.domain.vo.print; +package com.iformall.print.entity; import lombok.Data; import java.io.Serializable; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTxt.java b/mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTxt.java similarity index 96% rename from mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTxt.java rename to mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTxt.java index 63ba5bd25..3afa2579c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTxt.java +++ b/mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTxt.java @@ -1,4 +1,4 @@ -package com.iformall.domain.vo.print; +package com.iformall.print.entity; import lombok.Data; import java.io.Serializable;