Merge branch 'KA-20210622-ID1032306总部和区域活动可同时生效-周晓航' into qa

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

@@ -13,7 +13,7 @@ import lombok.NoArgsConstructor;
 public class ActivitysDtoNew {
 
     /**
-     * 活动号
+     *  活动号
      */
     private String activityId;
 

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

@@ -16,7 +16,7 @@ import java.util.List;
 public class PayGiftCheckAndJoinResponseDtoNew {
     /**
      * 发送方式
-     * 0-静默发送
+     *  0-静默发送
      * 5-手动发送
      */
     private  Integer sendType;

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

@@ -12,6 +12,7 @@ import java.util.List;
  */
 @Data
 public class PayGiftCheckAndJoinResponseObj {
+
     private PayGiftCheckAndJoinResponseDto oldPayGift;
 
     private List<PayGiftCheckAndJoinResponseDtoNew> newPayGift;

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

@@ -11,7 +11,7 @@ public class PayGiftCouponVo {
     private Integer couponType;
 
     /**
-     * 活动ID
+     *  活动ID
      */
     private  String activityId;
     /**

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

@@ -22,7 +22,7 @@ public class PayGiftWechatCouponInfoVo {
         private String stock_id;
         //发券凭证
         private String out_request_no;
-        // 券code，如果批次是发放时指定code的类型，则发券时必填
+        // 券code，   如果批次是发放时指定code的类型，则发券时必填
         private String coupon_code;
     }
 }

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

@@ -642,7 +642,7 @@ public class QueryOrderResponseVo {
     private boolean orderCompareAfterSaleOrder;
 
     /**
-     * 【订单聚合层】总部和区域活动可同时生效  直接反馈促销给的活动数据
+     * 【订单聚合层】总部和区域活动可同时生效 直接反馈促销给的活动数据
      */
     private List<PayGiftCheckAndJoinResponseDtoNew> newPayGift;
 }

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

@@ -1326,7 +1326,7 @@ public class OrderServiceImpl implements Orderservice {
         BaseResponse<PayGiftCheckAndJoinResponseObj> payGiftBaseResponse;
         try {
             payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoinNew(payGitRequestDto);
-            ApiLog.info("fisherman 总部和区域活动可同时生效 ", payGitRequestDto, payGiftBaseResponse);
+            ApiLog.info("fisherman  总部和区域活动可同时生效 ", payGitRequestDto, payGiftBaseResponse);
             if (String.valueOf(RESPONSE_SUCCESS_CODE).equals(payGiftBaseResponse.getCode()) && payGiftBaseResponse.getResult() != null) {
                 PayGiftCheckAndJoinResponseObj result = payGiftBaseResponse.getResult();
                 PayGiftCheckAndJoinResponseDto oldPayGift = result.getOldPayGift();

order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java

@@ -45,7 +45,7 @@ public interface ActivityApplicationClient {
 
 
     /**
-     *  同享支付有礼活动验证与参与
+     *      同享支付有礼活动验证与参与
      * @param requestVo
      * @return
      */