权益金记录新增字段修改

share-system/src/main/java/share/system/domain/EquityFundLog.java

@@ -10,9 +10,9 @@ import share.common.core.domain.BaseEntity;
 import lombok.Data;
 /**
  * 权益金记录对象 s_equity_fund_log
- * 
+ *
  * @author wuwenlong
- * @date 2024-09-10
+ * @date 2024-09-13
  */
 @Data
 @TableName(value = "s_equity_fund_log")
@@ -54,8 +54,8 @@ public class EquityFundLog extends BaseEntity
     @TableField(select = false)
     private Long isDelete;
 
-    /** 上级手机号 */
-    @Excel(name = "上级手机号")
+    /** 上级电话 */
+    @Excel(name = "上级电话")
     private String phone;
 
     /** 上级账号 */
@@ -66,34 +66,51 @@ public class EquityFundLog extends BaseEntity
     @Excel(name = "上级用户昵称")
     private String nickName;
 
-    /** 下级手机号 */
-    @Excel(name = "下级手机号")
+    /** 下级电话 */
+    @Excel(name = "下级电话")
     private String newPhone;
 
     /** 下级账号 */
-    @Excel(name = "上级账号")
+    @Excel(name = "下级账号")
     private String newAccount;
 
     /** 下级用户昵称 */
     @Excel(name = "下级用户昵称")
     private String newNickName;
 
+    /** 上级用户头像 */
+    @Excel(name = "上级用户头像")
+    private String avatar;
+
+    /** 下级用户头像 */
+    @Excel(name = "下级用户头像")
+    private String newAvatar;
+
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("equityFundType", getEquityFundType())
-            .append("equityFund", getEquityFund())
-            .append("uid", getUid())
-            .append("newUid", getNewUid())
-            .append("terminalTrace", getTerminalTrace())
-            .append("outTradeNo", getOutTradeNo())
-            .append("isDelete", getIsDelete())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+                .append("id", getId())
+                .append("equityFundType", getEquityFundType())
+                .append("equityFund", getEquityFund())
+                .append("uid", getUid())
+                .append("newUid", getNewUid())
+                .append("terminalTrace", getTerminalTrace())
+                .append("outTradeNo", getOutTradeNo())
+                .append("isDelete", getIsDelete())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .append("phone", getPhone())
+                .append("account", getAccount())
+                .append("nickName", getNickName())
+                .append("newPhone", getNewPhone())
+                .append("newAccount", getNewAccount())
+                .append("newNickName", getNewNickName())
+                .append("avatar", getAvatar())
+                .append("newAvatar", getNewAvatar())
+                .toString();
     }
 }

share-system/src/main/java/share/system/service/impl/CallbackServiceImpl.java

