diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java
index 7e04946..d73965c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java
@@ -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)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java
index e68e85a..587632a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java
@@ -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){
diff --git a/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml
index 0c2a939..e617f7f 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml
@@ -14,10 +14,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
- 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
@@ -94,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
Integral_balance,
agent_remark,
remark,
+ create_user,
#{account},
@@ -104,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{integralBalance},
#{agentRemark},
#{remark},
+ #{createUser},
@@ -118,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
Integral_balance = #{integralBalance},
agent_remark = #{agentRemark},
remark = #{remark},
+ create_user = #{createUser},
where id = #{id}
diff --git a/ruoyi-ui/src/views/point/detail/index.vue b/ruoyi-ui/src/views/point/detail/index.vue
index 82241ce..7d57178 100644
--- a/ruoyi-ui/src/views/point/detail/index.vue
+++ b/ruoyi-ui/src/views/point/detail/index.vue
@@ -92,6 +92,7 @@
+
{{ parseTime(scope.row.integralUpdateTime, '{y}-{m}-{d}') }}