fix数据结构

order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGiftCheckAndJoinResponseDto.java

@@ -23,5 +23,5 @@ public class PayGiftCheckAndJoinResponseDto {
 
     private  String activityName;
     private List<PayGiftCouponVo> coupons;
-    private List<PayGiftWechatCouponInfoVo> wechatCouponInfo;
+    private PayGiftWechatCouponInfoVo wechatCouponInfo;
 }

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java

@@ -325,7 +325,7 @@ public class QueryOrderResponseVo {
 
     //支付有礼领券集合
     private List<PayGiftCouponVo> coupons;
-    private List<PayGiftWechatCouponInfoVo> wechatCouponInfo;
+    private PayGiftWechatCouponInfoVo wechatCouponInfo;
 
     /**
      * 收件人省份

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

@@ -55,6 +55,7 @@ import cn.freemud.utils.ValidationCode;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.freemud.api.assortment.datamanager.entity.db.*;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.manager.*;
@@ -804,6 +805,10 @@ 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());