交易流水表添加交易状态

wisenergy-mapper/src/main/resources/mapper/TradeRecordMapper.xml

@@ -6,6 +6,7 @@
         <result column="user_id" property="userId"/>
         <result column="trade_type" property="tradeType"/>
         <result column="trade_no" property="tradeNo"/>
+        <result column="status" property="status"/>
         <result column="task_id" property="taskId"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
@@ -21,17 +22,18 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        user_id,trade_type,trade_no,task_id,create_time,update_time
+        user_id,trade_type,trade_no,status,task_id,create_time,update_time
     </sql>
 
     <sql id="vals">
-        #{userId},#{tradeType},#{tradeNo},#{taskId}, now(),now()
+        #{userId},#{tradeType},#{tradeNo},#{status},#{taskId}, now(),now()
     </sql>
 
     <sql id="updateCondition">
         <if test="userId != null">user_id = #{userId},</if>
         <if test="tradeType != null">trade_type =#{tradeType},</if>
         <if test="tradeNo != null">trade_no =#{tradeNo},</if>
+        <if test="status != null">status =#{status},</if>
         <if test="taskId != null">task_id =#{taskId},</if>
         update_time =now()
     </sql>
@@ -41,6 +43,7 @@
         <if test="userId != null">and user_id = #{userId}</if>
         <if test="tradeType != null">and trade_type =#{tradeType}</if>
         <if test="tradeNo != null">and trade_no =#{tradeNo}</if>
+        <if test="status != null">and status =#{status}</if>
         <if test="taskId != null">and task_id =#{taskId}</if>
         <if test="createTime != null">and create_time &gt;= #{createTime}</if>
         <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>

wisenergy-model/src/main/java/cn/wisenergy/model/app/TradeRecord.java

@@ -43,6 +43,12 @@ public class TradeRecord implements Serializable {
     @ApiModelProperty(name = "tradeNo", value = "交易关联订单号")
     private String tradeNo;
 
+    /**
+     * 交易状态：0：未结算 1：已结算 2：银行转账中 3：提现成功
+     */
+    @ApiModelProperty(name = "status", value = "交易状态：0：未结算 1：已结算 2：银行转账中 3：提现成功")
+    private Integer status;
+
     /**
      * 定时任务id
      */

wisenergy-model/src/main/java/cn/wisenergy/model/enums/TradeStatusEnum.java

+package cn.wisenergy.model.enums;
+
+/**
+ * @author 86187
+ * @ Description: 交易状态枚举
+ * @ Author     : 86187
+ * @ Date       : 2021/3/3 10:53
+ */
+public enum TradeStatusEnum {
+    /**
+     * 交易状态
+     */
+    NO_SETTLE_ACCOUNTS(0, "未结算"),
+    ALREADY_SETTLE_ACCOUNTS(1, "已结算"),
+    BANK_TRANSFER_ACCOUNTS(2, "银行转账中"),
+    WITHDRAWAL_SUCCESS(3, "提现成功");
+    private Integer code;
+
+    private String desc;
+
+    TradeStatusEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

wisenergy-model/src/main/java/cn/wisenergy/model/vo/WithdrawalAmountVo.java

@@ -33,4 +33,6 @@ public class WithdrawalAmountVo {
      */
     @ApiModelProperty(value = "本月可提现",name = "currentMoneyCan")
     private BigDecimal currentMoneyCan;
+
+
 }

wisenergy-service/src/main/java/cn/wisenergy/service/Manager/AccountManager.java

@@ -5,6 +5,7 @@ import cn.wisenergy.mapper.*;
 import cn.wisenergy.model.app.*;
 import cn.wisenergy.model.enums.RebateStatusEnum;
 import cn.wisenergy.model.enums.TradeRecordEnum;
+import cn.wisenergy.model.enums.TradeStatusEnum;
 import cn.wisenergy.model.vo.TeamPerformanceSortVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.map.HashedMap;
@@ -81,6 +82,7 @@ public class AccountManager {
         tradeRecord.setUserId(orderInfo.getBuyerId());
         tradeRecord.setTradeType(TradeRecordEnum.ORDER_REBATE.getCode());
         tradeRecord.setTradeNo(orderInfo.getTid());
+        tradeRecord.setStatus(TradeStatusEnum.ALREADY_SETTLE_ACCOUNTS.getCode());
         recordMapper.add(tradeRecord);
     }
 
@@ -173,6 +175,7 @@ public class AccountManager {
             tradeRecord.setUserId(accountInfo.getUserId());
             tradeRecord.setTradeType(TradeRecordEnum.PROGRESS_PRIZE.getCode());
             tradeRecord.setTradeNo(null);
+            tradeRecord.setStatus(TradeStatusEnum.ALREADY_SETTLE_ACCOUNTS.getCode());
             recordMapper.add(tradeRecord);
         }
     }

wisenergy-service/src/main/java/cn/wisenergy/service/app/AccountService.java

@@ -30,7 +30,7 @@ public interface AccountService {
     R<AccountInfo> getByUserId(String userId);
 
     /**
-     * 收益和业绩统计（月度肥料）
+     * 收益和业绩统计（月度肥料 -日）
      *
      * @param list 订单信息
      * @return true or false

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AccountServiceImpl.java

@@ -7,6 +7,7 @@ import cn.wisenergy.model.app.*;
 import cn.wisenergy.model.enums.MonthlyTaskStatus;
 import cn.wisenergy.model.enums.RebateStatusEnum;
 import cn.wisenergy.model.enums.TradeRecordEnum;
+import cn.wisenergy.model.enums.TradeStatusEnum;
 import cn.wisenergy.model.vo.TeamPerformanceSortVo;
 import cn.wisenergy.service.Manager.PublicManager;
 import cn.wisenergy.service.app.AccountService;
@@ -231,6 +232,14 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
 
                     //更新用户账户表
                     accountMapper.updateById(accountInfo);
+
+                    //添加交易流水记录
+                    TradeRecord tradeRecord = new TradeRecord();
+                    tradeRecord.setUserId(user.getUserId());
+                    tradeRecord.setTradeType(TradeRecordEnum.PROGRESS_PRIZE.getCode());
+                    tradeRecord.setTradeNo(null);
+                    tradeRecord.setStatus(TradeStatusEnum.ALREADY_SETTLE_ACCOUNTS.getCode());
+                    tradeRecordMapper.add(tradeRecord);
                 }
             }
             return R.ok(0, true);
@@ -323,6 +332,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
                     tradeRecord.setUserId(user.getUserId());
                     tradeRecord.setTradeType(TradeRecordEnum.ORDER_REBATE.getCode());
                     tradeRecord.setTradeNo(null);
+                    tradeRecord.setStatus(TradeStatusEnum.NO_SETTLE_ACCOUNTS.getCode());
                     int number = tradeRecordMapper.add(tradeRecord);
                     if (number == 0) {
                         return false;