diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v1/BaseTtPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v1/BaseTtPayAdapterService.java index 7445ca7c1..9ec9d9363 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v1/BaseTtPayAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v1/BaseTtPayAdapterService.java @@ -12,6 +12,7 @@ import com.iformall.douyin.pay.orderQuery.OrderQueryResult; import com.iformall.douyin.payv2.result.TtPayOrderQueryV2Result; import com.iformall.enums.EnumPayStatus; import com.iformall.exception.MallinkException; +import com.iformall.service.order.entity.WxComposeOrder; import com.iformall.service.pay.service.pay.entity.PayAdapterResult; import com.iformall.service.pay.service.pay.entity.PayQueryAdapterResult; import com.iformall.utils.MaUtil; @@ -33,12 +34,13 @@ public class BaseTtPayAdapterService { /** * 做为支付的扩展数据 - * @param payOrder + * @param * @return */ - protected String getCpExtra(WxPayOrder payOrder) { - Map map = new HashMap<>(); - map.put("tenantId",payOrder.getTenantId()); + protected String getCallbackData(WxPayOrder record) { + Map map = new HashMap<>(); + map.put("composeOrderId",record.getOrderId()); + map.put("tenantId",record.getTenantId()); return JSON.toJSONString(map); } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v1/miniApp/TtMiniAppPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v1/miniApp/TtMiniAppPayAdapterService.java index 6fb2f5038..0b098b6c4 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v1/miniApp/TtMiniAppPayAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v1/miniApp/TtMiniAppPayAdapterService.java @@ -138,7 +138,7 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen pageEntry.setParams(JSON.toJSONString(paramMap)); request.setOrderEntrySchema(pageEntry); - request.setCpExtra(getCpExtra(record)); + request.setCpExtra(getCallbackData(record)); TtPayUnifiedOrderV2Result orderV2 = ttPayService.createOrderV2(request); @@ -454,7 +454,7 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen map.put("outOrderNo",record.getOrderId()); map.put("createPay",record.isCreatPay()); if(record.isCreatPay()){ - map.put("callbackData",JSONObject.parseObject(getCpExtra(record),Map.class)); + map.put("callbackData",JSONObject.parseObject(getCallbackData(record),Map.class)); Map payment = new HashMap(); payment.put("totalAmount",composeOrder.getPayment()); map.put("payment",payment);