From 0336f4f3f7877d6fc472a31fd1cf8fb2ab2ff5b5 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Wed, 9 Nov 2022 16:16:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=A1=A5=E9=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/chjyj/szwh/bean/OrderGoodsDetail.java  |  4 ++
 .../szwh/mapper/OrderGoodsDetailMapper.java   |  7 ++++
 .../mapper/szwh/OrderGoodsDetailMapper.xml    | 41 +++++++++++++------
 3 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/bean/OrderGoodsDetail.java b/src/main/java/cn/chjyj/szwh/bean/OrderGoodsDetail.java
index ea8c5c1..f6110e0 100644
--- a/src/main/java/cn/chjyj/szwh/bean/OrderGoodsDetail.java
+++ b/src/main/java/cn/chjyj/szwh/bean/OrderGoodsDetail.java
@@ -1,5 +1,7 @@
 package cn.chjyj.szwh.bean;
 
+import com.alibaba.fastjson2.annotation.JSONField;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -27,6 +29,7 @@ public class OrderGoodsDetail implements Serializable {
     private Integer id;
     private String batchcode;//订单号
     private Integer userId;//用户id
+    @JSONField(name = "entrust_islicode")
     private String entrustIslicode;//委托方isli标识码
     private String islicode;
     private String goodsName;//商品名称
@@ -50,6 +53,7 @@ public class OrderGoodsDetail implements Serializable {
     private Integer goodsOwnership;//商品类型；1：所有权；2：使用权
     private String goodsOwnershipStr;//商品权属
     private Integer goodsType;//商品类型；1：文化资源数据；2：文化数字内容
+    @JSONField(name = "charges_type")
     private Integer chargesType;//商品费用类型；1：免费；2：付费
     private String goodsIslicode;//商品isli标识码
     private Integer goodsEntrust;//商品委托类型；1：转让；2：许可
diff --git a/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java b/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java
index 76bc046..7d5181e 100644
--- a/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java
+++ b/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java
@@ -95,4 +95,11 @@ public interface OrderGoodsDetailMapper {
      */
     List<OrderGoodsDetail> getOrderGoodsDetailByMap(@Param("qmap") Map<String,String> qmap,
                                                    @Param("field") String field);
+
+    /**
+     * add order goods detail
+     * @param orderGoodsDetail
+     * @return
+     */
+    int addOrderGoodsDetail(OrderGoodsDetail orderGoodsDetail);
 }
diff --git a/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml b/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml
index 027ef4a..a06f9e0 100644
--- a/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml
+++ b/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml
@@ -7,7 +7,7 @@
     <sql id="column">
       id,batchcode,user_id as userId,entrust_islicode as entrustIslicode,islicode,
       goods_name as goodsName,goods_image as goodsImage,contract_code as contractCode,
-      orderIslicode,history_entrust_name as historyEntrustName,history_entrust_code,
+      orderIslicode,history_entrust_name as historyEntrustName,history_entrust_code as historyEntrustCode,
       identifier,identifiers,sourcedata_islicode as sourcedataIslicode,close_serial_number as closeSerialNumber,
       price,goods_price as goodsPrice,service_charge as serviceCharge,earnest_money as earnestMoney,
       transaction_count as transactionCount,money,entrust_service_charge as entrustServiceCharge,
@@ -119,20 +119,35 @@
     </select>
 
     <!--新增用户-->
-    <insert id="addUser" parameterType="cn.chjyj.szwh.bean.Goods" useGeneratedKeys="true" keyColumn="uid">
+    <insert id="addOrderGoodsDetail" parameterType="cn.chjyj.szwh.bean.OrderGoodsDetail" useGeneratedKeys="true" keyProperty="id" keyColumn="uid">
         insert into <include refid="tbName"/>
-        (uname,password,gender,urealname,ubirth,nickname,avatarurl,platfrom,sessionkey,openid)
+        (batchcode,user_id,entrust_islicode,islicode,
+        goods_name,goods_image,contract_code,
+        orderIslicode,history_entrust_name,history_entrust_code,
+        identifier,identifiers,sourcedata_islicode,close_serial_number,
+        price,goods_price,service_charge,earnest_money,
+        transaction_count,money,entrust_service_charge,
+        entrust_money,goods_ownership,goods_ownership_str,
+        goods_type,charges_type,goods_islicode,goods_entrust,
+        contractual_period,transaction_class,contract,
+        otherIdentifiers,classification,source_islicode,source_islicode_name,
+        data_json,source_json,source_download,close_id,
+        close_status,is_close,callback_msg,createtime,
+        updatetime,is_deleted)
         values (
-        #{uname},
-        #{password},
-        #{gender},
-        #{urealname},
-        #{ubirth},
-        #{nickname},
-        #{avatarurl},
-        #{platfrom},
-        #{sessionkey},
-        #{openid}
+        #{batchcode},#{userId},#{entrustIslicode},#{islicode},
+        #{goodsName},#{goodsImage},#{contractCode},
+        #{orderIslicode},#{historyEntrustName},#{historyEntrustCode},
+        #{identifier},#{identifiers},#{sourcedataIslicode},#{closeSerialNumber},
+        #{price},#{goodsPrice},#{serviceCharge},#{earnestMoney},
+        #{transactionCount},#{money},#{entrustServiceCharge},
+        #{entrustMoney},#{goodsOwnership},#{goodsOwnershipStr},
+        #{goodsType},#{chargesType},#{goodsIslicode},#{goodsEntrust},
+        #{contractualPeriod},#{transactionClass},#{contract},
+        #{otherIdentifiers},#{classification},#{sourceIslicode},#{sourceIslicodeName},
+        #{dataJson},#{sourceJson},#{sourceDownload},#{closeId},
+        #{closeStatus},#{isClose},#{callbackMsg},#{createtime},
+        #{updatetime},0
         )
     </insert>