缴纳保证金

ch-dao/src/main/java/com/wwdz/ch/db/domain/openShop/UserAccount.java

@@ -4,16 +4,14 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
-
-import com.xxdxxs.entity.Entity;
 import lombok.Data;
 
 /**
  * @author shiyu
- * @date   2024/11/05
+ * @date   2024/11/06
  */
 @Data
-public class UserAccount implements Entity {
+public class UserAccount implements Serializable {
     private Long id;
 
     /**
@@ -29,13 +27,23 @@ public class UserAccount implements Entity {
     /**
      * 货款
      */
-    private Long itemIncomeAmount;
+    private Long goodsAmount;
+
+    /**
+     * 待入账货款
+     */
+    private Long goodsWaitEntryAmount;
 
     /**
      * 介绍佣金
      */
     private Long introduceAmount;
 
+    /**
+     * 待入账介绍佣金
+     */
+    private Long introduceWaitEntryAmount;
+
     /**
      * 拍卖保证金
      */
@@ -62,8 +70,10 @@ public class UserAccount implements Entity {
         sb.append(", id=").append(id);
         sb.append(", userId=").append(userId);
         sb.append(", guaranteeAmount=").append(guaranteeAmount);
-        sb.append(", itemIncomeAmount=").append(itemIncomeAmount);
+        sb.append(", goodsAmount=").append(goodsAmount);
+        sb.append(", goodsWaitEntryAmount=").append(goodsWaitEntryAmount);
         sb.append(", introduceAmount=").append(introduceAmount);
+        sb.append(", introduceWaitEntryAmount=").append(introduceWaitEntryAmount);
         sb.append(", earnestAmount=").append(earnestAmount);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
@@ -87,8 +97,10 @@ public class UserAccount implements Entity {
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
             && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
             && (this.getGuaranteeAmount() == null ? other.getGuaranteeAmount() == null : this.getGuaranteeAmount().equals(other.getGuaranteeAmount()))
-            && (this.getItemIncomeAmount() == null ? other.getItemIncomeAmount() == null : this.getItemIncomeAmount().equals(other.getItemIncomeAmount()))
+            && (this.getGoodsAmount() == null ? other.getGoodsAmount() == null : this.getGoodsAmount().equals(other.getGoodsAmount()))
+            && (this.getGoodsWaitEntryAmount() == null ? other.getGoodsWaitEntryAmount() == null : this.getGoodsWaitEntryAmount().equals(other.getGoodsWaitEntryAmount()))
             && (this.getIntroduceAmount() == null ? other.getIntroduceAmount() == null : this.getIntroduceAmount().equals(other.getIntroduceAmount()))
+            && (this.getIntroduceWaitEntryAmount() == null ? other.getIntroduceWaitEntryAmount() == null : this.getIntroduceWaitEntryAmount().equals(other.getIntroduceWaitEntryAmount()))
             && (this.getEarnestAmount() == null ? other.getEarnestAmount() == null : this.getEarnestAmount().equals(other.getEarnestAmount()))
             && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
             && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()));
@@ -101,8 +113,10 @@ public class UserAccount implements Entity {
         result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
         result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
         result = prime * result + ((getGuaranteeAmount() == null) ? 0 : getGuaranteeAmount().hashCode());
-        result = prime * result + ((getItemIncomeAmount() == null) ? 0 : getItemIncomeAmount().hashCode());
+        result = prime * result + ((getGoodsAmount() == null) ? 0 : getGoodsAmount().hashCode());
+        result = prime * result + ((getGoodsWaitEntryAmount() == null) ? 0 : getGoodsWaitEntryAmount().hashCode());
         result = prime * result + ((getIntroduceAmount() == null) ? 0 : getIntroduceAmount().hashCode());
+        result = prime * result + ((getIntroduceWaitEntryAmount() == null) ? 0 : getIntroduceWaitEntryAmount().hashCode());
         result = prime * result + ((getEarnestAmount() == null) ? 0 : getEarnestAmount().hashCode());
         result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
         result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
@@ -120,8 +134,10 @@ public class UserAccount implements Entity {
         id("id", "id", "BIGINT", false),
         userId("user_id", "userId", "BIGINT", false),
         guaranteeAmount("guarantee_amount", "guaranteeAmount", "BIGINT", false),
-        itemIncomeAmount("item_income_amount", "itemIncomeAmount", "BIGINT", false),
+        goodsAmount("goods_amount", "goodsAmount", "BIGINT", false),
+        goodsWaitEntryAmount("goods_wait_entry_amount", "goodsWaitEntryAmount", "BIGINT", false),
         introduceAmount("introduce_amount", "introduceAmount", "BIGINT", false),
+        introduceWaitEntryAmount("introduce_wait_entry_amount", "introduceWaitEntryAmount", "BIGINT", false),
         earnestAmount("earnest_amount", "earnestAmount", "BIGINT", false),
         createTime("create_time", "createTime", "TIMESTAMP", false),
         updateTime("update_time", "updateTime", "TIMESTAMP", false);

ch-dao/src/main/java/com/wwdz/ch/db/domain/openShop/UserAccountExample.java

@@ -544,18 +544,18 @@ public class UserAccountExample {
             return (Criteria) this;
         }
 
-        public Criteria andItemIncomeAmountIsNull() {
-            addCriterion("item_income_amount is null");
+        public Criteria andGoodsAmountIsNull() {
+            addCriterion("goods_amount is null");
             return (Criteria) this;
         }
 
-        public Criteria andItemIncomeAmountIsNotNull() {
-            addCriterion("item_income_amount is not null");
+        public Criteria andGoodsAmountIsNotNull() {
+            addCriterion("goods_amount is not null");
             return (Criteria) this;
         }
 
-        public Criteria andItemIncomeAmountEqualTo(Long value) {
-            addCriterion("item_income_amount =", value, "itemIncomeAmount");
+        public Criteria andGoodsAmountEqualTo(Long value) {
+            addCriterion("goods_amount =", value, "goodsAmount");
             return (Criteria) this;
         }
 
@@ -566,13 +566,13 @@ public class UserAccountExample {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        public Criteria andItemIncomeAmountEqualToColumn(UserAccount.Column column) {
-            addCriterion(new StringBuilder("item_income_amount = ").append(column.getEscapedColumnName()).toString());
+        public Criteria andGoodsAmountEqualToColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("goods_amount = ").append(column.getEscapedColumnName()).toString());
             return (Criteria) this;
         }
 
-        public Criteria andItemIncomeAmountNotEqualTo(Long value) {
-            addCriterion("item_income_amount <>", value, "itemIncomeAmount");
+        public Criteria andGoodsAmountNotEqualTo(Long value) {
+            addCriterion("goods_amount <>", value, "goodsAmount");
             return (Criteria) this;
         }
 
@@ -583,13 +583,13 @@ public class UserAccountExample {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        public Criteria andItemIncomeAmountNotEqualToColumn(UserAccount.Column column) {
-            addCriterion(new StringBuilder("item_income_amount <> ").append(column.getEscapedColumnName()).toString());
+        public Criteria andGoodsAmountNotEqualToColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("goods_amount <> ").append(column.getEscapedColumnName()).toString());
             return (Criteria) this;
         }
 
-        public Criteria andItemIncomeAmountGreaterThan(Long value) {
-            addCriterion("item_income_amount >", value, "itemIncomeAmount");
+        public Criteria andGoodsAmountGreaterThan(Long value) {
+            addCriterion("goods_amount >", value, "goodsAmount");
             return (Criteria) this;
         }
 
@@ -600,13 +600,13 @@ public class UserAccountExample {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        public Criteria andItemIncomeAmountGreaterThanColumn(UserAccount.Column column) {
-            addCriterion(new StringBuilder("item_income_amount > ").append(column.getEscapedColumnName()).toString());
+        public Criteria andGoodsAmountGreaterThanColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("goods_amount > ").append(column.getEscapedColumnName()).toString());
             return (Criteria) this;
         }
 
-        public Criteria andItemIncomeAmountGreaterThanOrEqualTo(Long value) {
-            addCriterion("item_income_amount >=", value, "itemIncomeAmount");
+        public Criteria andGoodsAmountGreaterThanOrEqualTo(Long value) {
+            addCriterion("goods_amount >=", value, "goodsAmount");
             return (Criteria) this;
         }
 
@@ -617,13 +617,13 @@ public class UserAccountExample {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        public Criteria andItemIncomeAmountGreaterThanOrEqualToColumn(UserAccount.Column column) {
-            addCriterion(new StringBuilder("item_income_amount >= ").append(column.getEscapedColumnName()).toString());
+        public Criteria andGoodsAmountGreaterThanOrEqualToColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("goods_amount >= ").append(column.getEscapedColumnName()).toString());
             return (Criteria) this;
         }
 
-        public Criteria andItemIncomeAmountLessThan(Long value) {
-            addCriterion("item_income_amount <", value, "itemIncomeAmount");
+        public Criteria andGoodsAmountLessThan(Long value) {
+            addCriterion("goods_amount <", value, "goodsAmount");
             return (Criteria) this;
         }
 
@@ -634,13 +634,13 @@ public class UserAccountExample {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        public Criteria andItemIncomeAmountLessThanColumn(UserAccount.Column column) {
-            addCriterion(new StringBuilder("item_income_amount < ").append(column.getEscapedColumnName()).toString());
+        public Criteria andGoodsAmountLessThanColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("goods_amount < ").append(column.getEscapedColumnName()).toString());
             return (Criteria) this;
         }
 
-        public Criteria andItemIncomeAmountLessThanOrEqualTo(Long value) {
-            addCriterion("item_income_amount <=", value, "itemIncomeAmount");
+        public Criteria andGoodsAmountLessThanOrEqualTo(Long value) {
+            addCriterion("goods_amount <=", value, "goodsAmount");
             return (Criteria) this;
         }
 
@@ -651,28 +651,160 @@ public class UserAccountExample {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        public Criteria andItemIncomeAmountLessThanOrEqualToColumn(UserAccount.Column column) {
-            addCriterion(new StringBuilder("item_income_amount <= ").append(column.getEscapedColumnName()).toString());
+        public Criteria andGoodsAmountLessThanOrEqualToColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("goods_amount <= ").append(column.getEscapedColumnName()).toString());
             return (Criteria) this;
         }
 
-        public Criteria andItemIncomeAmountIn(List<Long> values) {
-            addCriterion("item_income_amount in", values, "itemIncomeAmount");
+        public Criteria andGoodsAmountIn(List<Long> values) {
+            addCriterion("goods_amount in", values, "goodsAmount");
             return (Criteria) this;
         }
 
-        public Criteria andItemIncomeAmountNotIn(List<Long> values) {
-            addCriterion("item_income_amount not in", values, "itemIncomeAmount");
+        public Criteria andGoodsAmountNotIn(List<Long> values) {
+            addCriterion("goods_amount not in", values, "goodsAmount");
             return (Criteria) this;
         }
 
-        public Criteria andItemIncomeAmountBetween(Long value1, Long value2) {
-            addCriterion("item_income_amount between", value1, value2, "itemIncomeAmount");
+        public Criteria andGoodsAmountBetween(Long value1, Long value2) {
+            addCriterion("goods_amount between", value1, value2, "goodsAmount");
             return (Criteria) this;
         }
 
-        public Criteria andItemIncomeAmountNotBetween(Long value1, Long value2) {
-            addCriterion("item_income_amount not between", value1, value2, "itemIncomeAmount");
+        public Criteria andGoodsAmountNotBetween(Long value1, Long value2) {
+            addCriterion("goods_amount not between", value1, value2, "goodsAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsWaitEntryAmountIsNull() {
+            addCriterion("goods_wait_entry_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsWaitEntryAmountIsNotNull() {
+            addCriterion("goods_wait_entry_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsWaitEntryAmountEqualTo(Long value) {
+            addCriterion("goods_wait_entry_amount =", value, "goodsWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_account
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andGoodsWaitEntryAmountEqualToColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("goods_wait_entry_amount = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsWaitEntryAmountNotEqualTo(Long value) {
+            addCriterion("goods_wait_entry_amount <>", value, "goodsWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_account
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andGoodsWaitEntryAmountNotEqualToColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("goods_wait_entry_amount <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsWaitEntryAmountGreaterThan(Long value) {
+            addCriterion("goods_wait_entry_amount >", value, "goodsWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_account
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andGoodsWaitEntryAmountGreaterThanColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("goods_wait_entry_amount > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsWaitEntryAmountGreaterThanOrEqualTo(Long value) {
+            addCriterion("goods_wait_entry_amount >=", value, "goodsWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_account
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andGoodsWaitEntryAmountGreaterThanOrEqualToColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("goods_wait_entry_amount >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsWaitEntryAmountLessThan(Long value) {
+            addCriterion("goods_wait_entry_amount <", value, "goodsWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_account
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andGoodsWaitEntryAmountLessThanColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("goods_wait_entry_amount < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsWaitEntryAmountLessThanOrEqualTo(Long value) {
+            addCriterion("goods_wait_entry_amount <=", value, "goodsWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_account
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andGoodsWaitEntryAmountLessThanOrEqualToColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("goods_wait_entry_amount <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsWaitEntryAmountIn(List<Long> values) {
+            addCriterion("goods_wait_entry_amount in", values, "goodsWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsWaitEntryAmountNotIn(List<Long> values) {
+            addCriterion("goods_wait_entry_amount not in", values, "goodsWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsWaitEntryAmountBetween(Long value1, Long value2) {
+            addCriterion("goods_wait_entry_amount between", value1, value2, "goodsWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsWaitEntryAmountNotBetween(Long value1, Long value2) {
+            addCriterion("goods_wait_entry_amount not between", value1, value2, "goodsWaitEntryAmount");
             return (Criteria) this;
         }
 
@@ -808,6 +940,138 @@ public class UserAccountExample {
             return (Criteria) this;
         }
 
+        public Criteria andIntroduceWaitEntryAmountIsNull() {
+            addCriterion("introduce_wait_entry_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntroduceWaitEntryAmountIsNotNull() {
+            addCriterion("introduce_wait_entry_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntroduceWaitEntryAmountEqualTo(Long value) {
+            addCriterion("introduce_wait_entry_amount =", value, "introduceWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_account
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIntroduceWaitEntryAmountEqualToColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("introduce_wait_entry_amount = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIntroduceWaitEntryAmountNotEqualTo(Long value) {
+            addCriterion("introduce_wait_entry_amount <>", value, "introduceWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_account
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIntroduceWaitEntryAmountNotEqualToColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("introduce_wait_entry_amount <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIntroduceWaitEntryAmountGreaterThan(Long value) {
+            addCriterion("introduce_wait_entry_amount >", value, "introduceWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_account
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIntroduceWaitEntryAmountGreaterThanColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("introduce_wait_entry_amount > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIntroduceWaitEntryAmountGreaterThanOrEqualTo(Long value) {
+            addCriterion("introduce_wait_entry_amount >=", value, "introduceWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_account
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIntroduceWaitEntryAmountGreaterThanOrEqualToColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("introduce_wait_entry_amount >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIntroduceWaitEntryAmountLessThan(Long value) {
+            addCriterion("introduce_wait_entry_amount <", value, "introduceWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_account
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIntroduceWaitEntryAmountLessThanColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("introduce_wait_entry_amount < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIntroduceWaitEntryAmountLessThanOrEqualTo(Long value) {
+            addCriterion("introduce_wait_entry_amount <=", value, "introduceWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_account
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIntroduceWaitEntryAmountLessThanOrEqualToColumn(UserAccount.Column column) {
+            addCriterion(new StringBuilder("introduce_wait_entry_amount <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIntroduceWaitEntryAmountIn(List<Long> values) {
+            addCriterion("introduce_wait_entry_amount in", values, "introduceWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntroduceWaitEntryAmountNotIn(List<Long> values) {
+            addCriterion("introduce_wait_entry_amount not in", values, "introduceWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntroduceWaitEntryAmountBetween(Long value1, Long value2) {
+            addCriterion("introduce_wait_entry_amount between", value1, value2, "introduceWaitEntryAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntroduceWaitEntryAmountNotBetween(Long value1, Long value2) {
+            addCriterion("introduce_wait_entry_amount not between", value1, value2, "introduceWaitEntryAmount");
+            return (Criteria) this;
+        }
+
         public Criteria andEarnestAmountIsNull() {
             addCriterion("earnest_amount is null");
             return (Criteria) this;

ch-dao/src/main/java/com/wwdz/ch/db/mapper/openShop/UserAccountMapper.java

@@ -3,11 +3,8 @@ package com.wwdz.ch.db.mapper.openShop;
 import com.wwdz.ch.db.domain.openShop.UserAccount;
 import com.wwdz.ch.db.domain.openShop.UserAccountExample;
 import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-@Mapper
 public interface UserAccountMapper {
     long countByExample(UserAccountExample example);
 

ch-dao/src/main/resources/com/wwdz/ch/db/mapper/openShop/UserAccountMapper.xml

@@ -5,8 +5,10 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="user_id" jdbcType="BIGINT" property="userId" />
     <result column="guarantee_amount" jdbcType="BIGINT" property="guaranteeAmount" />
-    <result column="item_income_amount" jdbcType="BIGINT" property="itemIncomeAmount" />
+    <result column="goods_amount" jdbcType="BIGINT" property="goodsAmount" />
+    <result column="goods_wait_entry_amount" jdbcType="BIGINT" property="goodsWaitEntryAmount" />
     <result column="introduce_amount" jdbcType="BIGINT" property="introduceAmount" />
+    <result column="introduce_wait_entry_amount" jdbcType="BIGINT" property="introduceWaitEntryAmount" />
     <result column="earnest_amount" jdbcType="BIGINT" property="earnestAmount" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -70,8 +72,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, user_id, guarantee_amount, item_income_amount, introduce_amount, earnest_amount, 
-    create_time, update_time
+    id, user_id, guarantee_amount, goods_amount, goods_wait_entry_amount, introduce_amount, 
+    introduce_wait_entry_amount, earnest_amount, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="com.wwdz.ch.db.domain.openShop.UserAccountExample" resultMap="BaseResultMap">
     select
@@ -100,14 +102,14 @@
       distinct
     </if>
     <choose>
-      <when test="selective != null and selective.length > 0">
+      <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
           ${column.escapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, user_id, guarantee_amount, item_income_amount, introduce_amount, earnest_amount, 
-          create_time, update_time
+        id, user_id, guarantee_amount, goods_amount, goods_wait_entry_amount, introduce_amount, 
+          introduce_wait_entry_amount, earnest_amount, create_time, update_time
       </otherwise>
     </choose>
     from user_account
@@ -132,14 +134,14 @@
     -->
     select
     <choose>
-      <when test="selective != null and selective.length > 0">
+      <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
           ${column.escapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, user_id, guarantee_amount, item_income_amount, introduce_amount, earnest_amount, 
-          create_time, update_time
+        id, user_id, guarantee_amount, goods_amount, goods_wait_entry_amount, introduce_amount, 
+          introduce_wait_entry_amount, earnest_amount, create_time, update_time
       </otherwise>
     </choose>
     from user_account
@@ -159,12 +161,14 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into user_account (user_id, guarantee_amount, item_income_amount, 
-      introduce_amount, earnest_amount, create_time, 
-      update_time)
-    values (#{userId,jdbcType=BIGINT}, #{guaranteeAmount,jdbcType=BIGINT}, #{itemIncomeAmount,jdbcType=BIGINT}, 
-      #{introduceAmount,jdbcType=BIGINT}, #{earnestAmount,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+    insert into user_account (user_id, guarantee_amount, goods_amount, 
+      goods_wait_entry_amount, introduce_amount, introduce_wait_entry_amount, 
+      earnest_amount, create_time, update_time
+      )
+    values (#{userId,jdbcType=BIGINT}, #{guaranteeAmount,jdbcType=BIGINT}, #{goodsAmount,jdbcType=BIGINT}, 
+      #{goodsWaitEntryAmount,jdbcType=BIGINT}, #{introduceAmount,jdbcType=BIGINT}, #{introduceWaitEntryAmount,jdbcType=BIGINT}, 
+      #{earnestAmount,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.openShop.UserAccount">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -178,12 +182,18 @@
       <if test="guaranteeAmount != null">
         guarantee_amount,
       </if>
-      <if test="itemIncomeAmount != null">
-        item_income_amount,
+      <if test="goodsAmount != null">
+        goods_amount,
+      </if>
+      <if test="goodsWaitEntryAmount != null">
+        goods_wait_entry_amount,
       </if>
       <if test="introduceAmount != null">
         introduce_amount,
       </if>
+      <if test="introduceWaitEntryAmount != null">
+        introduce_wait_entry_amount,
+      </if>
       <if test="earnestAmount != null">
         earnest_amount,
       </if>
@@ -201,12 +211,18 @@
       <if test="guaranteeAmount != null">
         #{guaranteeAmount,jdbcType=BIGINT},
       </if>
-      <if test="itemIncomeAmount != null">
-        #{itemIncomeAmount,jdbcType=BIGINT},
+      <if test="goodsAmount != null">
+        #{goodsAmount,jdbcType=BIGINT},
+      </if>
+      <if test="goodsWaitEntryAmount != null">
+        #{goodsWaitEntryAmount,jdbcType=BIGINT},
       </if>
       <if test="introduceAmount != null">
         #{introduceAmount,jdbcType=BIGINT},
       </if>
+      <if test="introduceWaitEntryAmount != null">
+        #{introduceWaitEntryAmount,jdbcType=BIGINT},
+      </if>
       <if test="earnestAmount != null">
         #{earnestAmount,jdbcType=BIGINT},
       </if>
@@ -236,12 +252,18 @@
       <if test="record.guaranteeAmount != null">
         guarantee_amount = #{record.guaranteeAmount,jdbcType=BIGINT},
       </if>
-      <if test="record.itemIncomeAmount != null">
-        item_income_amount = #{record.itemIncomeAmount,jdbcType=BIGINT},
+      <if test="record.goodsAmount != null">
+        goods_amount = #{record.goodsAmount,jdbcType=BIGINT},
+      </if>
+      <if test="record.goodsWaitEntryAmount != null">
+        goods_wait_entry_amount = #{record.goodsWaitEntryAmount,jdbcType=BIGINT},
       </if>
       <if test="record.introduceAmount != null">
         introduce_amount = #{record.introduceAmount,jdbcType=BIGINT},
       </if>
+      <if test="record.introduceWaitEntryAmount != null">
+        introduce_wait_entry_amount = #{record.introduceWaitEntryAmount,jdbcType=BIGINT},
+      </if>
       <if test="record.earnestAmount != null">
         earnest_amount = #{record.earnestAmount,jdbcType=BIGINT},
       </if>
@@ -261,8 +283,10 @@
     set id = #{record.id,jdbcType=BIGINT},
       user_id = #{record.userId,jdbcType=BIGINT},
       guarantee_amount = #{record.guaranteeAmount,jdbcType=BIGINT},
-      item_income_amount = #{record.itemIncomeAmount,jdbcType=BIGINT},
+      goods_amount = #{record.goodsAmount,jdbcType=BIGINT},
+      goods_wait_entry_amount = #{record.goodsWaitEntryAmount,jdbcType=BIGINT},
       introduce_amount = #{record.introduceAmount,jdbcType=BIGINT},
+      introduce_wait_entry_amount = #{record.introduceWaitEntryAmount,jdbcType=BIGINT},
       earnest_amount = #{record.earnestAmount,jdbcType=BIGINT},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP}
@@ -279,12 +303,18 @@
       <if test="guaranteeAmount != null">
         guarantee_amount = #{guaranteeAmount,jdbcType=BIGINT},
       </if>
-      <if test="itemIncomeAmount != null">
-        item_income_amount = #{itemIncomeAmount,jdbcType=BIGINT},
+      <if test="goodsAmount != null">
+        goods_amount = #{goodsAmount,jdbcType=BIGINT},
+      </if>
+      <if test="goodsWaitEntryAmount != null">
+        goods_wait_entry_amount = #{goodsWaitEntryAmount,jdbcType=BIGINT},
       </if>
       <if test="introduceAmount != null">
         introduce_amount = #{introduceAmount,jdbcType=BIGINT},
       </if>
+      <if test="introduceWaitEntryAmount != null">
+        introduce_wait_entry_amount = #{introduceWaitEntryAmount,jdbcType=BIGINT},
+      </if>
       <if test="earnestAmount != null">
         earnest_amount = #{earnestAmount,jdbcType=BIGINT},
       </if>
@@ -301,8 +331,10 @@
     update user_account
     set user_id = #{userId,jdbcType=BIGINT},
       guarantee_amount = #{guaranteeAmount,jdbcType=BIGINT},
-      item_income_amount = #{itemIncomeAmount,jdbcType=BIGINT},
+      goods_amount = #{goodsAmount,jdbcType=BIGINT},
+      goods_wait_entry_amount = #{goodsWaitEntryAmount,jdbcType=BIGINT},
       introduce_amount = #{introduceAmount,jdbcType=BIGINT},
+      introduce_wait_entry_amount = #{introduceWaitEntryAmount,jdbcType=BIGINT},
       earnest_amount = #{earnestAmount,jdbcType=BIGINT},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
@@ -335,14 +367,14 @@
     select
     'true' as QUERYID,
     <choose>
-      <when test="selective != null and selective.length > 0">
+      <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
           ${column.escapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, user_id, guarantee_amount, item_income_amount, introduce_amount, earnest_amount, 
-          create_time, update_time
+        id, user_id, guarantee_amount, goods_amount, goods_wait_entry_amount, introduce_amount, 
+          introduce_wait_entry_amount, earnest_amount, create_time, update_time
       </otherwise>
     </choose>
     from user_account
@@ -354,4 +386,260 @@
     </if>
     limit 1
   </select>
+  <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.openShop.UserAccount">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="user_id" jdbcType="BIGINT" property="userId" />
+    <result column="guarantee_amount" jdbcType="BIGINT" property="guaranteeAmount" />
+    <result column="item_income_amount" jdbcType="BIGINT" property="itemIncomeAmount" />
+    <result column="introduce_amount" jdbcType="BIGINT" property="introduceAmount" />
+    <result column="earnest_amount" jdbcType="BIGINT" property="earnestAmount" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, user_id, guarantee_amount, item_income_amount, introduce_amount, earnest_amount, 
+    create_time, update_time
+  </sql>
+  <select id="selectByExample" parameterType="com.wwdz.ch.db.domain.openShop.UserAccountExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from user_account
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from user_account
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from user_account
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.wwdz.ch.db.domain.openShop.UserAccountExample">
+    delete from user_account
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.wwdz.ch.db.domain.openShop.UserAccount">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into user_account (user_id, guarantee_amount, item_income_amount, 
+      introduce_amount, earnest_amount, create_time, 
+      update_time)
+    values (#{userId,jdbcType=BIGINT}, #{guaranteeAmount,jdbcType=BIGINT}, #{itemIncomeAmount,jdbcType=BIGINT}, 
+      #{introduceAmount,jdbcType=BIGINT}, #{earnestAmount,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.openShop.UserAccount">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into user_account
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="userId != null">
+        user_id,
+      </if>
+      <if test="guaranteeAmount != null">
+        guarantee_amount,
+      </if>
+      <if test="itemIncomeAmount != null">
+        item_income_amount,
+      </if>
+      <if test="introduceAmount != null">
+        introduce_amount,
+      </if>
+      <if test="earnestAmount != null">
+        earnest_amount,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="userId != null">
+        #{userId,jdbcType=BIGINT},
+      </if>
+      <if test="guaranteeAmount != null">
+        #{guaranteeAmount,jdbcType=BIGINT},
+      </if>
+      <if test="itemIncomeAmount != null">
+        #{itemIncomeAmount,jdbcType=BIGINT},
+      </if>
+      <if test="introduceAmount != null">
+        #{introduceAmount,jdbcType=BIGINT},
+      </if>
+      <if test="earnestAmount != null">
+        #{earnestAmount,jdbcType=BIGINT},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.wwdz.ch.db.domain.openShop.UserAccountExample" resultType="java.lang.Long">
+    select count(*) from user_account
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update user_account
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=BIGINT},
+      </if>
+      <if test="record.guaranteeAmount != null">
+        guarantee_amount = #{record.guaranteeAmount,jdbcType=BIGINT},
+      </if>
+      <if test="record.itemIncomeAmount != null">
+        item_income_amount = #{record.itemIncomeAmount,jdbcType=BIGINT},
+      </if>
+      <if test="record.introduceAmount != null">
+        introduce_amount = #{record.introduceAmount,jdbcType=BIGINT},
+      </if>
+      <if test="record.earnestAmount != null">
+        earnest_amount = #{record.earnestAmount,jdbcType=BIGINT},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update user_account
+    set id = #{record.id,jdbcType=BIGINT},
+      user_id = #{record.userId,jdbcType=BIGINT},
+      guarantee_amount = #{record.guaranteeAmount,jdbcType=BIGINT},
+      item_income_amount = #{record.itemIncomeAmount,jdbcType=BIGINT},
+      introduce_amount = #{record.introduceAmount,jdbcType=BIGINT},
+      earnest_amount = #{record.earnestAmount,jdbcType=BIGINT},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.wwdz.ch.db.domain.openShop.UserAccount">
+    update user_account
+    <set>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=BIGINT},
+      </if>
+      <if test="guaranteeAmount != null">
+        guarantee_amount = #{guaranteeAmount,jdbcType=BIGINT},
+      </if>
+      <if test="itemIncomeAmount != null">
+        item_income_amount = #{itemIncomeAmount,jdbcType=BIGINT},
+      </if>
+      <if test="introduceAmount != null">
+        introduce_amount = #{introduceAmount,jdbcType=BIGINT},
+      </if>
+      <if test="earnestAmount != null">
+        earnest_amount = #{earnestAmount,jdbcType=BIGINT},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.wwdz.ch.db.domain.openShop.UserAccount">
+    update user_account
+    set user_id = #{userId,jdbcType=BIGINT},
+      guarantee_amount = #{guaranteeAmount,jdbcType=BIGINT},
+      item_income_amount = #{itemIncomeAmount,jdbcType=BIGINT},
+      introduce_amount = #{introduceAmount,jdbcType=BIGINT},
+      earnest_amount = #{earnestAmount,jdbcType=BIGINT},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
 </mapper>
\ No newline at end of file

ch-dao/src/main/resources/generatorConfig_new.xml

@@ -72,7 +72,7 @@
         <javaClientGenerator type="XMLMAPPER" targetPackage="com.wwdz.ch.db.mapper.openShop"
                              targetProject="ch-dao/src/main/java"/>
 
-        <table tableName="earnest_order" enableCountByExample="true" enableUpdateByExample="true" enableDeleteByExample="true" enableSelectByExample="true" selectByExampleQueryId="true">
+        <table tableName="user_account" enableCountByExample="true" enableUpdateByExample="true" enableDeleteByExample="true" enableSelectByExample="true" selectByExampleQueryId="true">
             <generatedKey column="id" sqlStatement="Mysql" identity="true" />
         </table>
 

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/openShop/AuctionEarnestServiceImpl.java

 package com.wwdz.ch.wx.impl.openShop;
 
-import com.wwdz.ch.core.api.WxAppletApi;
 import com.wwdz.ch.core.api.wxpay.WxPayServiceApi;
 import com.wwdz.ch.core.consts.CommConsts;
 import com.wwdz.ch.core.consts.EarnestEnum;

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/openShop/AuctionEarnestService.java

@@ -2,8 +2,6 @@ package com.wwdz.ch.wx.service.openShop;
 
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dto.request.openShop.EarnestOrderRequestDto;
-import com.wwdz.ch.db.dto.request.openShop.EarnestRecordRequestDto;
-import com.wwdz.ch.db.dto.request.openShop.OpenShopApplyOrderRequestDto;
 
 public interface AuctionEarnestService {
 
@@ -22,4 +20,7 @@ public interface AuctionEarnestService {
      * @return
      */
     Result getPayParam(EarnestOrderRequestDto dto);
+
+
+
 }