Merge remote-tracking branch 'remotes/origin/feature/1.9.29_支付有礼活动支持发放微信支付商家券' into qa

0a3c5b1b · xiaoer.li@freemud.com · b9b681fa · 9059b1df · 0a3c5b1b
Commit 0a3c5b1b authored Jul 06, 2020 by xiaoer.li@freemud.com
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+0 -4

No files found.
--- a/order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+++ b/order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
@@ -815,10 +815,6 @@ public class OrderServiceImpl implements Orderservice {
            payGitRequestDto.setOrderWay(2);
        }
        BaseResponse<PayGiftCheckAndJoinResponseDto> payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoin(payGitRequestDto);
-        //String json = "{\"code\":\"100\",\"message\":\"success\",\"result\":{\"activityName\":\"3\",\"coupons\":[{\"activityCode\":\"1216460000000111\",\"couponName\":\"支付有礼商家券\",\"couponType\":1,\"discountAmount\":100,\"effectiveData\":\"2020.07.08-2020.07.10\"}],\"wechatCouponInfo\":{\"send_coupon_merchant\":\"256151646\",\"send_coupon_params\":[{\"out_request_no\":\"7125012509192960\",\"stock_id\":\"1216460000000111\"}],\"sign\":\"CA3C86F0D47E97CFD2D4B60AB05DCEA8D54EC07FB5A8FB1C9A795E4466D79A2A\"}},\"ver\":\"1\"}";
-        //BaseResponse<PayGiftCheckAndJoinResponseDto> payGiftBaseResponse = JSON.parseObject(json, new TypeReference<BaseResponse<PayGiftCheckAndJoinResponseDto>>() {
-        //});
-
        if (String.valueOf(RESPONSE_SUCCESS_CODE).equals(payGiftBaseResponse.getCode()) && payGiftBaseResponse.getResult() != null) {
            PayGiftCheckAndJoinResponseDto payGiftResponse = payGiftBaseResponse.getResult();
            queryOrderResponseVo.setActivityName(payGiftResponse.getActivityName());