@@ -782,8 +782,8 @@ public class CallbackServiceImpl implements CallbackService {
 
                     String equityFund = sysConfigService.selectConfigByKey("sys.equityFundLog.equityFund");
                     //计算返佣额度 写死 99 测试
-                    BigDecimal addEquityFund =  new BigDecimal(99).multiply(new BigDecimal(equityFund)).setScale(2,RoundingMode.HALF_UP);
-//                    BigDecimal addEquityFund =  payPrice.multiply(new BigDecimal(equityFund)).setScale(2,RoundingMode.HALF_UP);
+//                    BigDecimal addEquityFund =  new BigDecimal(99).multiply(new BigDecimal(equityFund)).setScale(2,RoundingMode.HALF_UP);
+                    BigDecimal addEquityFund =  payPrice.multiply(new BigDecimal(equityFund)).setScale(2,RoundingMode.HALF_UP);
                     //查询上级用户是否有钱包
                     ConsumerWallet consumerWallet = consumerWalletService.getOne(new LambdaQueryWrapper<ConsumerWallet>()
                             .eq(ConsumerWallet::getConsumerId, sharingActivities.getUid()));
@@ -823,6 +823,8 @@ public class CallbackServiceImpl implements CallbackService {
                     equityFundLog.setPhone(consumer.getPhone());
                     equityFundLog.setAccount(consumer.getAccount());
                     equityFundLog.setNickName(consumer.getNickName());
+                    equityFundLog.setAvatar(consumer.getAvatar());
+                    equityFundLog.setNewAvatar(newConsumer.getAvatar());
                     equityFundLog.setNewPhone(newConsumer.getPhone());
                     equityFundLog.setNewAccount(newConsumer.getAccount());
                     equityFundLog.setNewNickName(newConsumer.getNickName());

share-system/src/main/resources/mapper/system/EquityFundLogMapper.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="share.system.mapper.EquityFundLogMapper">
-    
+
     <resultMap type="EquityFundLog" id="EquityFundLogResult">
         <result property="id"    column="id"    />
         <result property="equityFundType"    column="equity_fund_type"    />
@@ -18,25 +18,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
-        <result property="account"    column="account"    />
-        <result property="nickName"    column="nick_name"  />
         <result property="phone"    column="phone"    />
-        <result property="newAccount"    column="new_account"    />
-        <result property="newNickName"    column="new_nick_name"  />
+        <result property="account"    column="account"    />
+        <result property="nickName"    column="nick_name"    />
         <result property="newPhone"    column="new_phone"    />
+        <result property="newAccount"    column="new_account"    />
+        <result property="newNickName"    column="new_nick_name"    />
+        <result property="avatar"    column="avatar"    />
+        <result property="newAvatar"    column="new_avatar"    />
     </resultMap>
 
     <sql id="selectEquityFundLogVo">
-        select id, equity_fund_type, equity_fund,
-               , new_uid, terminal_trace, out_trade_no, is_delete,
-               create_by, create_time, update_by, update_time, remark,
-               account,nick_name,phone,new_account,new_nick_name,new_phone
-        from s_equity_fund_log
+        select id, equity_fund_type, equity_fund, uid, new_uid, terminal_trace, out_trade_no, is_delete, create_by, create_time, update_by, update_time, remark, phone, account, nick_name, new_phone, new_account, new_nick_name, avatar, new_avatar from s_equity_fund_log
     </sql>
 
     <select id="selectEquityFundLogList" parameterType="EquityFundLog" resultMap="EquityFundLogResult">
         <include refid="selectEquityFundLogVo"/>
-        <where>  
+        <where>
             <if test="equityFundType != null  and equityFundType != ''"> and equity_fund_type = #{equityFundType}</if>
             <if test="equityFund != null "> and equity_fund = #{equityFund}</if>
             <if test="uid != null "> and uid = #{uid}</if>
@@ -44,14 +42,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="terminalTrace != null  and terminalTrace != ''"> and terminal_trace = #{terminalTrace}</if>
             <if test="outTradeNo != null  and outTradeNo != ''"> and out_trade_no = #{outTradeNo}</if>
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="account != null  and account != ''"> and account = #{account}</if>
+            <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
+            <if test="newPhone != null  and newPhone != ''"> and new_phone = #{newPhone}</if>
+            <if test="newAccount != null  and newAccount != ''"> and new_account = #{newAccount}</if>
+            <if test="newNickName != null  and newNickName != ''"> and new_nick_name like concat('%', #{newNickName}, '%')</if>
+            <if test="avatar != null  and avatar != ''"> and avatar = #{avatar}</if>
+            <if test="newAvatar != null  and newAvatar != ''"> and new_avatar = #{newAvatar}</if>
         </where>
     </select>
-    
+
     <select id="selectEquityFundLogById" parameterType="Long" resultMap="EquityFundLogResult">
         <include refid="selectEquityFundLogVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertEquityFundLog" parameterType="EquityFundLog" useGeneratedKeys="true" keyProperty="id">
         insert into s_equity_fund_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -67,13 +73,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-            <if test="account != null">account,</if>
-            <if test="nickName != null">nickName,</if>
             <if test="phone != null">phone,</if>
-            <if test="newAccount != null">new_account,</if>
-            <if test="newNickName != null">new_nickName,</if>
+            <if test="account != null">account,</if>
+            <if test="nickName != null">nick_name,</if>
             <if test="newPhone != null">new_phone,</if>
-         </trim>
+            <if test="newAccount != null">new_account,</if>
+            <if test="newNickName != null">new_nick_name,</if>
+            <if test="avatar != null">avatar,</if>
+            <if test="newAvatar != null">new_avatar,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="equityFundType != null and equityFundType != ''">#{equityFundType},</if>
             <if test="equityFund != null">#{equityFund},</if>
@@ -87,13 +95,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="phone != null">#{phone},</if>
             <if test="account != null">#{account},</if>
             <if test="nickName != null">#{nickName},</if>
-            <if test="phone != null">#{phone},</if>
-            <if test="newAccount != null">#{new_account},</if>
-            <if test="newNickName != null">#{new_nickName},</if>
-            <if test="newPhone != null">#{new_phone},</if>
-         </trim>
+            <if test="newPhone != null">#{newPhone},</if>
+            <if test="newAccount != null">#{newAccount},</if>
+            <if test="newNickName != null">#{newNickName},</if>
+            <if test="avatar != null">#{avatar},</if>
+            <if test="newAvatar != null">#{newAvatar},</if>
+        </trim>
     </insert>
 
     <update id="updateEquityFundLog" parameterType="EquityFundLog">
@@ -111,6 +121,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="account != null">account = #{account},</if>
+            <if test="nickName != null">nick_name = #{nickName},</if>
+            <if test="newPhone != null">new_phone = #{newPhone},</if>
+            <if test="newAccount != null">new_account = #{newAccount},</if>
+            <if test="newNickName != null">new_nick_name = #{newNickName},</if>
+            <if test="avatar != null">avatar = #{avatar},</if>
+            <if test="newAvatar != null">new_avatar = #{newAvatar},</if>
         </trim>
         where id = #{id}
     </update>
@@ -120,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteEquityFundLogByIds" parameterType="String">
-        delete from s_equity_fund_log where id in 
+        delete from s_equity_fund_log where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>