qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.运营数据调整

Browse Source
This commit is contained in:
邱贞招 2024-09-24 14:51:04 +08:00
parent 0d621037df
commit 418b358b06
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electripper-admin/src/main/resources/application-druid.yml
View File

@ -6,7 +6,7 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://localhost:3306/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3306/ele2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: 123456 password: 123456
# url: jdbc:mysql://117.26.179.22:61110/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # url: jdbc:mysql://117.26.179.22:61110/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8

2
electripper-system/src/main/java/com/ruoyi/system/domain/vo/OperatingDataVo.java
View File

@ -34,7 +34,7 @@ public class OperatingDataVo {
//累计待支付 //累计待支付
private String totalUnpaid; private String totalUnpaid;
//手续费 //手续费(支付手续费+平台服务费)
private String handlingFee; private String handlingFee;
//已支付 //已支付

13
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCapitalFlowServiceImpl.java
View File

@ -11,6 +11,8 @@ import com.ruoyi.system.mapper.EtCapitalFlowMapper;
import com.ruoyi.system.domain.EtCapitalFlow; import com.ruoyi.system.domain.EtCapitalFlow;
import com.ruoyi.system.service.IEtCapitalFlowService; import com.ruoyi.system.service.IEtCapitalFlowService;
import javax.annotation.Resource;
/** /**
* 资金流水Service业务层处理 * 资金流水Service业务层处理
* *
@ -20,7 +22,7 @@ import com.ruoyi.system.service.IEtCapitalFlowService;
@Service @Service
public class EtCapitalFlowServiceImpl implements IEtCapitalFlowService public class EtCapitalFlowServiceImpl implements IEtCapitalFlowService
{ {
@Autowired @Resource
private EtCapitalFlowMapper etCapitalFlowMapper; private EtCapitalFlowMapper etCapitalFlowMapper;
/** /**
@ -67,7 +69,14 @@ public class EtCapitalFlowServiceImpl implements IEtCapitalFlowService
@DataScope(deptAlias = "d") @DataScope(deptAlias = "d")
public List<EtCapitalFlow> selectEtCapitalFlowList(EtCapitalFlow etCapitalFlow) public List<EtCapitalFlow> selectEtCapitalFlowList(EtCapitalFlow etCapitalFlow)
{ {
return etCapitalFlowMapper.selectEtCapitalFlowList(etCapitalFlow); List<EtCapitalFlow> etCapitalFlows = etCapitalFlowMapper.selectEtCapitalFlowList(etCapitalFlow);
for (EtCapitalFlow flow : etCapitalFlows) {
if(flow.getOwnerType().equals("1")){
// flow.getOwnerId()
}
}
return etCapitalFlows;
} }
/** /**

2
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
View File

@ -1356,7 +1356,7 @@ public class EtOrderServiceImpl implements IEtOrderService
//handlingFee 手续费 = 0.0054 * 已支付金额 //handlingFee 手续费 = 0.0054 * 已支付金额
BigDecimal handlingFee = etCapitalFlowMapper.getHandlingFee(timeStart, timeEnd, null, Long.parseLong(areaId));//手续费,扣除掉退款部分的 BigDecimal handlingFee = etCapitalFlowMapper.getHandlingFee(timeStart, timeEnd, null, Long.parseLong(areaId));//手续费,扣除掉退款部分的
BigDecimal platformServiceFee = etCapitalFlowMapper.getServiceFee(timeStart, timeEnd, null,Long.parseLong(areaId));//平台服务费 ,扣除掉退款部分的 BigDecimal platformServiceFee = etCapitalFlowMapper.getServiceFee(timeStart, timeEnd, null,Long.parseLong(areaId));//平台服务费 ,扣除掉退款部分的
income.setHandlingFee(handlingFee.toString()); income.setHandlingFee(handlingFee.add(platformServiceFee).toString());
// 总营收 = 已支付 - 已退款 - 手续费 // 总营收 = 已支付 - 已退款 - 手续费
income.setTotalIncome(new BigDecimal(totalPaid).subtract(new BigDecimal(totalRefund)).subtract(handlingFee).subtract(platformServiceFee).toString());//总收入 income.setTotalIncome(new BigDecimal(totalPaid).subtract(new BigDecimal(totalRefund)).subtract(handlingFee).subtract(platformServiceFee).toString());//总收入