update 查询分账数据

jsowell-admin/src/test/java/PaymentTestController.java

@@ -7,6 +7,7 @@ import com.huifu.adapay.core.exception.BaseAdaPayException;
 import com.huifu.adapay.model.PaymentReverse;
 import com.huifu.adapay.model.Refund;
 import com.jsowell.JsowellApplication;
+import com.jsowell.adapay.common.DivMember;
 import com.jsowell.adapay.common.PaymentConfirmInfo;
 import com.jsowell.adapay.dto.QueryConfirmReverseDTO;
 import com.jsowell.adapay.dto.QueryPaymentConfirmDTO;
@@ -42,7 +43,7 @@ import java.util.Map;
 /**
  * 专用处理汇付支付相关
  */
-@ActiveProfiles("pre")
+@ActiveProfiles("dev")
 @SpringBootTest(classes = JsowellApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @RunWith(SpringRunner.class)
 public class PaymentTestController {
@@ -160,13 +161,19 @@ public class PaymentTestController {
                         }
                         JSONObject jsonObject = JSON.parseObject(confirm.getDescription());
                         String adapayMemberId = jsonObject.getString("adapayMemberId");
+                        if (StringUtils.isBlank(adapayMemberId)) {
+                            adapayMemberId = jsonObject.getString("adapayMemberIds");
+                        }
+
+                        // confirm
+                        List<DivMember> divMembers = confirm.getDivMembers();
+                        System.out.println("confirm:" + JSON.toJSONString(divMembers));
+                        for (DivMember divMember : divMembers) {
+                            // 放map
+                            map.merge(divMember.getMemberId(), new BigDecimal(divMember.getAmount()), BigDecimal::add);
+                        }
                         BigDecimal confirmedAmt = new BigDecimal(confirm.getConfirmedAmt());
-
                         total = total.add(confirmedAmt);
-
-                        // 放map
-                        map.merge(adapayMemberId, confirmedAmt, BigDecimal::add);
-
                         if (StringUtils.equals(adapayMemberId, "0")) {
                             selfList.add(paymentId);
                         }

jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java

@@ -1036,7 +1036,7 @@ public class AdapayService {
         confirmParams.put("confirm_amt", AdapayUtil.formatAmount(confirmAmt));
         // 参与分账的会员列表
         List<String> adapayMemberIdList = adapayMemberAccounts.stream().map(DivMember::getMemberId).collect(Collectors.toList());
-        // 附加说明
+        // TODO 附加说明, 记录每个账户分账金额
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("orderCode", orderCode);
         jsonObject.put("adapayMemberIds", StringUtils.join(adapayMemberIdList, ","));