Browse Source

Merge branch 'release_toaliyun_real_push_order' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_push_order

release_toaliyun_real
lin 3 years ago
parent
commit
9a9c60b2de
2 changed files with 5 additions and 3 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/douyin/payv2/auth/TtPayCredentials.java
  2. +4
    -2
      mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/douyin/payv2/auth/TtPayCredentials.java View File

@@ -79,7 +79,7 @@ public class TtPayCredentials implements Credentials {

String body = "";
// PATCH,POST,PUT
body = EntityUtils.toString(((HttpEntityEnclosingRequest) request).getEntity(),StandardCharsets.UTF_8);
body = EntityUtils.toString(((HttpEntityEnclosingRequest) request).getEntity());

return request.getRequestLine().getMethod() + "\n"
+ canonicalUrl + "\n"


+ 4
- 2
mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java View File

@@ -63,7 +63,8 @@ public class TtPayShareService extends PayShareBaseAdapterService{
ProfitSharingRequest request = new ProfitSharingRequest();
request.setOutOrderNo(record.getOrderId().toString());
request.setOutSettleNo(record.getId().toString());
request.setSettleDesc("自主完结分账");
String desc = "收款帐号完结分账";
request.setSettleDesc(desc);
String settleId = ttPayService.getProfitSharingV2Service().profitSharing(request);
return new PayShareResult(true, null,"success", null,settleId);
} catch (TtPayException e) {
@@ -102,7 +103,8 @@ public class TtPayShareService extends PayShareBaseAdapterService{
ProfitSharingRequest request = new ProfitSharingRequest();
request.setOutOrderNo(record.getOrderId().toString());
request.setOutSettleNo(record.getId().toString());
request.setSettleDesc("自主完结分账");
String desc = "门店完结分账";
request.setSettleDesc(desc);
List list = new ArrayList<>();
for (Object o: receivers) {
JSONObject jo = (JSONObject) o;


Loading…
Cancel
Save