diff --git a/src/db/modify.sql b/src/db/modify.sql index 81b07b02c..b33903140 100644 --- a/src/db/modify.sql +++ b/src/db/modify.sql @@ -324,12 +324,11 @@ alter table act_app_list add column `msg_interval` smallint(3) DEFAULT NULL; alter table sys_clients add column `manual_settle` tinyint(1) DEFAULT 0; -create table log_acts_clients( +create table log_clients_operation( id varchar(50) not null, client_id int(11) not null, -act_id varchar(50) not null, -act_name varchar(100) NOT NULL COMMENT '活动名称', +account_id varchar(50) not null comment '操作人者 账户ID', create_time datetime not null, -operation TINYINT(3) default 0 comment '0:noop,1:参加活动,2退出活动', +operation varchar(50) DEFAULT NULL, PRIMARY key(`id`) ); \ No newline at end of file diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java index 542a47f07..931257f48 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java @@ -4,7 +4,7 @@ import au.com.royalpay.payment.manage.activities.monsettledelay.core.ActMonDelay import au.com.royalpay.payment.manage.mappers.act.ActAppMapper; import au.com.royalpay.payment.manage.mappers.act.ActMonDelaySettleMapper; import au.com.royalpay.payment.manage.mappers.act.ActMonDelaySettleRedPackMapper; -import au.com.royalpay.payment.manage.mappers.log.ActsClientsLogMapper; +import au.com.royalpay.payment.manage.mappers.log.ClientsOperationLogMapper; import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper; import au.com.royalpay.payment.manage.merchants.core.ClientManager; import au.com.royalpay.payment.tools.device.DeviceSupport; @@ -44,7 +44,7 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService { @Resource private ActAppMapper actAppMapper; @Resource - private ActsClientsLogMapper actsClientsLogMapper; + private ClientsOperationLogMapper clientsOperationLogMapper; @Resource private ClientManager clientManager; @@ -135,7 +135,7 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService { device.put("expire_time", act.getDate("expire_date")); actMonDelaySettleMapper.save(device); clientManager.changeManualSettle(client_id,true); - saveActClientLog(act.getString("act_id"),act.getString("act_name"), client_id,1); + saveActClientLog(device.getString("account_id"),client_id,"参加活动打开手动清算"); } @@ -159,18 +159,17 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService { actMonDelaySettleMapper.update(clientLog); JSONObject act = actAppMapper.getActDetail("1"); clientManager.changeManualSettle(client_id,false); - saveActClientLog(act.getString("act_id"),act.getString("act_name"), client_id,2); + saveActClientLog(device.getString("account_id"), client_id,"退出活动关闭手动清算"); } - private void saveActClientLog(String act_id,String act_name, int client_id,int operation) { + private void saveActClientLog(String account_id, int client_id,String operation) { JSONObject actClientLog = new JSONObject(); - actClientLog.put("act_id",act_id); actClientLog.put("client_id",client_id); - actClientLog.put("act_name",act_name); + actClientLog.put("account_id",account_id); actClientLog.put("operation",operation); actClientLog.put("create_time",new Date()); - actsClientsLogMapper.save(actClientLog); + clientsOperationLogMapper.save(actClientLog); } } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ActsClientsLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientsOperationLogMapper.java similarity index 78% rename from src/main/java/au/com/royalpay/payment/manage/mappers/log/ActsClientsLogMapper.java rename to src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientsOperationLogMapper.java index c6c285689..c69f68e87 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ActsClientsLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientsOperationLogMapper.java @@ -9,8 +9,8 @@ import cn.yixblog.support.mybatis.autosql.annotations.SqlType; /** * Created by yixian on 2017-04-18. */ -@AutoMapper(tablename = "log_acts_clients",pkName = "id") -public interface ActsClientsLogMapper { +@AutoMapper(tablename = "log_clients_operation",pkName = "id") +public interface ClientsOperationLogMapper { @AutoSql(type = SqlType.INSERT) void save(JSONObject review); }