diff --git a/src/main/java/com/sczx/order/service/impl/DouyinServiceImpl.java b/src/main/java/com/sczx/order/service/impl/DouyinServiceImpl.java index ec39ec0..f8091ab 100644 --- a/src/main/java/com/sczx/order/service/impl/DouyinServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/DouyinServiceImpl.java @@ -162,7 +162,7 @@ public class DouyinServiceImpl implements DouyinService { } @Override - public CertificateCancelResponse cancel(String certificateId, String verifyId) { + public CertificateCancelResponse cancel(String paymentId,String transactionId) { // 获取当前有效的access_token String accessToken = douyinTokenManager.getCurrentToken(); @@ -177,8 +177,10 @@ public class DouyinServiceImpl implements DouyinService { CertificateCancelRequest sdkRequest = new CertificateCancelRequest(); sdkRequest.setAccessToken(accessToken); - sdkRequest.setVerifyId(verifyId); - sdkRequest.setCertificateId(certificateId); + //对应的paymentid + sdkRequest.setVerifyId(paymentId); + //对应的transactionid + sdkRequest.setCertificateId(transactionId); CertificateCancelResponse sdkResponse = client.CertificateCancel(sdkRequest); log.info("撤销券核销结果:" + JSONObject.toJSONString(sdkResponse)); diff --git a/src/main/java/com/sczx/order/service/impl/GroupBuyCouponServiceImpl.java b/src/main/java/com/sczx/order/service/impl/GroupBuyCouponServiceImpl.java index 0482530..fbf26c0 100644 --- a/src/main/java/com/sczx/order/service/impl/GroupBuyCouponServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/GroupBuyCouponServiceImpl.java @@ -88,7 +88,9 @@ public class GroupBuyCouponServiceImpl implements GroupBuyCouponService { //核销团购券 MeituanResponse consumeResponse =meiTuanService.consume( req); consumeResponse.getData().getResult().forEach(result -> { + //获取团购套餐ID 记录为TransactionId 用于退券 productIdMap.put("mtOrderId",String.valueOf(result.getDealId())); + //美团商品ID 用于查找平台对应套餐 productIdMap.put("mtProductId", String.valueOf(result.getDealGroupId())); }); @@ -160,7 +162,9 @@ public class GroupBuyCouponServiceImpl implements GroupBuyCouponService { verifyResponse.getData().getVerifyResults().forEach(verifyResult -> { //撤销验券需要下面两个值 + //代表一张券码的标识(验券时返回) 记录为TransactionId( productIdMap.put("dyCertificateId",verifyResult.getCertificateId()); + //代表券码一次核销的唯一标识 记录为PaymentId productIdMap.put("dyVerifyId",verifyResult.getVerifyId()); }); @@ -168,7 +172,7 @@ public class GroupBuyCouponServiceImpl implements GroupBuyCouponService { //生成第三方订单 CarModelPackageDTO carModelPackageDTO = carInteg.getCarModelPackageByThireId(null,productIdMap.get("dyProductId")); if (carModelPackageDTO == null){ - cancelVerifyCoupon(CouponTypeEnum.DY.getCode(),req.getStoreId().intValue(),productIdMap.get("dyOrderId"),productIdMap.get("dyCertificateId")); + cancelVerifyCoupon(CouponTypeEnum.DY.getCode(),req.getStoreId().intValue(),productIdMap.get("dyVerifyId"),productIdMap.get("dyCertificateId")); throw new BizException("无此对应团购套餐"); } thirdRentCarOrder.setCarModelId(carModelPackageDTO.getCarModelId());