autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-26 22:15:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 查询充电桩详情

Browse Source
This commit is contained in:
Guoqs
2024-09-25 08:54:45 +08:00
parent 597e74e4e9
commit 094758c8ac
4 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1523,22 +1523,22 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
}
// 根据站点id查询该站点配置的分账信息, 如果为空表示本运营商分100%
List<AdapayMemberAccount> memberAccountList = Lists.newArrayList(adapayMemberAccount);
List<ShareMemberVO> shareMemberList = Lists.newArrayList();
// 计算每个账户 订单分账金额
List<DivMember> divMemberList = splitAmount(memberAccountList, settleAmount, paymentInfos);
List<DivMember> divMemberList = splitAmount(shareMemberList, settleAmount, paymentInfos);
return null;
}
/**
* 计算每个账户需要分账的金额
* @param memberAccountList 参与分账的账户信息
* @param shareMemberList 参与分账的账户信息
* @param settleAmount 订单总结算金额
* @param paymentInfos 支付记录信息
* @return
*/
private List<DivMember> splitAmount(List<AdapayMemberAccount> memberAccountList, BigDecimal settleAmount, List<PaymentInfo> paymentInfos) {
private List<DivMember> splitAmount(List<ShareMemberVO> shareMemberList, BigDecimal settleAmount, List<PaymentInfo> paymentInfos) {
List<DivMember> resultList = Lists.newArrayList();

31
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ShareMemberVO.java Normal file
View File

@@ -0,0 +1,31 @@
package com.jsowell.pile.vo.web;
import lombok.Data;
import java.math.BigDecimal;
/**
* 分润成员VO
*/
@Data
public class ShareMemberVO {
/**
* 汇付会员id
*/
private String adapayMemberId;
/**
* 手机号
*/
private String memberPhoneNumber;
/**
* 电费分润比例
*/
private BigDecimal electricityShareRatio;
/**
* 服务费分润比例
*/
private BigDecimal serviceShareRatio;
}

3
jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
View File

@@ -161,7 +161,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
t2.merchant_name as merchantName,
count(t4.id)as gunNum,
t1.create_time as registrationTime,
IF(t6.charger_pile_type = '2','3',(IF(t6.speed_type = '1','1','2'))) AS pileType
IF(t6.charger_pile_type = '2','3',(IF(t6.speed_type = '1','1','2'))) AS chargePortType,
t6.model_name as modelName
FROM
pile_basic_info t1
LEFT JOIN pile_merchant_info t2 ON (t2.id = t1.merchant_id and t2.del_flag = '0')