Merge remote-tracking branch 'origin/feature/退款支持优化' into feature/退款支持优化

order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java

@@ -18,14 +18,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.base.BaseResponse;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
-import com.freemud.application.sdk.api.ordercenter.entities.v1.ProductBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
 import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.ordercenter.util.LogUtil;
 import com.freemud.application.sdk.api.util.ResponseUtils;
@@ -44,7 +42,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 
 /**
@@ -107,8 +104,8 @@ public class PaymentHandle {
                     // 抖音订单，退款时需要传递商品信息
                     if (OrderClientType.TIKTOKPAY.getIndex().toString().equals(orderBean.getOrderClient())) {
                         Map<String, String> extParam = new HashMap<>();
-                        List<String> goodsIds = orderBean.getProductList().stream().map(ProductBeanV1::getProductId).collect(Collectors.toList());
-                        extParam.put("tt_goods", JSON.toJSONString(goodsIds));
+                        OrderExtInfoDto ext = JSON.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class);
+                        extParam.put("tt_goods", ext.getTtCouponIds());
                         extParam.put("tt_oid", orderBean.getOid());
                         req.setExtendParams(extParam);
                     }
@@ -159,9 +156,9 @@ public class PaymentHandle {
                             order.getOrderCode(), refundAmount, order.getPayRequestNo(), order.getExtInfo(), reason);
                     // 抖音订单，退款时需要传递商品信息
                     if (OrderClientType.TIKTOKPAY.getIndex().equals(order.getOrderClient())) {
+                        OrderExtInfoDto ext = JSON.parseObject(order.getExtInfo(), OrderExtInfoDto.class);
                         Map<String, String> extParam = new HashMap<>();
-                        List<String> goodsIds = order.getOrderItemList().stream().map(OrderItemResp::getProductSpec).collect(Collectors.toList());
-                        extParam.put("tt_goods", JSON.toJSONString(goodsIds));
+                        extParam.put("tt_goods", ext.getTtCouponIds());
                         extParam.put("tt_oid", order.getOrderCode());
                         req.setExtendParams(extParam);
                     }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

@@ -226,4 +226,12 @@ public class OrderExtInfoDto {
      * svc卡支付时使用的 cardCode
      */
     private String cardCode;
+
+    /**
+     * 抖音订单商品对应的券id，多个id用 , 分隔
+     * 用户下单的单个订单里券的数量可能是 N 张，对应这 N 张券，
+     * 交易模板会为每一张券生成一个内部的虚拟券 ID，
+     * 这个券 ID 在核销和退款流程里会被用到。
+     */
+    private String ttCouponIds;
 }