From ae9dae20c3c218a6e74d67e7f1dbb29e21c89242 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Sat, 20 May 2023 11:42:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=B1=87=E4=BB=98=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=9B=9E=E8=B0=83=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/domain/AdapayCallbackRecord.java       | 11 +----------
 .../mapper/pile/AdapayCallbackRecordMapper.xml  | 16 ++++++++--------
 .../generate/AdapayCallbackRecordMapper.java    | 17 +++++++++++++++++
 3 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 src/main/java/generate/AdapayCallbackRecordMapper.java

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayCallbackRecord.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayCallbackRecord.java
index 9f9ced48e..43424e889 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayCallbackRecord.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayCallbackRecord.java
@@ -1,13 +1,10 @@
 package com.jsowell.pile.domain;
 
-import com.alibaba.fastjson2.JSONObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.Map;
 
 /**
  * adapay_callback_record
@@ -40,7 +37,7 @@ public class AdapayCallbackRecord implements Serializable {
      */
     private String endTime;
 
-    private String expend;
+    private Object expend;
 
     private BigDecimal feeAmt;
 
@@ -76,10 +73,4 @@ public class AdapayCallbackRecord implements Serializable {
     private String delFlag;
 
     private static final long serialVersionUID = 1L;
-
-    @JsonProperty(value = "expend")
-    public void setExpend(Map<String, Object> expend){
-        this.expend = JSONObject.toJSONString(expend);
-    }
-
 }
\ No newline at end of file
diff --git a/jsowell-pile/src/main/resources/mapper/pile/AdapayCallbackRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/AdapayCallbackRecordMapper.xml
index d34fa43b7..d8135e678 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/AdapayCallbackRecordMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/AdapayCallbackRecordMapper.xml
@@ -7,7 +7,7 @@
     <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="created_time" jdbcType="VARCHAR" property="createdTime" />
     <result column="end_time" jdbcType="VARCHAR" property="endTime" />
-    <result column="expend" jdbcType="VARCHAR" property="expend" />
+    <result column="expend" jdbcType="OTHER" property="expend" />
     <result column="fee_amt" jdbcType="DECIMAL" property="feeAmt" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="out_trans_id" jdbcType="VARCHAR" property="outTransId" />
@@ -26,13 +26,13 @@
     party_order_id, pay_amt, pay_channel, real_amt, share_eq, `status`, wx_user_id, create_time, 
     del_flag
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
     from adapay_callback_record
     where id = #{id,jdbcType=VARCHAR}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from adapay_callback_record
     where id = #{id,jdbcType=VARCHAR}
   </delete>
@@ -44,8 +44,8 @@
       share_eq, `status`, wx_user_id, 
       create_time, del_flag)
     values (#{appId,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{createdTime,jdbcType=VARCHAR}, 
-      #{endTime,jdbcType=VARCHAR}, #{expend,jdbcType=VARCHAR}, #{feeAmt,jdbcType=DECIMAL}, 
-      #{orderNo,jdbcType=VARCHAR}, #{outTransId,jdbcType=VARCHAR}, #{partyOrderId,jdbcType=VARCHAR},
+      #{endTime,jdbcType=VARCHAR}, #{expend,jdbcType=OTHER}, #{feeAmt,jdbcType=DECIMAL}, 
+      #{orderNo,jdbcType=VARCHAR}, #{outTransId,jdbcType=VARCHAR}, #{partyOrderId,jdbcType=VARCHAR}, 
       #{payAmt,jdbcType=DECIMAL}, #{payChannel,jdbcType=VARCHAR}, #{realAmt,jdbcType=DECIMAL}, 
       #{shareEq,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{wxUserId,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=VARCHAR})
@@ -119,7 +119,7 @@
         #{endTime,jdbcType=VARCHAR},
       </if>
       <if test="expend != null">
-        #{expend,jdbcType=VARCHAR},
+        #{expend,jdbcType=OTHER},
       </if>
       <if test="feeAmt != null">
         #{feeAmt,jdbcType=DECIMAL},
@@ -175,7 +175,7 @@
         end_time = #{endTime,jdbcType=VARCHAR},
       </if>
       <if test="expend != null">
-        expend = #{expend,jdbcType=VARCHAR},
+        expend = #{expend,jdbcType=OTHER},
       </if>
       <if test="feeAmt != null">
         fee_amt = #{feeAmt,jdbcType=DECIMAL},
@@ -222,7 +222,7 @@
       description = #{description,jdbcType=VARCHAR},
       created_time = #{createdTime,jdbcType=VARCHAR},
       end_time = #{endTime,jdbcType=VARCHAR},
-      expend = #{expend,jdbcType=VARCHAR},
+      expend = #{expend,jdbcType=OTHER},
       fee_amt = #{feeAmt,jdbcType=DECIMAL},
       order_no = #{orderNo,jdbcType=VARCHAR},
       out_trans_id = #{outTransId,jdbcType=VARCHAR},
diff --git a/src/main/java/generate/AdapayCallbackRecordMapper.java b/src/main/java/generate/AdapayCallbackRecordMapper.java
new file mode 100644
index 000000000..eb9152778
--- /dev/null
+++ b/src/main/java/generate/AdapayCallbackRecordMapper.java
@@ -0,0 +1,17 @@
+package generate;
+
+import generate.AdapayCallbackRecord;
+
+public interface AdapayCallbackRecordMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(AdapayCallbackRecord record);
+
+    int insertSelective(AdapayCallbackRecord record);
+
+    AdapayCallbackRecord selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(AdapayCallbackRecord record);
+
+    int updateByPrimaryKey(AdapayCallbackRecord record);
+}
\ No newline at end of file