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

update 查询分账数据

Browse Source
This commit is contained in:
Guoqs
2025-03-28 10:10:49 +08:00
parent 3eaac97160
commit a30f8f26b6
3 changed files with 2067 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
jsowell-admin/src/test/java/PaymentTestController.java
View File

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

2067
jsowell-admin/src/test/resources/payment_ids
View File

File diff suppressed because it is too large Load Diff

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

@@ -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, ","));