From 88b1b9c28df2c9a632a6c7c33cffa6e1c1465faa Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Thu, 27 Oct 2022 13:21:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF=E6=98=A0?=
 =?UTF-8?q?=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/chjyj/szwh/vo/GoodsListVo.java    | 47 +++++++++++++++++++
 .../resources/mapper/szwh/GoodsMapper.xml     |  3 +-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cn/chjyj/szwh/vo/GoodsListVo.java b/src/main/java/cn/chjyj/szwh/vo/GoodsListVo.java
index b0e8465..9c2ff75 100644
--- a/src/main/java/cn/chjyj/szwh/vo/GoodsListVo.java
+++ b/src/main/java/cn/chjyj/szwh/vo/GoodsListVo.java
@@ -1,5 +1,7 @@
 package cn.chjyj.szwh.vo;
 
+import java.math.BigDecimal;
+
 /**
  * 商品列表映射
  * goods+goods_detail
@@ -18,6 +20,11 @@ public class GoodsListVo {
     private Integer entrust_status; //商品委托类型；1：转让；2：许可 \goods_detail
     //处理其他操作
     private String key;
+    private Integer charges_type; //付费类型 1：免费 2：付费
+    private Integer goods_entrust;//委托类型
+    private BigDecimal price; //gd 价格
+    private String canceltime; //撤销时间
+    private String goods_ownership_str;
 
     public Integer getId() {
         return id;
@@ -114,4 +121,44 @@ public class GoodsListVo {
     public void setKey(String key) {
         this.key = key;
     }
+
+    public Integer getCharges_type() {
+        return charges_type;
+    }
+
+    public void setCharges_type(Integer charges_type) {
+        this.charges_type = charges_type;
+    }
+
+    public Integer getGoods_entrust() {
+        return goods_entrust;
+    }
+
+    public void setGoods_entrust(Integer goods_entrust) {
+        this.goods_entrust = goods_entrust;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public String getCanceltime() {
+        return canceltime;
+    }
+
+    public void setCanceltime(String canceltime) {
+        this.canceltime = canceltime;
+    }
+
+    public String getGoods_ownership_str() {
+        return goods_ownership_str;
+    }
+
+    public void setGoods_ownership_str(String goods_ownership_str) {
+        this.goods_ownership_str = goods_ownership_str;
+    }
 }
diff --git a/src/main/resources/mapper/szwh/GoodsMapper.xml b/src/main/resources/mapper/szwh/GoodsMapper.xml
index 0704262..184ff87 100644
--- a/src/main/resources/mapper/szwh/GoodsMapper.xml
+++ b/src/main/resources/mapper/szwh/GoodsMapper.xml
@@ -66,7 +66,8 @@
     <select id="getGoodsVoList" parameterType="java.util.Map" resultType="cn.chjyj.szwh.vo.GoodsListVo">
         SELECT g.id,g.createtime,g.goods_islicode,
                gd.goods_name, g.username,g.user_islicode,
-               gd.goods_type, g.goods_status, g.goods_detail_id,
+               gd.goods_type, g.goods_status, g.goods_detail_id,g.canceltime,
+               gd.charges_type,gd.goods_entrust,gd.price,gd.goods_ownership_str,
                g.is_recommend as isRecommend, g.entrust_status
         FROM goods as g
         INNER JOIN goods_detail as gd ON g.goods_detail_id=gd.id