diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 51693ec21..50e2438c4 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1523,22 +1523,22 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { } // 根据站点id查询该站点配置的分账信息, 如果为空表示本运营商分100% - List memberAccountList = Lists.newArrayList(adapayMemberAccount); + List shareMemberList = Lists.newArrayList(); // 计算每个账户 订单分账金额 - List divMemberList = splitAmount(memberAccountList, settleAmount, paymentInfos); + List divMemberList = splitAmount(shareMemberList, settleAmount, paymentInfos); return null; } /** * 计算每个账户需要分账的金额 - * @param memberAccountList 参与分账的账户信息 + * @param shareMemberList 参与分账的账户信息 * @param settleAmount 订单总结算金额 * @param paymentInfos 支付记录信息 * @return */ - private List splitAmount(List memberAccountList, BigDecimal settleAmount, List paymentInfos) { + private List splitAmount(List shareMemberList, BigDecimal settleAmount, List paymentInfos) { List resultList = Lists.newArrayList(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ShareMemberVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ShareMemberVO.java new file mode 100644 index 000000000..b88d42a20 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ShareMemberVO.java @@ -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; +} diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml index fb36c4b84..d698ffa8a 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml @@ -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') diff --git a/jsowell-ui/src/views/pile/station/pileList.vue b/jsowell-ui/src/views/pile/station/pileList.vue index cd10b5e47..db29d51f0 100644 --- a/jsowell-ui/src/views/pile/station/pileList.vue +++ b/jsowell-ui/src/views/pile/station/pileList.vue @@ -46,11 +46,12 @@ - - - + + + + + +