|
@@ -294,14 +294,14 @@ public class OrderService {
|
|
|
}
|
|
}
|
|
|
restAmount = divMoney(restAmount, divMembers, "0", restAmount, true);
|
|
restAmount = divMoney(restAmount, divMembers, "0", restAmount, true);
|
|
|
}
|
|
}
|
|
|
- if (divMembers.size() > 1) {
|
|
|
|
|
- paymentParams.put("div_members", JSON.toJSONString(divMembers));
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
if (restAmount.compareTo(BigDecimal.ZERO) != 0) {
|
|
if (restAmount.compareTo(BigDecimal.ZERO) != 0) {
|
|
|
log.error("分账出错 {}", JSON.toJSONString(divMembers, SerializerFeature.PrettyFormat));
|
|
log.error("分账出错 {}", JSON.toJSONString(divMembers, SerializerFeature.PrettyFormat));
|
|
|
throw new BusinessException("分账出错");
|
|
throw new BusinessException("分账出错");
|
|
|
}
|
|
}
|
|
|
|
|
+ if (divMembers.size() > 1) {
|
|
|
|
|
+ paymentParams.put("div_members", divMembers);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
if (wxChannels.contains(payChannel)) {
|
|
if (wxChannels.contains(payChannel)) {
|
|
|
// if (StringUtils.isBlank(openId)) {
|
|
// if (StringUtils.isBlank(openId)) {
|
|
@@ -321,8 +321,13 @@ public class OrderService {
|
|
|
paymentParams.put("adapay_func_code", "wxpay.createOrder");
|
|
paymentParams.put("adapay_func_code", "wxpay.createOrder");
|
|
|
paymentParams.put("callback_url", generalProperties.getHost() + "/9th/orders");
|
|
paymentParams.put("callback_url", generalProperties.getHost() + "/9th/orders");
|
|
|
response = AdapayCommon.requestAdapayUits(paymentParams);
|
|
response = AdapayCommon.requestAdapayUits(paymentParams);
|
|
|
|
|
+ log.info("createOrderResponse {}", JSON.toJSONString(response, SerializerFeature.PrettyFormat));
|
|
|
} else {
|
|
} else {
|
|
|
|
|
+ if (divMembers.size() > 1) {
|
|
|
|
|
+ paymentParams.put("div_members", JSON.toJSONString(divMembers));
|
|
|
|
|
+ }
|
|
|
response = Payment.create(paymentParams);
|
|
response = Payment.create(paymentParams);
|
|
|
|
|
+ log.info("createOrderResponse {}", JSON.toJSONString(response, SerializerFeature.PrettyFormat));
|
|
|
AdapayService.checkSuccess(response);
|
|
AdapayService.checkSuccess(response);
|
|
|
}
|
|
}
|
|
|
|
|
|