Commit 904f9cea authored by alex yao's avatar alex yao

fix: 应用使用数据上报

parent 0fc51827
...@@ -58,21 +58,21 @@ ...@@ -58,21 +58,21 @@
<artifactId>framemax-codetool</artifactId> <artifactId>framemax-codetool</artifactId>
<version>4.0.3</version> <version>4.0.3</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>cn.com.yict.framemax</groupId> <!-- <groupId>cn.com.yict.framemax</groupId>-->
<artifactId>framemax-easyui</artifactId> <!-- <artifactId>framemax-easyui</artifactId>-->
<version>4.0.2</version> <!-- <version>4.0.2</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>cn.com.yict.framemax</groupId> <!-- <groupId>cn.com.yict.framemax</groupId>-->
<artifactId>framemax-ldap</artifactId> <!-- <artifactId>framemax-ldap</artifactId>-->
<version>4.0.1</version> <!-- <version>4.0.1</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>cn.com.yict.framemax</groupId> <!-- <groupId>cn.com.yict.framemax</groupId>-->
<artifactId>framemax-organization</artifactId> <!-- <artifactId>framemax-organization</artifactId>-->
<version>4.0.2</version> <!-- <version>4.0.2</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>cn.com.yict.framemax</groupId> <groupId>cn.com.yict.framemax</groupId>
<artifactId>framemax-webservice</artifactId> <artifactId>framemax-webservice</artifactId>
......
...@@ -477,7 +477,8 @@ public class AgentApplicationInfoRestImpl implements AgentApplicationInfoRest { ...@@ -477,7 +477,8 @@ public class AgentApplicationInfoRestImpl implements AgentApplicationInfoRest {
if (StringUtils.isBlank(dto.getChannel())) { if (StringUtils.isBlank(dto.getChannel())) {
dto.setChannel(DataAnalyzeChannelEnum.preview.getChannel()); dto.setChannel(DataAnalyzeChannelEnum.preview.getChannel());
} }
BigDecimal points = new BigDecimal(pointDeductionNum).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP);
dataAnalyzeReportService.dataReportByDialogue(userBaseEntity.getUserId(), DataAnalyzeTypeEnum.AGENT, agentId, DataAnalyzeChannelEnum.valueOf(dto.getChannel())); dataAnalyzeReportService.dataReportByDialogue(userBaseEntity.getUserId(), DataAnalyzeTypeEnum.AGENT, agentId, DataAnalyzeChannelEnum.valueOf(dto.getChannel()));
dataAnalyzeReportService.dataReportByPoint(userBaseEntity.getUserId(), new BigDecimal(pointDeductionNum), DataAnalyzeTypeEnum.AGENT, agentId, DataAnalyzeChannelEnum.valueOf(dto.getChannel())); dataAnalyzeReportService.dataReportByPoint(userBaseEntity.getUserId(), points, DataAnalyzeTypeEnum.AGENT, agentId, DataAnalyzeChannelEnum.valueOf(dto.getChannel()));
} }
} }
\ No newline at end of file
...@@ -36,7 +36,7 @@ public class DataAnalyzeReportServiceImpl implements DataAnalyzeReportService { ...@@ -36,7 +36,7 @@ public class DataAnalyzeReportServiceImpl implements DataAnalyzeReportService {
entity.setRelationId(relationId); entity.setRelationId(relationId);
entity.setType(type.getType()); entity.setType(type.getType());
entity.setMemberId(memberId); entity.setMemberId(memberId);
entity.setPointNum(point.setScale(2).doubleValue()); entity.setPointNum(point.doubleValue());
entity.setChannel(channel.getChannel()); entity.setChannel(channel.getChannel());
entity.setDatetime(DateUtils.getCurrDateTime()); entity.setDatetime(DateUtils.getCurrDateTime());
bizDataAnalyzePointRecordService.save(entity); bizDataAnalyzePointRecordService.save(entity);
......
...@@ -429,8 +429,9 @@ public class AgentApplicationServiceImpl implements AgentApplicationService { ...@@ -429,8 +429,9 @@ public class AgentApplicationServiceImpl implements AgentApplicationService {
if (StringUtils.isBlank(channel)) { if (StringUtils.isBlank(channel)) {
channel = DataAnalyzeChannelEnum.link_share.getChannel(); channel = DataAnalyzeChannelEnum.link_share.getChannel();
} }
BigDecimal points = new BigDecimal(pointDeductionNum).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP);
dataAnalyzeReportService.dataReportByDialogue(userBaseEntity.getUserId(), DataAnalyzeTypeEnum.AGENT, agentId, DataAnalyzeChannelEnum.valueOf(channel)); dataAnalyzeReportService.dataReportByDialogue(userBaseEntity.getUserId(), DataAnalyzeTypeEnum.AGENT, agentId, DataAnalyzeChannelEnum.valueOf(channel));
dataAnalyzeReportService.dataReportByPoint(userBaseEntity.getUserId(), new BigDecimal(pointDeductionNum), DataAnalyzeTypeEnum.AGENT, agentId, DataAnalyzeChannelEnum.valueOf(channel)); dataAnalyzeReportService.dataReportByPoint(userBaseEntity.getUserId(), points, DataAnalyzeTypeEnum.AGENT, agentId, DataAnalyzeChannelEnum.valueOf(channel));
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment