From ae55ce4f12e2aecf38d3f2a2d6665fe09336827b Mon Sep 17 00:00:00 2001
From: yang_shj <yang_shj@hisuntech.com>
Date: Wed, 23 Feb 2022 18:19:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:0=20=E6=94=AF=E4=BB=98=E5=B7=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/base/springcloud/base/BaseEntity.java |  12 ++
 .../com/base/springcloud/dao/OrderMapper.java |  17 ++
 .../com/base/springcloud/entity/Merchant.java |  15 +-
 .../com/base/springcloud/entity/Order.java    |  31 ++++
 .../src/main/resources/application.yml        |   1 -
 .../base/payment/mapper/MerchantMapper.xml    | 160 ++++++++++++++++++
 .../com/base/payment/mapper/OrderMapper.xml   | 153 +++++++++++++++++
 .../src/main/resources/generatorConfig.xml    |  31 +++-
 8 files changed, 412 insertions(+), 8 deletions(-)
 create mode 100644 payment-base-app/src/main/java/com/base/springcloud/base/BaseEntity.java
 create mode 100644 payment-base-app/src/main/java/com/base/springcloud/dao/OrderMapper.java
 create mode 100644 payment-base-app/src/main/java/com/base/springcloud/entity/Order.java
 create mode 100644 payment-base-app/src/main/resources/com/base/payment/mapper/OrderMapper.xml

diff --git a/payment-base-app/src/main/java/com/base/springcloud/base/BaseEntity.java b/payment-base-app/src/main/java/com/base/springcloud/base/BaseEntity.java
new file mode 100644
index 0000000..bb5f57e
--- /dev/null
+++ b/payment-base-app/src/main/java/com/base/springcloud/base/BaseEntity.java
@@ -0,0 +1,12 @@
+package com.base.springcloud.base;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class BaseEntity implements Serializable {
+
+	private Date timeStamp;
+}
diff --git a/payment-base-app/src/main/java/com/base/springcloud/dao/OrderMapper.java b/payment-base-app/src/main/java/com/base/springcloud/dao/OrderMapper.java
new file mode 100644
index 0000000..5ed1128
--- /dev/null
+++ b/payment-base-app/src/main/java/com/base/springcloud/dao/OrderMapper.java
@@ -0,0 +1,17 @@
+package com.base.springcloud.dao;
+
+import com.base.springcloud.entity.Order;
+
+public interface OrderMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(Order record);
+
+    int insertSelective(Order record);
+
+    Order selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(Order record);
+
+    int updateByPrimaryKey(Order record);
+}
\ No newline at end of file
diff --git a/payment-base-app/src/main/java/com/base/springcloud/entity/Merchant.java b/payment-base-app/src/main/java/com/base/springcloud/entity/Merchant.java
index b73e54c..65dca08 100644
--- a/payment-base-app/src/main/java/com/base/springcloud/entity/Merchant.java
+++ b/payment-base-app/src/main/java/com/base/springcloud/entity/Merchant.java
@@ -1,10 +1,11 @@
 package com.base.springcloud.entity;
 
+import com.base.springcloud.base.BaseEntity;
 import lombok.Data;
 
-import java.util.Date;
 @Data
