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

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

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

@@ -14,6 +14,8 @@ package cn.freemud.service.thirdparty;
 
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto;
+import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDtoNew;
+import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseObj;
 import cn.freemud.entities.dto.activity.PayGitCheckAndJoinRequestDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,4 +31,13 @@ public interface ActivityApplicationClient {
      */
     @PostMapping("/promotionActivity/payGiftCheckAndJoin")
     public BaseResponse<PayGiftCheckAndJoinResponseDto> payGiftCheckAndJoin(@RequestBody PayGitCheckAndJoinRequestDto requestVo);
+
+
+    /**
+     *      同享支付有礼活动验证与参与
+     * @param requestVo
+     * @return
+     */
+    @PostMapping("/promotionActivity/payGiftShareCheckAndJoin")
+    BaseResponse<PayGiftCheckAndJoinResponseObj> payGiftCheckAndJoinNew(@RequestBody PayGitCheckAndJoinRequestDto requestVo);
 }