同步核销状态

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-sqb/src/main/java/com/liquidnet/common/third/sqb/biz/SqbBiz.java

@@ -3,6 +3,7 @@ package com.liquidnet.common.third.sqb.biz;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.commons.lang.util.MD5Utils;
 import com.liquidnet.common.third.sqb.config.SqbConfig;
 import com.liquidnet.common.third.sqb.param.callback.CallbackParams;
@@ -339,11 +340,11 @@ public class SqbBiz {
     private <T extends BaseResponse<?>> T executeRequestAndGetResponse(
             String apiPath, String businessName, Object request, Class<T> responseClass) {
         final String url = sqbConfig.getBaseApi() + apiPath;
-        log.info("[收钱吧] {}, 请求URL: {}, 请求参数: {}", businessName, url, request);
+        log.info("[收钱吧] {}, 请求URL: {}, 请求参数: {}", businessName, url, JsonUtils.toJson(request));
 
         try {
             String requestBody = objectMapper.writeValueAsString(request);
-            log.info("request body: {}", requestBody);
+//            log.info("request body: {}", requestBody);
 
             // 构建请求头（添加签名参数）
             final String sign = getSign(requestBody);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinSqbServiceImpl.java

@@ -3,7 +3,6 @@ package com.liquidnet.service.goblin.service.impl;
 import com.liquidnet.common.third.sqb.biz.SqbBiz;
 import com.liquidnet.common.third.sqb.param.request.CommonRequest;
 import com.liquidnet.common.third.sqb.param.request.CouponQueryRequest;
-import com.liquidnet.common.third.sqb.param.request.CouponStatusSyncRequest;
 import com.liquidnet.common.third.sqb.param.response.data.CouponQueryData;
 import com.liquidnet.common.third.sqb.param.response.data.CouponRefundData;
 import com.liquidnet.commons.lang.util.IDGenerator;
@@ -166,20 +165,11 @@ public class GoblinSqbServiceImpl implements IGoblinSqbService {
         if (orderVo == null) return ResponseDto.failure("订单不存在");
         if (!userId.equals(orderVo.getUserId())) return ResponseDto.failure("无权限访问该订单");
 
-        CouponStatusSyncRequest req = new CouponStatusSyncRequest();
-        req.setAppid(sqbBiz.getSqbConfig().getAppId());
-        req.setRedeemSource("EXTERN");
-        // TODO: 填充 voucherNos（券号列表）、redeemMerchantId、redeemExternalOrderSn、clientSn、status
-        //       需要从 orderVo 中获取 couponSn 和其他必要字段
-        if (orderVo.getCouponSn() != null) {
-            req.setVoucherNos(java.util.Collections.singletonList(orderVo.getCouponSn()));
-        }
-        req.setRedeemMerchantId(sqbBiz.getSqbConfig().getMerchantId());
-        req.setRedeemExternalOrderSn(IDGenerator.nextSnowId());
-        req.setClientSn("terminal_001"); // TODO: 配置终端号
-        req.setStatus((byte) 1); // 1-已核销
-
-        boolean couponUsed = sqbBiz.syncCouponStatus(req);
+        boolean couponUsed = sqbBiz.syncCouponStatus(sqbBiz.getSqbConfig().getMerchantId(),
+                Collections.singletonList(orderVo.getCouponSn()),
+                buildRequestId(IDGenerator.nextSnowId()),
+                "terminal_001",
+                (byte) 1);
         if (couponUsed) {
             String now = LocalDateTime.now().format(DTF);
             orderVo.setStatus(2);