阳光数据接口bug

book-dao/src/main/java/com/book/dao/polardb/entity/SunOrder.java

@@ -1,617 +1,657 @@
-package com.book.dao.polardb.entity;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-@Data
-public class SunOrder implements Serializable {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column sun_order.merchant_id
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    private String merchantId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column sun_order.transaction_id
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    private String transactionId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column sun_order.type
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    private String type;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column sun_order.money
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    private BigDecimal money;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column sun_order.state
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    private String state;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column sun_order.create_time
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date createTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column sun_order.finish_time
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date finishTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column sun_order.book_name
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    private String bookName;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column sun_order.referral_url
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    private String referralUrl;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column sun_order.user_id
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    private String userId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column sun_order.channel_id
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    private String channelId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column sun_order.subscribe_time
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date subscribeTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column sun_order.user_createtime
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date userCreatetime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column sun_order.openid
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    private String openid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column sun_order.ip
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    private String ip;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column sun_order.user_agent
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    private String userAgent;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table sun_order
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table sun_order
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    public static SunOrder.Builder builder() {
-        return new SunOrder.Builder();
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table sun_order
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    public static class Builder {
-        /**
-         * This field was generated by MyBatis Generator.
-         * This field corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        private SunOrder obj;
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder() {
-            this.obj = new SunOrder();
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method sets the value of the database column sun_order.merchant_id
-         *
-         * @param merchantId the value for sun_order.merchant_id
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder merchantId(String merchantId) {
-            obj.setMerchantId(merchantId);
-            return this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method sets the value of the database column sun_order.transaction_id
-         *
-         * @param transactionId the value for sun_order.transaction_id
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder transactionId(String transactionId) {
-            obj.setTransactionId(transactionId);
-            return this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method sets the value of the database column sun_order.type
-         *
-         * @param type the value for sun_order.type
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder type(String type) {
-            obj.setType(type);
-            return this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method sets the value of the database column sun_order.money
-         *
-         * @param money the value for sun_order.money
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder money(BigDecimal money) {
-            obj.setMoney(money);
-            return this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method sets the value of the database column sun_order.state
-         *
-         * @param state the value for sun_order.state
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder state(String state) {
-            obj.setState(state);
-            return this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method sets the value of the database column sun_order.create_time
-         *
-         * @param createTime the value for sun_order.create_time
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder createTime(Date createTime) {
-            obj.setCreateTime(createTime);
-            return this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method sets the value of the database column sun_order.finish_time
-         *
-         * @param finishTime the value for sun_order.finish_time
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder finishTime(Date finishTime) {
-            obj.setFinishTime(finishTime);
-            return this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method sets the value of the database column sun_order.book_name
-         *
-         * @param bookName the value for sun_order.book_name
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder bookName(String bookName) {
-            obj.setBookName(bookName);
-            return this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method sets the value of the database column sun_order.referral_url
-         *
-         * @param referralUrl the value for sun_order.referral_url
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder referralUrl(String referralUrl) {
-            obj.setReferralUrl(referralUrl);
-            return this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method sets the value of the database column sun_order.user_id
-         *
-         * @param userId the value for sun_order.user_id
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder userId(String userId) {
-            obj.setUserId(userId);
-            return this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method sets the value of the database column sun_order.channel_id
-         *
-         * @param channelId the value for sun_order.channel_id
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder channelId(String channelId) {
-            obj.setChannelId(channelId);
-            return this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method sets the value of the database column sun_order.subscribe_time
-         *
-         * @param subscribeTime the value for sun_order.subscribe_time
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder subscribeTime(Date subscribeTime) {
-            obj.setSubscribeTime(subscribeTime);
-            return this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method sets the value of the database column sun_order.user_createtime
-         *
-         * @param userCreatetime the value for sun_order.user_createtime
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder userCreatetime(Date userCreatetime) {
-            obj.setUserCreatetime(userCreatetime);
-            return this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method sets the value of the database column sun_order.openid
-         *
-         * @param openid the value for sun_order.openid
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder openid(String openid) {
-            obj.setOpenid(openid);
-            return this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method sets the value of the database column sun_order.ip
-         *
-         * @param ip the value for sun_order.ip
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder ip(String ip) {
-            obj.setIp(ip);
-            return this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method sets the value of the database column sun_order.user_agent
-         *
-         * @param userAgent the value for sun_order.user_agent
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public Builder userAgent(String userAgent) {
-            obj.setUserAgent(userAgent);
-            return this;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public SunOrder build() {
-            return this.obj;
-        }
-    }
-
-    /**
-     * This enum was generated by MyBatis Generator.
-     * This enum corresponds to the database table sun_order
-     *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-     */
-    public enum Column {
-        merchantId("merchant_id", "merchantId", "INTEGER", false),
-        transactionId("transaction_id", "transactionId", "VARCHAR", false),
-        type("type", "type", "VARCHAR", false),
-        money("money", "money", "DECIMAL", false),
-        state("state", "state", "VARCHAR", false),
-        createTime("create_time", "createTime", "TIMESTAMP", false),
-        finishTime("finish_time", "finishTime", "TIMESTAMP", false),
-        bookName("book_name", "bookName", "VARCHAR", false),
-        referralUrl("referral_url", "referralUrl", "VARCHAR", false),
-        userId("user_id", "userId", "VARCHAR", false),
-        channelId("channel_id", "channelId", "VARCHAR", false),
-        subscribeTime("subscribe_time", "subscribeTime", "TIMESTAMP", false),
-        userCreatetime("user_createtime", "userCreatetime", "TIMESTAMP", false),
-        openid("openid", "openid", "VARCHAR", false),
-        ip("ip", "ip", "VARCHAR", false),
-        userAgent("user_agent", "userAgent", "VARCHAR", false);
-
-        /**
-         * This field was generated by MyBatis Generator.
-         * This field corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        private static final String BEGINNING_DELIMITER = "\"";
-
-        /**
-         * This field was generated by MyBatis Generator.
-         * This field corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        private static final String ENDING_DELIMITER = "\"";
-
-        /**
-         * This field was generated by MyBatis Generator.
-         * This field corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        private final String column;
-
-        /**
-         * This field was generated by MyBatis Generator.
-         * This field corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        private final boolean isColumnNameDelimited;
-
-        /**
-         * This field was generated by MyBatis Generator.
-         * This field corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        private final String javaProperty;
-
-        /**
-         * This field was generated by MyBatis Generator.
-         * This field corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        private final String jdbcType;
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public String value() {
-            return this.column;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public String getValue() {
-            return this.column;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public String getJavaProperty() {
-            return this.javaProperty;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public String getJdbcType() {
-            return this.jdbcType;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        Column(String column, String javaProperty, String jdbcType, boolean isColumnNameDelimited) {
-            this.column = column;
-            this.javaProperty = javaProperty;
-            this.jdbcType = jdbcType;
-            this.isColumnNameDelimited = isColumnNameDelimited;
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public String desc() {
-            return this.getEscapedColumnName() + " DESC";
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public String asc() {
-            return this.getEscapedColumnName() + " ASC";
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public static Column[] excludes(Column ... excludes) {
-            ArrayList<Column> columns = new ArrayList<>(Arrays.asList(Column.values()));
-            if (excludes != null && excludes.length > 0) {
-                columns.removeAll(new ArrayList<>(Arrays.asList(excludes)));
-            }
-            return columns.toArray(new Column[]{});
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public static Column[] all() {
-            return Column.values();
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public String getEscapedColumnName() {
-            if (this.isColumnNameDelimited) {
-                return new StringBuilder().append(BEGINNING_DELIMITER).append(this.column).append(ENDING_DELIMITER).toString();
-            } else {
-                return this.column;
-            }
-        }
-
-        /**
-         * This method was generated by MyBatis Generator.
-         * This method corresponds to the database table sun_order
-         *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
-         */
-        public String getAliasedEscapedColumnName() {
-            return this.getEscapedColumnName();
-        }
-    }
+package com.book.dao.polardb.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+public class SunOrder implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.id
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private Long id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.merchant_id
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private String merchantId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.transaction_id
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private String transactionId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.type
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private String type;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.money
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private BigDecimal money;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.state
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private String state;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.create_time
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private Date createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.finish_time
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private Date finishTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.book_name
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private String bookName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.referral_url
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private String referralUrl;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.user_id
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private String userId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.channel_id
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private String channelId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.subscribe_time
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private Date subscribeTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.user_createtime
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private Date userCreatetime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.openid
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private String openid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.ip
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private String ip;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.user_agent
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private String userAgent;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sun_order.insert_time
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private Date insertTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table sun_order
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sun_order
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    public static SunOrder.Builder builder() {
+        return new SunOrder.Builder();
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table sun_order
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    public static class Builder {
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        private SunOrder obj;
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder() {
+            this.obj = new SunOrder();
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.id
+         *
+         * @param id the value for sun_order.id
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder id(Long id) {
+            obj.setId(id);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.merchant_id
+         *
+         * @param merchantId the value for sun_order.merchant_id
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder merchantId(String merchantId) {
+            obj.setMerchantId(merchantId);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.transaction_id
+         *
+         * @param transactionId the value for sun_order.transaction_id
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder transactionId(String transactionId) {
+            obj.setTransactionId(transactionId);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.type
+         *
+         * @param type the value for sun_order.type
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder type(String type) {
+            obj.setType(type);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.money
+         *
+         * @param money the value for sun_order.money
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder money(BigDecimal money) {
+            obj.setMoney(money);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.state
+         *
+         * @param state the value for sun_order.state
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder state(String state) {
+            obj.setState(state);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.create_time
+         *
+         * @param createTime the value for sun_order.create_time
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder createTime(Date createTime) {
+            obj.setCreateTime(createTime);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.finish_time
+         *
+         * @param finishTime the value for sun_order.finish_time
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder finishTime(Date finishTime) {
+            obj.setFinishTime(finishTime);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.book_name
+         *
+         * @param bookName the value for sun_order.book_name
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder bookName(String bookName) {
+            obj.setBookName(bookName);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.referral_url
+         *
+         * @param referralUrl the value for sun_order.referral_url
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder referralUrl(String referralUrl) {
+            obj.setReferralUrl(referralUrl);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.user_id
+         *
+         * @param userId the value for sun_order.user_id
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder userId(String userId) {
+            obj.setUserId(userId);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.channel_id
+         *
+         * @param channelId the value for sun_order.channel_id
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder channelId(String channelId) {
+            obj.setChannelId(channelId);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.subscribe_time
+         *
+         * @param subscribeTime the value for sun_order.subscribe_time
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder subscribeTime(Date subscribeTime) {
+            obj.setSubscribeTime(subscribeTime);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.user_createtime
+         *
+         * @param userCreatetime the value for sun_order.user_createtime
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder userCreatetime(Date userCreatetime) {
+            obj.setUserCreatetime(userCreatetime);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.openid
+         *
+         * @param openid the value for sun_order.openid
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder openid(String openid) {
+            obj.setOpenid(openid);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.ip
+         *
+         * @param ip the value for sun_order.ip
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder ip(String ip) {
+            obj.setIp(ip);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.user_agent
+         *
+         * @param userAgent the value for sun_order.user_agent
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder userAgent(String userAgent) {
+            obj.setUserAgent(userAgent);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method sets the value of the database column sun_order.insert_time
+         *
+         * @param insertTime the value for sun_order.insert_time
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public Builder insertTime(Date insertTime) {
+            obj.setInsertTime(insertTime);
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public SunOrder build() {
+            return this.obj;
+        }
+    }
+
+    /**
+     * This enum was generated by MyBatis Generator.
+     * This enum corresponds to the database table sun_order
+     *
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+     */
+    public enum Column {
+        id("id", "id", "BIGINT", false),
+        merchantId("merchant_id", "merchantId", "VARCHAR", false),
+        transactionId("transaction_id", "transactionId", "VARCHAR", false),
+        type("type", "type", "VARCHAR", false),
+        money("money", "money", "DECIMAL", false),
+        state("state", "state", "VARCHAR", false),
+        createTime("create_time", "createTime", "TIMESTAMP", false),
+        finishTime("finish_time", "finishTime", "TIMESTAMP", false),
+        bookName("book_name", "bookName", "VARCHAR", false),
+        referralUrl("referral_url", "referralUrl", "VARCHAR", false),
+        userId("user_id", "userId", "VARCHAR", false),
+        channelId("channel_id", "channelId", "VARCHAR", false),
+        subscribeTime("subscribe_time", "subscribeTime", "TIMESTAMP", false),
+        userCreatetime("user_createtime", "userCreatetime", "TIMESTAMP", false),
+        openid("openid", "openid", "VARCHAR", false),
+        ip("ip", "ip", "VARCHAR", false),
+        userAgent("user_agent", "userAgent", "VARCHAR", false),
+        insertTime("insert_time", "insertTime", "TIMESTAMP", false);
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        private static final String BEGINNING_DELIMITER = "\"";
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        private static final String ENDING_DELIMITER = "\"";
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        private final String column;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        private final boolean isColumnNameDelimited;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        private final String javaProperty;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        private final String jdbcType;
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public String value() {
+            return this.column;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public String getValue() {
+            return this.column;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public String getJavaProperty() {
+            return this.javaProperty;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public String getJdbcType() {
+            return this.jdbcType;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        Column(String column, String javaProperty, String jdbcType, boolean isColumnNameDelimited) {
+            this.column = column;
+            this.javaProperty = javaProperty;
+            this.jdbcType = jdbcType;
+            this.isColumnNameDelimited = isColumnNameDelimited;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public String desc() {
+            return this.getEscapedColumnName() + " DESC";
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public String asc() {
+            return this.getEscapedColumnName() + " ASC";
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public static Column[] excludes(Column ... excludes) {
+            ArrayList<Column> columns = new ArrayList<>(Arrays.asList(Column.values()));
+            if (excludes != null && excludes.length > 0) {
+                columns.removeAll(new ArrayList<>(Arrays.asList(excludes)));
+            }
+            return columns.toArray(new Column[]{});
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public static Column[] all() {
+            return Column.values();
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public String getEscapedColumnName() {
+            if (this.isColumnNameDelimited) {
+                return new StringBuilder().append(BEGINNING_DELIMITER).append(this.column).append(ENDING_DELIMITER).toString();
+            } else {
+                return this.column;
+            }
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table sun_order
+         *
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
+         */
+        public String getAliasedEscapedColumnName() {
+            return this.getEscapedColumnName();
+        }
+    }
 }

book-dao/src/main/java/com/book/dao/polardb/mapper/SunOrderMapper.java

@@ -14,7 +14,7 @@ public interface SunOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     long countByExample(SunOrderExample example);
 
@@ -22,7 +22,7 @@ public interface SunOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     int deleteByExample(SunOrderExample example);
 
@@ -30,15 +30,15 @@ public interface SunOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
-    int deleteByPrimaryKey(Integer merchantId);
+    int deleteByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     int insert(SunOrder record);
 
@@ -46,7 +46,7 @@ public interface SunOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     int insertSelective(@Param("record") SunOrder record, @Param("selective") SunOrder.Column ... selective);
 
@@ -54,7 +54,7 @@ public interface SunOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     SunOrder selectOneByExample(SunOrderExample example);
 
@@ -62,7 +62,7 @@ public interface SunOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     SunOrder selectOneByExampleSelective(@Param("example") SunOrderExample example, @Param("selective") SunOrder.Column ... selective);
 
@@ -70,7 +70,7 @@ public interface SunOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     List<SunOrder> selectByExampleSelective(@Param("example") SunOrderExample example, @Param("selective") SunOrder.Column ... selective);
 
@@ -78,7 +78,7 @@ public interface SunOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     List<SunOrder> selectByExample(SunOrderExample example);
 
@@ -86,23 +86,23 @@ public interface SunOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
-    SunOrder selectByPrimaryKeySelective(@Param("merchantId") Integer merchantId, @Param("selective") SunOrder.Column ... selective);
+    SunOrder selectByPrimaryKeySelective(@Param("id") Long id, @Param("selective") SunOrder.Column ... selective);
 
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
-    SunOrder selectByPrimaryKey(Integer merchantId);
+    SunOrder selectByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     int updateByExampleSelective(@Param("record") SunOrder record, @Param("example") SunOrderExample example, @Param("selective") SunOrder.Column ... selective);
 
@@ -110,7 +110,7 @@ public interface SunOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     int updateByExample(@Param("record") SunOrder record, @Param("example") SunOrderExample example);
 
@@ -118,7 +118,7 @@ public interface SunOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     int updateByPrimaryKeySelective(@Param("record") SunOrder record, @Param("selective") SunOrder.Column ... selective);
 
@@ -126,7 +126,7 @@ public interface SunOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     int updateByPrimaryKey(SunOrder record);
 
@@ -134,7 +134,7 @@ public interface SunOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     int batchInsert(@Param("list") List<SunOrder> list);
 
@@ -142,7 +142,7 @@ public interface SunOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     int batchInsertSelective(@Param("list") List<SunOrder> list, @Param("selective") SunOrder.Column ... selective);
 
@@ -150,7 +150,7 @@ public interface SunOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     int upsert(SunOrder record);
 
@@ -158,7 +158,7 @@ public interface SunOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     int upsertSelective(@Param("record") SunOrder record, @Param("selective") SunOrder.Column ... selective);
 }

book-dao/src/main/java/com/book/dao/polardb/pojo/example/SunOrderExample.java

@@ -11,7 +11,7 @@ public class SunOrderExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     protected String orderByClause;
 
@@ -19,7 +19,7 @@ public class SunOrderExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     protected boolean distinct;
 
@@ -27,7 +27,7 @@ public class SunOrderExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     protected List<Criteria> oredCriteria;
 
@@ -35,7 +35,7 @@ public class SunOrderExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     protected Integer offset;
 
@@ -43,7 +43,7 @@ public class SunOrderExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     protected Integer rows;
 
@@ -51,7 +51,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public SunOrderExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -61,7 +61,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -71,7 +71,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -81,7 +81,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -91,7 +91,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public boolean isDistinct() {
         return distinct;
@@ -101,7 +101,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -111,7 +111,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -121,7 +121,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -133,7 +133,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public SunOrderExample orderBy(String orderByClause) {
         this.setOrderByClause(orderByClause);
@@ -144,7 +144,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public SunOrderExample orderBy(String ... orderByClauses) {
         StringBuffer sb = new StringBuffer();
@@ -162,7 +162,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -176,7 +176,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria(this);
@@ -187,7 +187,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public void clear() {
         oredCriteria.clear();
@@ -201,7 +201,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public void setOffset(Integer offset) {
         this.offset = offset;
@@ -211,7 +211,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public Integer getOffset() {
         return this.offset;
@@ -221,7 +221,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public void setRows(Integer rows) {
         this.rows = rows;
@@ -231,7 +231,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public Integer getRows() {
         return this.rows;
@@ -241,7 +241,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public SunOrderExample limit(Integer rows) {
         this.rows = rows;
@@ -252,7 +252,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public SunOrderExample limit(Integer offset, Integer rows) {
         this.offset = offset;
@@ -264,7 +264,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public SunOrderExample page(Integer page, Integer pageSize) {
         this.offset = page * pageSize;
@@ -276,7 +276,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public static Criteria newAndCreateCriteria() {
         SunOrderExample example = new SunOrderExample();
@@ -287,7 +287,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public SunOrderExample when(boolean condition, IExampleWhen then) {
         if (condition) {
@@ -300,7 +300,7 @@ public class SunOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public SunOrderExample when(boolean condition, IExampleWhen then, IExampleWhen otherwise) {
         if (condition) {
@@ -315,7 +315,7 @@ public class SunOrderExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -358,6 +358,96 @@ public class SunOrderExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualToColumn(SunOrder.Column column) {
+            addCriterion(new StringBuilder("id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualToColumn(SunOrder.Column column) {
+            addCriterion(new StringBuilder("id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanColumn(SunOrder.Column column) {
+            addCriterion(new StringBuilder("id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualToColumn(SunOrder.Column column) {
+            addCriterion(new StringBuilder("id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanColumn(SunOrder.Column column) {
+            addCriterion(new StringBuilder("id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualToColumn(SunOrder.Column column) {
+            addCriterion(new StringBuilder("id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
         public Criteria andMerchantIdIsNull() {
             addCriterion("merchant_id is null");
             return (Criteria) this;
@@ -368,7 +458,7 @@ public class SunOrderExample {
             return (Criteria) this;
         }
 
-        public Criteria andMerchantIdEqualTo(Integer value) {
+        public Criteria andMerchantIdEqualTo(String value) {
             addCriterion("merchant_id =", value, "merchantId");
             return (Criteria) this;
         }
@@ -378,7 +468,7 @@ public class SunOrderExample {
             return (Criteria) this;
         }
 
-        public Criteria andMerchantIdNotEqualTo(Integer value) {
+        public Criteria andMerchantIdNotEqualTo(String value) {
             addCriterion("merchant_id <>", value, "merchantId");
             return (Criteria) this;
         }
@@ -388,7 +478,7 @@ public class SunOrderExample {
             return (Criteria) this;
         }
 
-        public Criteria andMerchantIdGreaterThan(Integer value) {
+        public Criteria andMerchantIdGreaterThan(String value) {
             addCriterion("merchant_id >", value, "merchantId");
             return (Criteria) this;
         }
@@ -398,7 +488,7 @@ public class SunOrderExample {
             return (Criteria) this;
         }
 
-        public Criteria andMerchantIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andMerchantIdGreaterThanOrEqualTo(String value) {
             addCriterion("merchant_id >=", value, "merchantId");
             return (Criteria) this;
         }
@@ -408,7 +498,7 @@ public class SunOrderExample {
             return (Criteria) this;
         }
 
-        public Criteria andMerchantIdLessThan(Integer value) {
+        public Criteria andMerchantIdLessThan(String value) {
             addCriterion("merchant_id <", value, "merchantId");
             return (Criteria) this;
         }
@@ -418,7 +508,7 @@ public class SunOrderExample {
             return (Criteria) this;
         }
 
-        public Criteria andMerchantIdLessThanOrEqualTo(Integer value) {
+        public Criteria andMerchantIdLessThanOrEqualTo(String value) {
             addCriterion("merchant_id <=", value, "merchantId");
             return (Criteria) this;
         }
@@ -428,22 +518,32 @@ public class SunOrderExample {
             return (Criteria) this;
         }
 
-        public Criteria andMerchantIdIn(List<Integer> values) {
+        public Criteria andMerchantIdLike(String value) {
+            addCriterion("merchant_id like", value, "merchantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMerchantIdNotLike(String value) {
+            addCriterion("merchant_id not like", value, "merchantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMerchantIdIn(List<String> values) {
             addCriterion("merchant_id in", values, "merchantId");
             return (Criteria) this;
         }
 
-        public Criteria andMerchantIdNotIn(List<Integer> values) {
+        public Criteria andMerchantIdNotIn(List<String> values) {
             addCriterion("merchant_id not in", values, "merchantId");
             return (Criteria) this;
         }
 
-        public Criteria andMerchantIdBetween(Integer value1, Integer value2) {
+        public Criteria andMerchantIdBetween(String value1, String value2) {
             addCriterion("merchant_id between", value1, value2, "merchantId");
             return (Criteria) this;
         }
 
-        public Criteria andMerchantIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andMerchantIdNotBetween(String value1, String value2) {
             addCriterion("merchant_id not between", value1, value2, "merchantId");
             return (Criteria) this;
         }
@@ -1897,20 +1997,110 @@ public class SunOrderExample {
             addCriterion("user_agent not between", value1, value2, "userAgent");
             return (Criteria) this;
         }
+
+        public Criteria andInsertTimeIsNull() {
+            addCriterion("insert_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeIsNotNull() {
+            addCriterion("insert_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeEqualTo(Date value) {
+            addCriterion("insert_time =", value, "insertTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeEqualToColumn(SunOrder.Column column) {
+            addCriterion(new StringBuilder("insert_time = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeNotEqualTo(Date value) {
+            addCriterion("insert_time <>", value, "insertTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeNotEqualToColumn(SunOrder.Column column) {
+            addCriterion(new StringBuilder("insert_time <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeGreaterThan(Date value) {
+            addCriterion("insert_time >", value, "insertTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeGreaterThanColumn(SunOrder.Column column) {
+            addCriterion(new StringBuilder("insert_time > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("insert_time >=", value, "insertTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeGreaterThanOrEqualToColumn(SunOrder.Column column) {
+            addCriterion(new StringBuilder("insert_time >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeLessThan(Date value) {
+            addCriterion("insert_time <", value, "insertTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeLessThanColumn(SunOrder.Column column) {
+            addCriterion(new StringBuilder("insert_time < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeLessThanOrEqualTo(Date value) {
+            addCriterion("insert_time <=", value, "insertTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeLessThanOrEqualToColumn(SunOrder.Column column) {
+            addCriterion(new StringBuilder("insert_time <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeIn(List<Date> values) {
+            addCriterion("insert_time in", values, "insertTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeNotIn(List<Date> values) {
+            addCriterion("insert_time not in", values, "insertTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeBetween(Date value1, Date value2) {
+            addCriterion("insert_time between", value1, value2, "insertTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsertTimeNotBetween(Date value1, Date value2) {
+            addCriterion("insert_time not between", value1, value2, "insertTime");
+            return (Criteria) this;
+        }
     }
 
     /**
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table sun_order
      *
-     * @mbg.generated do_not_delete_during_merge Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated do_not_delete_during_merge Thu Oct 14 11:32:34 CST 2021
      */
     public static class Criteria extends GeneratedCriteria {
         /**
          * This field was generated by MyBatis Generator.
          * This field corresponds to the database table sun_order
          *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
          */
         private SunOrderExample example;
 
@@ -1918,7 +2108,7 @@ public class SunOrderExample {
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table sun_order
          *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
          */
         protected Criteria(SunOrderExample example) {
             super();
@@ -1929,7 +2119,7 @@ public class SunOrderExample {
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table sun_order
          *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
          */
         public SunOrderExample example() {
             return this.example;
@@ -1939,7 +2129,7 @@ public class SunOrderExample {
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table sun_order
          *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
          */
         @Deprecated
         public Criteria andIf(boolean ifAdd, ICriteriaAdd add) {
@@ -1953,7 +2143,7 @@ public class SunOrderExample {
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table sun_order
          *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
          */
         public Criteria when(boolean condition, ICriteriaWhen then) {
             if (condition) {
@@ -1966,7 +2156,7 @@ public class SunOrderExample {
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table sun_order
          *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
          */
         public Criteria when(boolean condition, ICriteriaWhen then, ICriteriaWhen otherwise) {
             if (condition) {
@@ -1983,7 +2173,7 @@ public class SunOrderExample {
              * This method was generated by MyBatis Generator.
              * This method corresponds to the database table sun_order
              *
-             * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+             * @mbg.generated Thu Oct 14 11:32:34 CST 2021
              */
             Criteria add(Criteria add);
         }
@@ -1993,7 +2183,7 @@ public class SunOrderExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table sun_order
      *
-     * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+     * @mbg.generated Thu Oct 14 11:32:34 CST 2021
      */
     public static class Criterion {
         private String condition;
@@ -2086,7 +2276,7 @@ public class SunOrderExample {
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table sun_order
          *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
          */
         void criteria(Criteria criteria);
     }
@@ -2096,7 +2286,7 @@ public class SunOrderExample {
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table sun_order
          *
-         * @mbg.generated Wed Sep 29 15:11:11 CST 2021
+         * @mbg.generated Thu Oct 14 11:32:34 CST 2021
          */
         void example(com.book.dao.polardb.pojo.example.SunOrderExample example);
     }

book-dao/src/main/resources/mapper/polar/SunOrderMapper.xml

@@ -5,9 +5,10 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
-    <id column="merchant_id" jdbcType="INTEGER" property="merchantId" />
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="merchant_id" jdbcType="VARCHAR" property="merchantId" />
     <result column="transaction_id" jdbcType="VARCHAR" property="transactionId" />
     <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="money" jdbcType="DECIMAL" property="money" />
@@ -23,12 +24,13 @@
     <result column="openid" jdbcType="VARCHAR" property="openid" />
     <result column="ip" jdbcType="VARCHAR" property="ip" />
     <result column="user_agent" jdbcType="VARCHAR" property="userAgent" />
+    <result column="insert_time" jdbcType="TIMESTAMP" property="insertTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -62,7 +64,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -96,16 +98,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
-    merchant_id, transaction_id, type, money, state, create_time, finish_time, book_name, 
-    referral_url, user_id, channel_id, subscribe_time, user_createtime, openid, ip, user_agent
+    id, merchant_id, transaction_id, type, money, state, create_time, finish_time, book_name, 
+    referral_url, user_id, channel_id, subscribe_time, user_createtime, openid, ip, user_agent, 
+    insert_time
   </sql>
   <select id="selectByExample" parameterType="com.book.dao.polardb.pojo.example.SunOrderExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     select
     <if test="distinct">
@@ -132,7 +135,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     select
     <if test="example != null and example.distinct">
@@ -164,22 +167,22 @@
       </if>
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     select 
     <include refid="Base_Column_List" />
     from sun_order
-    where merchant_id = #{merchantId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
   </select>
   <select id="selectByPrimaryKeySelective" parameterType="map" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     select
     <choose>
@@ -193,22 +196,22 @@
       </otherwise>
     </choose>
     from sun_order
-    where merchant_id = #{merchantId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     delete from sun_order
-    where merchant_id = #{merchantId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
   </delete>
   <delete id="deleteByExample" parameterType="com.book.dao.polardb.pojo.example.SunOrderExample">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     delete from sun_order
     <if test="_parameter != null">
@@ -219,26 +222,28 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
-    insert into sun_order (merchant_id, transaction_id, type, 
-      money, state, create_time, 
-      finish_time, book_name, referral_url, 
-      user_id, channel_id, subscribe_time, 
-      user_createtime, openid, ip, 
-      user_agent)
-    values (#{merchantId,jdbcType=INTEGER}, #{transactionId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
-      #{money,jdbcType=DECIMAL}, #{state,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{finishTime,jdbcType=TIMESTAMP}, #{bookName,jdbcType=VARCHAR}, #{referralUrl,jdbcType=VARCHAR}, 
-      #{userId,jdbcType=VARCHAR}, #{channelId,jdbcType=VARCHAR}, #{subscribeTime,jdbcType=TIMESTAMP}, 
-      #{userCreatetime,jdbcType=TIMESTAMP}, #{openid,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, 
-      #{userAgent,jdbcType=VARCHAR})
+    insert into sun_order (id, merchant_id, transaction_id, 
+      type, money, state, 
+      create_time, finish_time, book_name, 
+      referral_url, user_id, channel_id, 
+      subscribe_time, user_createtime, openid, 
+      ip, user_agent, insert_time
+      )
+    values (#{id,jdbcType=BIGINT}, #{merchantId,jdbcType=VARCHAR}, #{transactionId,jdbcType=VARCHAR}, 
+      #{type,jdbcType=VARCHAR}, #{money,jdbcType=DECIMAL}, #{state,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, #{bookName,jdbcType=VARCHAR}, 
+      #{referralUrl,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{channelId,jdbcType=VARCHAR}, 
+      #{subscribeTime,jdbcType=TIMESTAMP}, #{userCreatetime,jdbcType=TIMESTAMP}, #{openid,jdbcType=VARCHAR}, 
+      #{ip,jdbcType=VARCHAR}, #{userAgent,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="map">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     insert into sun_order
     <choose>
@@ -249,6 +254,9 @@
       </when>
       <otherwise>
         <trim prefix="(" suffix=")" suffixOverrides=",">
+          <if test="record.id != null">
+            id,
+          </if>
           <if test="record.merchantId != null">
             merchant_id,
           </if>
@@ -297,6 +305,9 @@
           <if test="record.userAgent != null">
             user_agent,
           </if>
+          <if test="record.insertTime != null">
+            insert_time,
+          </if>
         </trim>
         <trim prefix="(" suffix=")" suffixOverrides="," />
       </otherwise>
@@ -310,8 +321,11 @@
       </when>
       <otherwise>
         <trim prefix="(" suffix=")" suffixOverrides=",">
+          <if test="record.id != null">
+            #{record.id,jdbcType=BIGINT},
+          </if>
           <if test="record.merchantId != null">
-            #{record.merchantId,jdbcType=INTEGER},
+            #{record.merchantId,jdbcType=VARCHAR},
           </if>
           <if test="record.transactionId != null">
             #{record.transactionId,jdbcType=VARCHAR},
@@ -358,6 +372,9 @@
           <if test="record.userAgent != null">
             #{record.userAgent,jdbcType=VARCHAR},
           </if>
+          <if test="record.insertTime != null">
+            #{record.insertTime,jdbcType=TIMESTAMP},
+          </if>
         </trim>
       </otherwise>
     </choose>
@@ -366,7 +383,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     select count(*) from sun_order
     <if test="_parameter != null">
@@ -377,7 +394,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     update sun_order
     SET
@@ -389,8 +406,11 @@
       </when>
       <otherwise>
         <trim suffixOverrides=",">
+          <if test="record.id != null">
+            id = #{record.id,jdbcType=BIGINT},
+          </if>
           <if test="record.merchantId != null">
-            merchant_id = #{record.merchantId,jdbcType=INTEGER},
+            merchant_id = #{record.merchantId,jdbcType=VARCHAR},
           </if>
           <if test="record.transactionId != null">
             transaction_id = #{record.transactionId,jdbcType=VARCHAR},
@@ -437,6 +457,9 @@
           <if test="record.userAgent != null">
             user_agent = #{record.userAgent,jdbcType=VARCHAR},
           </if>
+          <if test="record.insertTime != null">
+            insert_time = #{record.insertTime,jdbcType=TIMESTAMP},
+          </if>
         </trim>
       </otherwise>
     </choose>
@@ -448,10 +471,11 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     update sun_order
-    set merchant_id = #{record.merchantId,jdbcType=INTEGER},
+    set id = #{record.id,jdbcType=BIGINT},
+      merchant_id = #{record.merchantId,jdbcType=VARCHAR},
       transaction_id = #{record.transactionId,jdbcType=VARCHAR},
       type = #{record.type,jdbcType=VARCHAR},
       money = #{record.money,jdbcType=DECIMAL},
@@ -466,7 +490,8 @@
       user_createtime = #{record.userCreatetime,jdbcType=TIMESTAMP},
       openid = #{record.openid,jdbcType=VARCHAR},
       ip = #{record.ip,jdbcType=VARCHAR},
-      user_agent = #{record.userAgent,jdbcType=VARCHAR}
+      user_agent = #{record.userAgent,jdbcType=VARCHAR},
+      insert_time = #{record.insertTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -475,7 +500,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     update sun_order
     SET
@@ -487,6 +512,9 @@
       </when>
       <otherwise>
         <trim suffixOverrides=",">
+          <if test="record.merchantId != null">
+            merchant_id = #{record.merchantId,jdbcType=VARCHAR},
+          </if>
           <if test="record.transactionId != null">
             transaction_id = #{record.transactionId,jdbcType=VARCHAR},
           </if>
@@ -532,19 +560,23 @@
           <if test="record.userAgent != null">
             user_agent = #{record.userAgent,jdbcType=VARCHAR},
           </if>
+          <if test="record.insertTime != null">
+            insert_time = #{record.insertTime,jdbcType=TIMESTAMP},
+          </if>
         </trim>
       </otherwise>
     </choose>
-    where merchant_id = #{record.merchantId,jdbcType=INTEGER}
+    where id = #{record.id,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.book.dao.polardb.entity.SunOrder">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     update sun_order
-    set transaction_id = #{transactionId,jdbcType=VARCHAR},
+    set merchant_id = #{merchantId,jdbcType=VARCHAR},
+      transaction_id = #{transactionId,jdbcType=VARCHAR},
       type = #{type,jdbcType=VARCHAR},
       money = #{money,jdbcType=DECIMAL},
       state = #{state,jdbcType=VARCHAR},
@@ -558,14 +590,15 @@
       user_createtime = #{userCreatetime,jdbcType=TIMESTAMP},
       openid = #{openid,jdbcType=VARCHAR},
       ip = #{ip,jdbcType=VARCHAR},
-      user_agent = #{userAgent,jdbcType=VARCHAR}
-    where merchant_id = #{merchantId,jdbcType=INTEGER}
+      user_agent = #{userAgent,jdbcType=VARCHAR},
+      insert_time = #{insertTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
   </update>
   <select id="selectOneByExample" parameterType="com.book.dao.polardb.pojo.example.SunOrderExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     select
     <include refid="Base_Column_List" />
@@ -582,7 +615,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     select
     <choose>
@@ -608,27 +641,28 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     insert into sun_order
-    (merchant_id, transaction_id, type, money, state, create_time, finish_time, book_name, 
+    (id, merchant_id, transaction_id, type, money, state, create_time, finish_time, book_name, 
       referral_url, user_id, channel_id, subscribe_time, user_createtime, openid, ip, 
-      user_agent)
+      user_agent, insert_time)
     values
     <foreach collection="list" item="item" separator=",">
-      (#{item.merchantId,jdbcType=INTEGER}, #{item.transactionId,jdbcType=VARCHAR}, #{item.type,jdbcType=VARCHAR}, 
-        #{item.money,jdbcType=DECIMAL}, #{item.state,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-        #{item.finishTime,jdbcType=TIMESTAMP}, #{item.bookName,jdbcType=VARCHAR}, #{item.referralUrl,jdbcType=VARCHAR}, 
-        #{item.userId,jdbcType=VARCHAR}, #{item.channelId,jdbcType=VARCHAR}, #{item.subscribeTime,jdbcType=TIMESTAMP}, 
-        #{item.userCreatetime,jdbcType=TIMESTAMP}, #{item.openid,jdbcType=VARCHAR}, #{item.ip,jdbcType=VARCHAR}, 
-        #{item.userAgent,jdbcType=VARCHAR})
+      (#{item.id,jdbcType=BIGINT}, #{item.merchantId,jdbcType=VARCHAR}, #{item.transactionId,jdbcType=VARCHAR}, 
+        #{item.type,jdbcType=VARCHAR}, #{item.money,jdbcType=DECIMAL}, #{item.state,jdbcType=VARCHAR}, 
+        #{item.createTime,jdbcType=TIMESTAMP}, #{item.finishTime,jdbcType=TIMESTAMP}, #{item.bookName,jdbcType=VARCHAR}, 
+        #{item.referralUrl,jdbcType=VARCHAR}, #{item.userId,jdbcType=VARCHAR}, #{item.channelId,jdbcType=VARCHAR}, 
+        #{item.subscribeTime,jdbcType=TIMESTAMP}, #{item.userCreatetime,jdbcType=TIMESTAMP}, 
+        #{item.openid,jdbcType=VARCHAR}, #{item.ip,jdbcType=VARCHAR}, #{item.userAgent,jdbcType=VARCHAR}, 
+        #{item.insertTime,jdbcType=TIMESTAMP})
     </foreach>
   </insert>
   <insert id="batchInsertSelective" parameterType="map">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     insert into sun_order (
     <foreach collection="selective" item="column" separator=",">
@@ -639,8 +673,11 @@
     <foreach collection="list" item="item" separator=",">
       (
       <foreach collection="selective" item="column" separator=",">
+        <if test="'id'.toString() == column.value">
+          #{item.id,jdbcType=BIGINT}
+        </if>
         <if test="'merchant_id'.toString() == column.value">
-          #{item.merchantId,jdbcType=INTEGER}
+          #{item.merchantId,jdbcType=VARCHAR}
         </if>
         <if test="'transaction_id'.toString() == column.value">
           #{item.transactionId,jdbcType=VARCHAR}
@@ -687,6 +724,9 @@
         <if test="'user_agent'.toString() == column.value">
           #{item.userAgent,jdbcType=VARCHAR}
         </if>
+        <if test="'insert_time'.toString() == column.value">
+          #{item.insertTime,jdbcType=TIMESTAMP}
+        </if>
       </foreach>
       )
     </foreach>
@@ -695,7 +735,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     insert into sun_order
     <choose>
@@ -706,6 +746,9 @@
       </when>
       <otherwise>
         <trim prefix="(" suffix=")" suffixOverrides=",">
+          <if test="record.id != null">
+            id,
+          </if>
           <if test="record.merchantId != null">
             merchant_id,
           </if>
@@ -754,6 +797,9 @@
           <if test="record.userAgent != null">
             user_agent,
           </if>
+          <if test="record.insertTime != null">
+            insert_time,
+          </if>
         </trim>
         <trim prefix="(" suffix=")" suffixOverrides="," />
       </otherwise>
@@ -767,8 +813,11 @@
       </when>
       <otherwise>
         <trim prefix="(" suffix=")" suffixOverrides=",">
+          <if test="record.id != null">
+            #{record.id,jdbcType=BIGINT},
+          </if>
           <if test="record.merchantId != null">
-            #{record.merchantId,jdbcType=INTEGER},
+            #{record.merchantId,jdbcType=VARCHAR},
           </if>
           <if test="record.transactionId != null">
             #{record.transactionId,jdbcType=VARCHAR},
@@ -815,6 +864,9 @@
           <if test="record.userAgent != null">
             #{record.userAgent,jdbcType=VARCHAR},
           </if>
+          <if test="record.insertTime != null">
+            #{record.insertTime,jdbcType=TIMESTAMP},
+          </if>
         </trim>
       </otherwise>
     </choose>
@@ -827,8 +879,11 @@
       </when>
       <otherwise>
         <trim suffixOverrides=",">
+          <if test="record.id != null">
+            id = #{record.id,jdbcType=BIGINT},
+          </if>
           <if test="record.merchantId != null">
-            merchant_id = #{record.merchantId,jdbcType=INTEGER},
+            merchant_id = #{record.merchantId,jdbcType=VARCHAR},
           </if>
           <if test="record.transactionId != null">
             transaction_id = #{record.transactionId,jdbcType=VARCHAR},
@@ -875,6 +930,9 @@
           <if test="record.userAgent != null">
             user_agent = #{record.userAgent,jdbcType=VARCHAR},
           </if>
+          <if test="record.insertTime != null">
+            insert_time = #{record.insertTime,jdbcType=TIMESTAMP},
+          </if>
         </trim>
       </otherwise>
     </choose>
@@ -883,21 +941,23 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 29 15:11:11 CST 2021.
+      This element was generated on Thu Oct 14 11:32:34 CST 2021.
     -->
     insert into sun_order
-    (merchant_id, transaction_id, type, money, state, create_time, finish_time, book_name, 
+    (id, merchant_id, transaction_id, type, money, state, create_time, finish_time, book_name, 
       referral_url, user_id, channel_id, subscribe_time, user_createtime, openid, ip, 
-      user_agent)
+      user_agent, insert_time)
     values
-    (#{merchantId,jdbcType=INTEGER}, #{transactionId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
-      #{money,jdbcType=DECIMAL}, #{state,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{finishTime,jdbcType=TIMESTAMP}, #{bookName,jdbcType=VARCHAR}, #{referralUrl,jdbcType=VARCHAR}, 
-      #{userId,jdbcType=VARCHAR}, #{channelId,jdbcType=VARCHAR}, #{subscribeTime,jdbcType=TIMESTAMP}, 
-      #{userCreatetime,jdbcType=TIMESTAMP}, #{openid,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, 
-      #{userAgent,jdbcType=VARCHAR})
+    (#{id,jdbcType=BIGINT}, #{merchantId,jdbcType=VARCHAR}, #{transactionId,jdbcType=VARCHAR}, 
+      #{type,jdbcType=VARCHAR}, #{money,jdbcType=DECIMAL}, #{state,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, #{bookName,jdbcType=VARCHAR}, 
+      #{referralUrl,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{channelId,jdbcType=VARCHAR}, 
+      #{subscribeTime,jdbcType=TIMESTAMP}, #{userCreatetime,jdbcType=TIMESTAMP}, #{openid,jdbcType=VARCHAR}, 
+      #{ip,jdbcType=VARCHAR}, #{userAgent,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}
+      )
     on duplicate key update 
-    merchant_id = #{merchantId,jdbcType=INTEGER}, 
+    id = #{id,jdbcType=BIGINT}, 
+    merchant_id = #{merchantId,jdbcType=VARCHAR}, 
     transaction_id = #{transactionId,jdbcType=VARCHAR}, 
     type = #{type,jdbcType=VARCHAR}, 
     money = #{money,jdbcType=DECIMAL}, 
@@ -912,6 +972,7 @@
     user_createtime = #{userCreatetime,jdbcType=TIMESTAMP}, 
     openid = #{openid,jdbcType=VARCHAR}, 
     ip = #{ip,jdbcType=VARCHAR}, 
-    user_agent = #{userAgent,jdbcType=VARCHAR}
+    user_agent = #{userAgent,jdbcType=VARCHAR}, 
+    insert_time = #{insertTime,jdbcType=TIMESTAMP}
   </insert>
 </mapper>

book-dao/src/main/resources/polar-mybatis-generator.xml

@@ -131,15 +131,15 @@
         <!--<table tableName="ad_user_group_extend"></table>-->
         <!--<table tableName="ad_user_group_extend"/>-->
         <!--<table tableName="sun_user_collect"/>-->
-        <!--<table tableName="sun_order"/>-->
+        <table tableName="sun_order"/>
         <!--<table tableName="sun_order_collect"/>-->
         <!--<table tableName="sun_user"></table>-->
         <!--<table tableName="sun_user_active"></table>-->
         <!--<table tableName="sun_static_order"></table>-->
         <!--<table tableName="sun_static_order_day"></table>-->
         <!--<table tableName="sun_static_order_day_channel"></table>-->
-        <table tableName="sun_static_user_day_channel"></table>
-        <table tableName="sun_static_user_day"></table>
+     <!--   <table tableName="sun_static_user_day_channel"></table>
+        <table tableName="sun_static_user_day"></table>-->
     </context>
 
 </generatorConfiguration>

book-push/src/main/java/com/book/push/task/CacheTask.java

@@ -34,7 +34,7 @@ public class CacheTask {
         Map<String, AdminConfig> stringAdminConfigMap = adminConfigService.selectAll();
     }
 
-    @Scheduled(cron = "0 0/10 * * * ?")
+  /*  @Scheduled(cron = "0 0/10 * * * ?")
     public void refreshPlatform(){
         if (success){
             return;
@@ -50,10 +50,10 @@ public class CacheTask {
        }else {
            success=true;
        }
-    }
+    }*/
 
     public static void main(String[] args) {
-        new CacheTask().refreshPlatform();
+
     }
 
 }

book-server/src/main/java/com/book/server/service/impl/SunDataServiceImpl.java

@@ -76,7 +76,7 @@ public class SunDataServiceImpl implements SunDataService {
             String s = DataUtil.map2form(map);
 
             String result = HttpUtils.sendPost(url, s.getBytes(StandardCharsets.UTF_8));
-            log.info("请求" + sunTypeEnum.getName() + ":" + JsonUtils.toJsonStr(request));
+            log.info("请求" + url+":"+sunTypeEnum.getName() + ":" + JsonUtils.toJsonStr(request));
             log.info("响应" + sunTypeEnum.getName() + ":" + JsonUtils.toJsonStr(result));
             SunResult object = JsonUtils.getObject(result, SunResult.class);
             if (object != null && 0 == object.getError_code()) {
@@ -91,6 +91,7 @@ public class SunDataServiceImpl implements SunDataService {
             e.printStackTrace();
             log.error("sun 获取数据异常:" + e.getMessage());
         }
+        log.error(JsonUtils.toJsonStr(taskMap));
         return Result.failure();
     }
 
@@ -170,6 +171,7 @@ public class SunDataServiceImpl implements SunDataService {
             e.printStackTrace();
             log.error("sun解析数据出错:", e.getMessage());
         }
+        log.info("pullData-over--"+JsonUtils.toJsonStr(taskMap));
     }
 
     private void handleUserActive(List<String> list, Integer taskId) {
@@ -221,6 +223,16 @@ public class SunDataServiceImpl implements SunDataService {
                 gsonBuilder.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES);
                 Gson gson = gsonBuilder.setDateFormat("yyyy-MM-dd HH:mm:ss").create();
                 SunUser sunUser = gson.fromJson(line, SunUser.class);
+                if (sunUser.getRegistertime() .equals(request.getStart_time())){
+                    SunUserExample sunUserExample = SunUserExample.newAndCreateCriteria().andUserIdEqualTo(sunUser.getUserId()).example();
+                    List<SunUser> sunUsers = sunUserMapper.selectByExample(sunUserExample);
+                    if (sunUsers!=null && sunUsers.size() >0){
+                        continue;
+                    }
+                }
+
+
+
                 sunUser.setInsertTime(new Date());
                 sunUser.setStartTime(TimeUtil.dateFromStr(request.getStart_time(), TimeUtil.YYYY_MM_DD_HH_MM_SS));
                 sunUser.setEndTime(TimeUtil.dateFromStr(request.getEnd_time(), TimeUtil.YYYY_MM_DD_HH_MM_SS));
@@ -619,7 +631,17 @@ public class SunDataServiceImpl implements SunDataService {
                 gsonBuilder.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES);
                 Gson gson = gsonBuilder.setDateFormat("yyyy-MM-dd HH:mm:ss").create();
                 SunOrder sunOrder = gson.fromJson(line, SunOrder.class);
+                if (TimeUtil.dateToStr(sunOrder.getCreateTime(),TimeUtil.YYYY_MM_DD_HH_MM_SS ).equals(request.getStart_time())){
+                    SunOrderExample sunOrderExample = SunOrderExample.newAndCreateCriteria().andMerchantIdEqualTo(sunOrder.getMerchantId()).example();
+                    List<SunOrder> sunOrders = sunOrderMapper.selectByExample(sunOrderExample);
+                    if (sunOrder!=null && sunOrders.size() >0){
+                        continue;
+                    }
+                }
+
+
 
+                sunOrder.setInsertTime(new Date());
                 SunOrderCollect sunOrderCollect = collectMap.get(sunOrder.getChannelId());
                 if (sunOrderCollect == null) {
                     sunOrderCollect = new SunOrderCollect();
@@ -720,11 +742,14 @@ public class SunDataServiceImpl implements SunDataService {
     }
 
     public static void main(String[] args) {
-        String line = "{\"merchant_id\":\"20210930105902_643505930_Sbjp\",\"transaction_id\":null,\"type\":\"书币充值\",\"money\":\"66.0\",\"state\":\"未完成\",\"create_time\":\"2021-09-30 10:59:03\",\"finish_time\":null,\"book_id\":null,\"book_name\":null,\"book_tags\":null,\"referral_id\":\"11539446\",\"referral_url\":\"https://wx6ba3406d7a8bddbd.yifengab.cn/t/11539446\",\"user_id\":\"643505930\",\"channel_id\":\"36648\",\"subscribe_time\":\"2021-09-30 09:16:08\",\"user_createtime\":\"2021-09-30 09:16:08\",\"openid\":\"ogjqN5g2cQlvpJPwtupxIq7NPXf8\",\"ip\":\"171.104.15.31\",\"user_agent\":\"Mozilla/5.0 (iPhone; CPU iPhone OS 14_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 MicroMessenger/8.0.7(0x18000733) NetType/4G Language/zh_CN\",\"activity_id\":\"7574690\",\"register_ip\":\"171.104.15.31\",\"recharge_money\":null,\"recharge_count\":null}\n";
+       /* String line = "{\"merchant_id\":\"20210930105902_643505930_Sbjp\",\"transaction_id\":null,\"type\":\"书币充值\",\"money\":\"66.0\",\"state\":\"未完成\",\"create_time\":\"2021-09-30 10:59:03\",\"finish_time\":null,\"book_id\":null,\"book_name\":null,\"book_tags\":null,\"referral_id\":\"11539446\",\"referral_url\":\"https://wx6ba3406d7a8bddbd.yifengab.cn/t/11539446\",\"user_id\":\"643505930\",\"channel_id\":\"36648\",\"subscribe_time\":\"2021-09-30 09:16:08\",\"user_createtime\":\"2021-09-30 09:16:08\",\"openid\":\"ogjqN5g2cQlvpJPwtupxIq7NPXf8\",\"ip\":\"171.104.15.31\",\"user_agent\":\"Mozilla/5.0 (iPhone; CPU iPhone OS 14_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 MicroMessenger/8.0.7(0x18000733) NetType/4G Language/zh_CN\",\"activity_id\":\"7574690\",\"register_ip\":\"171.104.15.31\",\"recharge_money\":null,\"recharge_count\":null}\n";
         GsonBuilder gsonBuilder = new GsonBuilder();
         gsonBuilder.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES);
         Gson gson = gsonBuilder.setDateFormat("yyyy-MM-dd HH:mm:ss").create();
         SunOrder sunOrder = gson.fromJson(line, SunOrder.class);
-        System.out.println(sunOrder);
+        System.out.println(sunOrder);*/
+        Map map= new HashMap();
+        map.put(new Integer(1),"sss");
+        System.out.println(map.containsKey(new Integer(1)));
     }
 }

book-server/src/main/java/com/book/server/task/SunDataTask.java

@@ -23,16 +23,17 @@ import java.util.Date;
 @EnableScheduling
 @Slf4j
 public class SunDataTask {
-    public static final Integer FIX_DELAY_HOUR = 1;
+    public static final Integer FIX_DELAY_MINUTE = 16;
+    public static final Integer FIX_FROM_DELAY_MINUTE = 1 *60 + FIX_DELAY_MINUTE;
 
     @Autowired
     private SunDataService sunDataService;
 
-    @Scheduled(cron = "0 0 0/1 * * ?")
+    @Scheduled(cron = "0 16 0/1 * * ?")
     private void getData() {
         log.info("定时拉取sun数据");
-        String timeFrom = TimeUtil.getDateStrAfter(-FIX_DELAY_HOUR, Calendar.HOUR_OF_DAY, TimeUtil.YYYY_M_DD_HH_MM_SS);
-        String timeNow = TimeUtil.getCurrentDate(TimeUtil.YYYY_M_DD_HH_MM_SS);
+        String timeFrom = TimeUtil.getDateStrAfter(-FIX_FROM_DELAY_MINUTE, Calendar.MINUTE, TimeUtil.YYYY_M_DD_HH_MM_SS);
+        String timeNow = TimeUtil.getDateStrAfter(-FIX_DELAY_MINUTE, Calendar.MINUTE, TimeUtil.YYYY_M_DD_HH_MM_SS);
         String dateNow = TimeUtil.getCurrentDate(TimeUtil.YYYYMMDD1);
 
         String channelId = "";
@@ -42,7 +43,7 @@ public class SunDataTask {
             SunRequest request = new SunRequest();
 
             switch (sunTypeEnum) {
-                case user_collect:
+               // case user_collect:
 
                 case user:
                     request.setStart_time(timeFrom);

book-server/src/test/java/com/book/server/controller/SunControllerTest.java

@@ -22,8 +22,6 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-
 /**
  * created in 2021/9/28
  * Project: book-store
@@ -77,12 +75,12 @@ public class SunControllerTest {
         System.out.println(jsonStr);
         Map he = new HashMap();
         he.put("Content-Type","application/json");
-        HttpUtils.sendPost("http://api.griacxv.cn/api/sun/getData/order",he,jsonStr.getBytes(StandardCharsets.UTF_8));
+        HttpUtils.sendPost("http://book.api.esalary.com.cn/api/sun/getData/order",he,jsonStr.getBytes(StandardCharsets.UTF_8));
 
 
         start.add(Calendar.HOUR_OF_DAY,1);
         end.add(Calendar.HOUR_OF_DAY,1);
-        if ("2021-09-30 17:00:00".equals(TimeUtil.dateToStr(start.getTime(),TimeUtil.YYYY_MM_DD_HH_MM_SS))){
+        if ("2021-10-14 13:00:00".equals(TimeUtil.dateToStr(start.getTime(),TimeUtil.YYYY_MM_DD_HH_MM_SS))){
             return;
         }
         Thread.sleep(2100);
@@ -93,7 +91,7 @@ public class SunControllerTest {
 
     @Test
     public  void load() throws Exception {
-        loadData("2021-09-25 00:00:00","2021-09-25 01:00:00");
+        loadData("2021-10-14 12:00:00","2021-10-14 13:00:00");