流水表去除refType

mp-common/src/main/java/com/qs/mp/common/enums/ChannelMoneyBizTypeEnum.java

@@ -1,41 +0,0 @@
-package com.qs.mp.common.enums;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.IEnum;
-
-/**
- *
- * 渠道账户交易类型
- *
- */
-public enum ChannelMoneyBizTypeEnum implements IEnum<Integer> {
-
-  COMMISSION(1, "佣金收入"),
-  WITHDRAW(2, "提现");
-
-
-  private final int value;
-  private final String desc;
-
-  ChannelMoneyBizTypeEnum(final int value, final String desc) {
-    this.value = value;
-    this.desc = desc;
-  }
-
-  @Override
-  public Integer getValue() {
-    return value;
-  }
-
-  /**
-   * 重写toString，单个转化成json
-   * @return
-   */
-  @Override
-  public String toString() {
-    JSONObject object = new JSONObject();
-    object.put("value",value);
-    object.put("desc", desc);
-    return object.toString();
-  }
-}

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelMoneyLog.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.qs.mp.common.enums.ChannelMoneyBizTypeEnum;
 import com.qs.mp.common.enums.ChannelMoneyEnum;
 import java.io.Serializable;
 import java.util.Date;
@@ -72,12 +71,6 @@ public class ChannelMoneyLog implements Serializable {
   @TableField("biz_time")
   private Date bizTime;
 
-  /**
-   * 关联交易ID类型
-   */
-  @TableField("ref_type")
-  private ChannelMoneyBizTypeEnum refType;
-
   /**
    * 关联交易ID
    */

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelMoneyLogServiceImpl.java

@@ -7,7 +7,6 @@ import com.qs.mp.channel.mapper.ChannelMoneyLogMapper;
 import com.qs.mp.channel.service.IChannelMoneyLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.mp.channel.service.IChannelService;
-import com.qs.mp.common.enums.ChannelMoneyBizTypeEnum;
 import com.qs.mp.common.enums.ChannelMoneyEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.common.exception.DataOperationException;
@@ -65,7 +64,7 @@ public class ChannelMoneyLogServiceImpl extends ServiceImpl<ChannelMoneyLogMappe
 
     //1、更新商户余额表
     boolean rtn = channelService.update(new LambdaUpdateWrapper<Channel>().set(Channel::getMoney, money)
-            .set(ChannelMoneyBizTypeEnum.WITHDRAW == moneyLog.getRefType(), Channel::getFrozenMoney, channel.getFrozenMoney() + moneyLog.getLogMoney())
+            .set(ChannelMoneyEnum.WITHDRAW == moneyLog.getType() || ChannelMoneyEnum.WITHDRAW_FEE == moneyLog.getType(), Channel::getFrozenMoney, channel.getFrozenMoney() + moneyLog.getLogMoney())
         .eq(Channel::getChannelId, channel.getChannelId()).eq(Channel::getMoney, channel.getMoney()));
     Assert.isTrue(rtn, "渠道余额更新失败，channelId:" + channel.getChannelId());
 

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelWithdrawServiceImpl.java

@@ -12,7 +12,6 @@ import com.qs.mp.channel.service.IChannelMoneyLogService;
 import com.qs.mp.channel.service.IChannelService;
 import com.qs.mp.channel.service.IChannelWithdrawService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.mp.common.enums.ChannelMoneyBizTypeEnum;
 import com.qs.mp.common.enums.ChannelMoneyEnum;
 import java.util.Date;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,7 +70,6 @@ public class ChannelWithdrawServiceImpl extends ServiceImpl<ChannelWithdrawMappe
     moneyLog.setType(ChannelMoneyEnum.WITHDRAW);
     moneyLog.setLogMoney(channelWithdraw.getMoney());
     moneyLog.setBizTime(new Date());
-    moneyLog.setRefType(ChannelMoneyBizTypeEnum.WITHDRAW);
     moneyLog.setRefId(String.valueOf(channelWithdraw.getId()));
     channelMoneyLogService.changeMoney(moneyLog);
 
@@ -82,7 +80,6 @@ public class ChannelWithdrawServiceImpl extends ServiceImpl<ChannelWithdrawMappe
       feeMoneyLog.setType(ChannelMoneyEnum.WITHDRAW_FEE);
       feeMoneyLog.setLogMoney(channelWithdraw.getChargeAmt());
       feeMoneyLog.setBizTime(new Date());
-      feeMoneyLog.setRefType(ChannelMoneyBizTypeEnum.WITHDRAW);
       feeMoneyLog.setRefId(String.valueOf(channelWithdraw.getId()));
       channelMoneyLogService.changeMoney(moneyLog);
     }

