Merge branch 'KA-华莱士抽奖跳转百世新增接口'

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -556,5 +556,16 @@ public class OrderController {
         return ResponseUtil.success(orderAdapterService.getOrderConfig(request));
     }
 
+
+    /**
+     *  华莱士临时对接百事抽奖活动
+     * @param request
+     * @return 是否需要弹框,跳转百事
+     */
+    @ApiAnnotation(logMessage = "/order/temp/activity")
+    @PostMapping("/temp/activity/query")
+    public BaseResponse wallaceTempActivity(@Validated @LogParams @RequestBody WallaceTempActivityRequest request) {
+        return orderAdapterService.wallaceTempActivity(request);
+    }
 }
 

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

 package cn.freemud.entities;
 
 public class EdenResponse<T> {
-    private  static  final  String SUCCESSCODE ="200";
+    public   static  final  String SUCCESSCODE ="200";
 
     protected String statusCode;
     protected String message;

order-application-service/src/main/java/cn/freemud/entities/dto/wallace/request/PepsiOrderSubmitRequest.java

+package cn.freemud.entities.dto.wallace.request;
+
+import lombok.Data;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2022/7/15 17:06
+ * @description :
+ */
+@Data
+public class PepsiOrderSubmitRequest {
+
+    /**
+     *  商户号
+     */
+    private String partnerId;
+
+    /**
+     *  用户id
+     */
+    private String memberId;
+    /**
+     * 订单号
+     */
+    private String orderCode;
+}

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

+package cn.freemud.entities.vo.order;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2022/7/15 11:18
+ * @description :
+ */
+@Data
+public class WallaceTempActivityRequest {
+
+    /**
+     * 商户号
+     */
+    private String parentId;
+
+    /**
+     * 订单号
+     */
+    private List<String> orderCodes;
+
+
+
+    private String sessionId;
+}

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

+package cn.freemud.service.thirdparty;
+
+import cn.freemud.entities.EdenResponse;
+import cn.freemud.entities.dto.wallace.request.PepsiOrderSubmitRequest;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2022/7/15 17:04
+ * @description :
+ */
+@FeignClient(name = "wallace-application")
+@RequestMapping(produces = {MediaType.APPLICATION_JSON_UTF8_VALUE})
+public interface WallaceApplicationClient {
+
+    /**
+     * 请求百事 设置抽奖次数+1
+     *
+     * @param request
+     * @return
+     */
+    @PostMapping(value = "/pass/wallace/pepsi/order/submit")
+    EdenResponse pepsiOrderSubmit(@RequestBody PepsiOrderSubmitRequest request);
+}