缴纳保证金

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/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/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);
+
+
+
 }