-public class Merchant {
+public class Merchant extends BaseEntity {
+
     private String id;
 
     private String merchantId;
@@ -15,5 +16,13 @@ public class Merchant {
 
     private String storeBrandName;
 
-    private Date timeStamp;
+    private String signType;
+
+    private String privateKey;
+
+    private String deviceInfo;
+
+    private String spbillCreateIp;
+
+    private String notifyUrl;
 }
\ No newline at end of file
diff --git a/payment-base-app/src/main/java/com/base/springcloud/entity/Order.java b/payment-base-app/src/main/java/com/base/springcloud/entity/Order.java
new file mode 100644
index 0000000..af06c10
--- /dev/null
+++ b/payment-base-app/src/main/java/com/base/springcloud/entity/Order.java
@@ -0,0 +1,31 @@
+package com.base.springcloud.entity;
+
+import com.base.springcloud.base.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class Order extends BaseEntity {
+
+    private String id;
+
+    private String orderNo;
+
+    private Date createTime;
+
+    private Date expireTime;
+
+    private String requestNo;
+
+    private BigDecimal orderAmount;
+
+    private String goodName;
+
+    private String goodId;
+
+    private String orderType;
+
+    private String reserved;
+}
\ No newline at end of file
diff --git a/payment-base-app/src/main/resources/application.yml b/payment-base-app/src/main/resources/application.yml
index 3f24cf3..4eb8767 100644
--- a/payment-base-app/src/main/resources/application.yml
+++ b/payment-base-app/src/main/resources/application.yml
@@ -1,7 +1,6 @@
 server:
   port: 8001 #服务端口
 #eureka配置
-#eureka配置
 eureka:
   client:
     #表示是否将自己注册进eureka  默认为true
diff --git a/payment-base-app/src/main/resources/com/base/payment/mapper/MerchantMapper.xml b/payment-base-app/src/main/resources/com/base/payment/mapper/MerchantMapper.xml
index 26366d4..f1c7298 100644
--- a/payment-base-app/src/main/resources/com/base/payment/mapper/MerchantMapper.xml
+++ b/payment-base-app/src/main/resources/com/base/payment/mapper/MerchantMapper.xml
@@ -1,6 +1,166 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.base.springcloud.dao.MerchantMapper">
+  <resultMap id="BaseResultMap" type="com.base.springcloud.entity.Merchant">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="merchant_id" jdbcType="VARCHAR" property="merchantId" />
+    <result column="merchant_name" jdbcType="VARCHAR" property="merchantName" />
+    <result column="city_store_name" jdbcType="VARCHAR" property="cityStoreName" />
+    <result column="store_brand_name" jdbcType="VARCHAR" property="storeBrandName" />
+    <result column="sign_type" jdbcType="VARCHAR" property="signType" />
+    <result column="private_key" jdbcType="VARCHAR" property="privateKey" />
+    <result column="device_info" jdbcType="VARCHAR" property="deviceInfo" />
+    <result column="spbill_create_ip" jdbcType="VARCHAR" property="spbillCreateIp" />
+    <result column="notify_url" jdbcType="VARCHAR" property="notifyUrl" />
+    <result column="time_stamp" jdbcType="TIMESTAMP" property="timeStamp" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, merchant_id, merchant_name, city_store_name, store_brand_name, sign_type, private_key, 
+    device_info, spbill_create_ip, notify_url, time_stamp
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from pay_merchant
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from pay_merchant
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.base.springcloud.entity.Merchant">
+    insert into pay_merchant (id, merchant_id, merchant_name, 
+      city_store_name, store_brand_name, sign_type, 
+      private_key, device_info, spbill_create_ip, 
+      notify_url, time_stamp)
+    values (#{id,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, #{merchantName,jdbcType=VARCHAR}, 
+      #{cityStoreName,jdbcType=VARCHAR}, #{storeBrandName,jdbcType=VARCHAR}, #{signType,jdbcType=VARCHAR}, 
+      #{privateKey,jdbcType=VARCHAR}, #{deviceInfo,jdbcType=VARCHAR}, #{spbillCreateIp,jdbcType=VARCHAR}, 
+      #{notifyUrl,jdbcType=VARCHAR}, #{timeStamp,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.base.springcloud.entity.Merchant">
+    insert into pay_merchant
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="merchantId != null">
+        merchant_id,
+      </if>
+      <if test="merchantName != null">
+        merchant_name,
+      </if>
+      <if test="cityStoreName != null">
+        city_store_name,
+      </if>
+      <if test="storeBrandName != null">
+        store_brand_name,
+      </if>
+      <if test="signType != null">
+        sign_type,
+      </if>
+      <if test="privateKey != null">
+        private_key,
+      </if>
+      <if test="deviceInfo != null">
+        device_info,
+      </if>
+      <if test="spbillCreateIp != null">
+        spbill_create_ip,
+      </if>
+      <if test="notifyUrl != null">
+        notify_url,
+      </if>
+      <if test="timeStamp != null">
+        time_stamp,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantId != null">
+        #{merchantId,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantName != null">
+        #{merchantName,jdbcType=VARCHAR},
+      </if>
+      <if test="cityStoreName != null">
+        #{cityStoreName,jdbcType=VARCHAR},
+      </if>
+      <if test="storeBrandName != null">
+        #{storeBrandName,jdbcType=VARCHAR},
+      </if>
+      <if test="signType != null">
+        #{signType,jdbcType=VARCHAR},
+      </if>
+      <if test="privateKey != null">
+        #{privateKey,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceInfo != null">
+        #{deviceInfo,jdbcType=VARCHAR},
+      </if>
+      <if test="spbillCreateIp != null">
+        #{spbillCreateIp,jdbcType=VARCHAR},
+      </if>
+      <if test="notifyUrl != null">
+        #{notifyUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="timeStamp != null">
+        #{timeStamp,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.base.springcloud.entity.Merchant">
+    update pay_merchant
+    <set>
+      <if test="merchantId != null">
+        merchant_id = #{merchantId,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantName != null">
+        merchant_name = #{merchantName,jdbcType=VARCHAR},
+      </if>
+      <if test="cityStoreName != null">
+        city_store_name = #{cityStoreName,jdbcType=VARCHAR},
+      </if>
+      <if test="storeBrandName != null">
+        store_brand_name = #{storeBrandName,jdbcType=VARCHAR},
+      </if>
+      <if test="signType != null">
+        sign_type = #{signType,jdbcType=VARCHAR},
+      </if>
+      <if test="privateKey != null">
+        private_key = #{privateKey,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceInfo != null">
+        device_info = #{deviceInfo,jdbcType=VARCHAR},
+      </if>
+      <if test="spbillCreateIp != null">
+        spbill_create_ip = #{spbillCreateIp,jdbcType=VARCHAR},
+      </if>
+      <if test="notifyUrl != null">
+        notify_url = #{notifyUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="timeStamp != null">
+        time_stamp = #{timeStamp,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.base.springcloud.entity.Merchant">
+    update pay_merchant
+    set merchant_id = #{merchantId,jdbcType=VARCHAR},
+      merchant_name = #{merchantName,jdbcType=VARCHAR},
+      city_store_name = #{cityStoreName,jdbcType=VARCHAR},
+      store_brand_name = #{storeBrandName,jdbcType=VARCHAR},
+      sign_type = #{signType,jdbcType=VARCHAR},
+      private_key = #{privateKey,jdbcType=VARCHAR},
+      device_info = #{deviceInfo,jdbcType=VARCHAR},
+      spbill_create_ip = #{spbillCreateIp,jdbcType=VARCHAR},
+      notify_url = #{notifyUrl,jdbcType=VARCHAR},
+      time_stamp = #{timeStamp,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
   <resultMap id="BaseResultMap" type="com.base.springcloud.entity.Merchant">
     <constructor>
       <idArg column="id" javaType="java.lang.String" jdbcType="VARCHAR" />
diff --git a/payment-base-app/src/main/resources/com/base/payment/mapper/OrderMapper.xml b/payment-base-app/src/main/resources/com/base/payment/mapper/OrderMapper.xml
new file mode 100644
index 0000000..d22e0e3
--- /dev/null
+++ b/payment-base-app/src/main/resources/com/base/payment/mapper/OrderMapper.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.base.springcloud.dao.OrderMapper">
+  <resultMap id="BaseResultMap" type="com.base.springcloud.entity.Order">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="expire_time" jdbcType="TIMESTAMP" property="expireTime" />
+    <result column="request_no" jdbcType="VARCHAR" property="requestNo" />
+    <result column="order_amount" jdbcType="VARCHAR" property="orderAmount" />
+    <result column="good_name" jdbcType="VARCHAR" property="goodName" />
+    <result column="good_id" jdbcType="VARCHAR" property="goodId" />
+    <result column="order_type" jdbcType="VARCHAR" property="orderType" />
+    <result column="reserved" jdbcType="VARCHAR" property="reserved" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, order_no, create_time, expire_time, request_no, order_amount, good_name, good_id, 
+    order_type, reserved
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from pay_order
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from pay_order
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.base.springcloud.entity.Order">
+    insert into pay_order (id, order_no, create_time, 
+      expire_time, request_no, order_amount, 
+      good_name, good_id, order_type, 
+      reserved)
+    values (#{id,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{expireTime,jdbcType=TIMESTAMP}, #{requestNo,jdbcType=VARCHAR}, #{orderAmount,jdbcType=VARCHAR}, 
+      #{goodName,jdbcType=VARCHAR}, #{goodId,jdbcType=VARCHAR}, #{orderType,jdbcType=VARCHAR}, 
+      #{reserved,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.base.springcloud.entity.Order">
+    insert into pay_order
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="expireTime != null">
+        expire_time,
+      </if>
+      <if test="requestNo != null">
+        request_no,
+      </if>
+      <if test="orderAmount != null">
+        order_amount,
+      </if>
+      <if test="goodName != null">
+        good_name,
+      </if>
+      <if test="goodId != null">
+        good_id,
+      </if>
+      <if test="orderType != null">
+        order_type,
+      </if>
+      <if test="reserved != null">
+        reserved,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="expireTime != null">
+        #{expireTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="requestNo != null">
+        #{requestNo,jdbcType=VARCHAR},
+      </if>
+      <if test="orderAmount != null">
+        #{orderAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="goodName != null">
+        #{goodName,jdbcType=VARCHAR},
+      </if>
+      <if test="goodId != null">
+        #{goodId,jdbcType=VARCHAR},
+      </if>
+      <if test="orderType != null">
+        #{orderType,jdbcType=VARCHAR},
+      </if>
+      <if test="reserved != null">
+        #{reserved,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.base.springcloud.entity.Order">
+    update pay_order
+    <set>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="expireTime != null">
+        expire_time = #{expireTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="requestNo != null">
+        request_no = #{requestNo,jdbcType=VARCHAR},
+      </if>
+      <if test="orderAmount != null">
+        order_amount = #{orderAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="goodName != null">
+        good_name = #{goodName,jdbcType=VARCHAR},
+      </if>
+      <if test="goodId != null">
+        good_id = #{goodId,jdbcType=VARCHAR},
+      </if>
+      <if test="orderType != null">
+        order_type = #{orderType,jdbcType=VARCHAR},
+      </if>
+      <if test="reserved != null">
+        reserved = #{reserved,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.base.springcloud.entity.Order">
+    update pay_order
+    set order_no = #{orderNo,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      expire_time = #{expireTime,jdbcType=TIMESTAMP},
+      request_no = #{requestNo,jdbcType=VARCHAR},
+      order_amount = #{orderAmount,jdbcType=VARCHAR},
+      good_name = #{goodName,jdbcType=VARCHAR},
+      good_id = #{goodId,jdbcType=VARCHAR},
+      order_type = #{orderType,jdbcType=VARCHAR},
+      reserved = #{reserved,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/payment-base-app/src/main/resources/generatorConfig.xml b/payment-base-app/src/main/resources/generatorConfig.xml
index 8ee957c..9b134c4 100644
--- a/payment-base-app/src/main/resources/generatorConfig.xml
+++ b/payment-base-app/src/main/resources/generatorConfig.xml
@@ -60,16 +60,39 @@
         <!-- tableName为对应的数据库表 -->
         <!-- domainObjectName是要生成的实体类 -->
         <!-- enable*ByExample是否生成 example类 -->
-        <table tableName="pay_merchant" domainObjectName="Merchant"
+        <!--<table tableName="pay_merchant" domainObjectName="Merchant"
                enableCountByExample="false" enableDeleteByExample="false"
                enableSelectByExample="false" enableUpdateByExample="false">
-            <!-- 忽略列，不生成bean 字段 -->
-            <!-- <ignoreColumn column="FRED" /> -->
-            <!-- 指定列的java数据类型 -->
+            &lt;!&ndash; 忽略列，不生成bean 字段 &ndash;&gt;
+            &lt;!&ndash; <ignoreColumn column="FRED" /> &ndash;&gt;
+            &lt;!&ndash; 指定列的java数据类型 &ndash;&gt;
             <columnOverride column="merchant_id" property="merchantId" jdbcType="VARCHAR" />
             <columnOverride column="merchant_name" property="merchantName" jdbcType="VARCHAR" />
             <columnOverride column="city_store_name" property="cityStoreName" jdbcType="VARCHAR" />
             <columnOverride column="store_brand_name" property="storeBrandName" jdbcType="VARCHAR" />
+            <columnOverride column="sign_type" property="signType" jdbcType="VARCHAR" />
+            <columnOverride column="private_key" property="privateKey" jdbcType="VARCHAR" />
+            <columnOverride column="device_info" property="deviceInfo" jdbcType="VARCHAR" />
+            <columnOverride column="spbill_create_ip" property="spbillCreateIp" jdbcType="VARCHAR" />
+            <columnOverride column="notify_url" property="notifyUrl" jdbcType="VARCHAR" />
+            &lt;!&ndash;<columnOverride column="time_stamp" property="timeStamp" jdbcType="TIMESTAMP" /> &ndash;&gt;
+        </table>-->
+        <table tableName="pay_order" domainObjectName="Order"
+               enableCountByExample="false" enableDeleteByExample="false"
+               enableSelectByExample="false" enableUpdateByExample="false">
+            <!-- 忽略列，不生成bean 字段 -->
+            <!-- <ignoreColumn column="FRED" /> -->
+            <!-- 指定列的java数据类型 -->
+            <columnOverride column="id" property="id" jdbcType="VARCHAR" />
+            <columnOverride column="order_no" property="orderNo" jdbcType="VARCHAR" />
+            <columnOverride column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+            <columnOverride column="expire_time" property="expireTime" jdbcType="TIMESTAMP" />
+            <columnOverride column="request_no" property="requestNo" jdbcType="VARCHAR" />
+            <columnOverride column="order_amount" property="orderAmount" jdbcType="VARCHAR" />
+            <columnOverride column="good_name" property="goodName" jdbcType="VARCHAR" />
+            <columnOverride column="good_id" property="goodId" jdbcType="VARCHAR" />
+            <columnOverride column="order_type" property="orderType" jdbcType="VARCHAR" />
+            <columnOverride column="reserved" property="reserved" jdbcType="VARCHAR" />
             <!--<columnOverride column="time_stamp" property="timeStamp" jdbcType="TIMESTAMP" /> -->
         </table>
     </context>