mp-service/src/main/java/com/qs/mp/user/domain/UserCoinLog.java

@@ -71,12 +71,6 @@ public class UserCoinLog implements Serializable {
   @TableField("biz_time")
   private Date bizTime;
 
-  /**
-   * 关联交易ID类型
-   */
-  @TableField("ref_type")
-  private Integer refType;
-
   /**
    * 关联交易ID
    */

mp-service/src/main/java/com/qs/mp/user/service/impl/UserCoinServiceImpl.java

@@ -51,7 +51,6 @@ public class UserCoinServiceImpl extends ServiceImpl<UserCoinMapper, UserCoin> i
     userCoinLog.setIncomeExpense(CoinLogTypeEnum.INCOME);
     userCoinLog.setLogText("盲票奖品");
     userCoinLog.setBizTime(new Date());
-    userCoinLog.setRefType(1);
     userCoinLog.setRefId(bizId);
     userCoinLogService.save(userCoinLog);
   }
@@ -73,7 +72,6 @@ public class UserCoinServiceImpl extends ServiceImpl<UserCoinMapper, UserCoin> i
     userCoinLog.setIncomeExpense(CoinLogTypeEnum.EXPENSES);
     userCoinLog.setLogText("兑换商品");
     userCoinLog.setBizTime(new Date());
-    userCoinLog.setRefType(2);
     userCoinLog.setRefId(bizId);
     userCoinLogService.save(userCoinLog);
   }

mp-service/src/main/java/com/qs/mp/user/service/impl/UserTicketOrderServiceImpl.java

@@ -19,7 +19,6 @@ import com.qs.mp.channel.service.IChannelMoneyLogService;
 import com.qs.mp.channel.service.IChannelOrderDetailService;
 import com.qs.mp.channel.service.IChannelService;
 import com.qs.mp.channel.service.IChannelUserRelService;
-import com.qs.mp.common.enums.ChannelMoneyBizTypeEnum;
 import com.qs.mp.common.enums.ChannelMoneyEnum;
 import com.qs.mp.common.enums.CommStatusEnum;
 import com.qs.mp.common.enums.MqTopicType;
@@ -426,7 +425,6 @@ public class UserTicketOrderServiceImpl extends
     moneyLog.setType(ChannelMoneyEnum.COMMISSION);
     moneyLog.setLogMoney(siteCommission.getCommAmt());
     moneyLog.setBizTime(new Date());
-    moneyLog.setRefType(ChannelMoneyBizTypeEnum.COMMISSION);
     moneyLog.setRefId(String.valueOf(siteCommission.getId()));
     channelMoneyLogService.changeMoney(moneyLog);
   }

mp-service/src/main/resources/mapper/channel/ChannelMoneyLogMapper.xml

@@ -12,7 +12,6 @@
         <result column="income_expense" property="incomeExpense" />
         <result column="log_text" property="logText" />
         <result column="biz_time" property="bizTime" />
-        <result column="ref_type" property="refType" />
         <result column="ref_id" property="refId" />
         <result column="created_time" property="createdTime" />
         <result column="updated_time" property="updatedTime" />
@@ -20,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, channel_id, type, money, log_money, income_expense, log_text, biz_time, ref_type, ref_id, created_time, updated_time
+        id, channel_id, type, money, log_money, income_expense, log_text, biz_time, ref_id, created_time, updated_time
     </sql>
 
-</mapper>
+</mapper>

mp-service/src/main/resources/mapper/user/UserCoinLogMapper.xml

@@ -12,7 +12,6 @@
         <result column="income_expense" property="incomeExpense" />
         <result column="log_text" property="logText" />
         <result column="biz_time" property="bizTime" />
-        <result column="ref_type" property="refType" />
         <result column="ref_id" property="refId" />
         <result column="created_time" property="createdTime" />
         <result column="updated_time" property="updatedTime" />
@@ -20,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, type, money, log_money, income_expense, log_text, biz_time, ref_type, ref_id, created_time, updated_time
+        id, user_id, type, money, log_money, income_expense, log_text, biz_time, ref_id, created_time, updated_time
     </sql>
 
-</mapper>
+</mapper>