Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

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

@@ -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();
 
 

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;
+}