wangshuai
/
youshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

流水明细增加操作人

This commit is contained in:
Lenovo 2024-07-27 15:45:05 +08:00
parent 6083fdd727
commit 6feaacc076
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java
View File

@ -60,6 +60,15 @@ public class BusIntegralRecord extends BaseEntity
/** 代理备注 */
@Excel(name = "代理备注")
private String agentRemark;
private String createUser;
public String getCreateUser() {
return createUser;
}
public void setCreateUser(String createUser) {
this.createUser = createUser;
}
private String remark;
public void setId(Long id)

2
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java
View File

@ -157,6 +157,7 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService
busAgentInfo.setAiDurationBalance((oldValue+newValue));
record.setIntegralBalance((oldValue+newValue));
record.setIntegralUpdateTime(new Date());
record.setCreateUser(busAgentInfo.getSuperiorAgentAccount());
recordService.insertBusIntegralRecord(record);
busAgentInfoMapper.updateBusAgentInfo(busAgentInfo);
@ -164,6 +165,7 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService
BusIntegralRecord record1 = new BusIntegralRecord();
record1.setAccount(busAgentInfo.getSuperiorAgentAccount());
record1.setUpdateType("出账");
record1.setCreateUser(busAgentInfo.getAgentAccount());
record1.setIntegralUpdateNum(busAgentInfo.getAiDurationBalance1());
BusAgentInfo temp1 = busAgentInfoMapper.selectBusAgentInfoById(busAgentInfo.getSuperiorAgentCode());
if(busAgentInfo.getSuperiorAgentCode() == 1){

6
ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml
View File

@ -14,10 +14,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="integralBalance" column="Integral_balance" />
<result property="agentRemark" column="agent_remark" />
<result property="remark" column="remark" />
<result property="createUser" column="create_user" />
</resultMap>
<sql id="selectBusIntegralRecordVo">
select id, account, platform, update_type, Integral_update_num, Integral_update_time, Integral_balance, agent_remark, remark from bus_integral_record
select id, account, platform, update_type, Integral_update_num, Integral_update_time, Integral_balance, agent_remark, remark,create_user from bus_integral_record
</sql>
<sql id="selectBusIntegralRecordVo1">
@ -94,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="integralBalance != null">Integral_balance,</if>
<if test="agentRemark != null">agent_remark,</if>
<if test="remark != null">remark,</if>
<if test="createUser != null">create_user,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="account != null">#{account},</if>
@ -104,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="integralBalance != null">#{integralBalance},</if>
<if test="agentRemark != null">#{agentRemark},</if>
<if test="remark != null">#{remark},</if>
<if test="createUser != null">#{createUser},</if>
</trim>
</insert>
@ -118,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="integralBalance != null">Integral_balance = #{integralBalance},</if>
<if test="agentRemark != null">agent_remark = #{agentRemark},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createUser != null">create_user = #{createUser},</if>
</trim>
where id = #{id}
</update>

1
ruoyi-ui/src/views/point/detail/index.vue
View File

@ -92,6 +92,7 @@
<el-table-column label="分配类型" align="center" prop="updateType" />
<el-table-column label="分配账额" align="center" prop="integralUpdateNum" />
<el-table-column label="入账后余额" align="center" prop="integralBalance" />
<el-table-column label="分配人" align="center" prop="createUser" />
<el-table-column label="分配时间" align="center" prop="integralUpdateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.integralUpdateTime, '{y}-{m}-{d}') }}</span>