Merge branches 'feature/20211012_腾讯有数生态接口调整_wuping' and 'master' of…

Merge branches 'feature/20211012_腾讯有数生态接口调整_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

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

@@ -2,9 +2,12 @@ package cn.freemud.service.thirdparty;
 
 import cn.freemud.annotations.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.dto.delivery.GetFilterPartnerResponse;
 import cn.freemud.entities.dto.ecology.*;
+import cn.freemud.entities.dto.openplatform.OrderGetPartnerRequest;
 import cn.freemud.entities.dto.wechat.GetAuthorizerRequestDto;
 import cn.freemud.entities.dto.wechat.GetTokenResponseDto;
+import cn.freemud.entities.vo.SendOrderCountsMsg;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,4 +40,24 @@ public interface EcologyAdminApplicationClient {
     @LogIgnoreFeign(logMessage="sendTemplateMessage")
     @PostMapping(value = "/ecology/api/templateMessage/send")
     SendMessageResponse sendTemplateMessage(SendMessageRequest request);
+
+    /**
+     * 上报微信 有数 统计数据
+     *
+     * @param orderCounts
+     * @return
+     */
+    @LogIgnoreFeign(logMessage="addOrderSum")
+    @PostMapping("/ecology/api/tencent/data/reporting/addOrderSum")
+    BaseResponse addOrderSum(@RequestBody SendOrderCountsMsg orderCounts);
+
+
+    /**
+     * 获取需要 上报腾讯有数的 商户号
+     *
+     * @return
+     */
+    @LogIgnoreFeign(logMessage="getFilterPartner")
+    @PostMapping("/ecology/api/tencent/data/reporting/getFilterPartner")
+    BaseResponse<GetFilterPartnerResponse> getFilterPartner(@RequestBody OrderGetPartnerRequest request);
 }

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

@@ -23,25 +23,25 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping(consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 public interface MicroOpenplatformClient {
 
-    /**
-     * 上报微信 有数 统计数据
-     *
-     * @param orderCounts
-     * @return
-     */
-    @LogIgnoreFeign(logMessage="addOrderSum")
-    @PostMapping("/thirdApp/order/addOrderSum")
-    BaseResponse addOrderSum(@RequestBody SendOrderCountsMsg orderCounts);
-
-
-    /**
-     * 获取需要 上报腾讯有数的 商户号
-     *
-     * @return
-     */
-    @LogIgnoreFeign(logMessage="getFilterPartner")
-    @PostMapping("/thirdApp/getFilterPartner")
-    BaseResponse<GetFilterPartnerResponse> getFilterPartner(@RequestBody OrderGetPartnerRequest request);
+//    /**
+//     * 上报微信 有数 统计数据
+//     *
+//     * @param orderCounts
+//     * @return
+//     */
+//    @LogIgnoreFeign(logMessage="addOrderSum")
+//    @PostMapping("/thirdApp/order/addOrderSum")
+//    BaseResponse addOrderSum(@RequestBody SendOrderCountsMsg orderCounts);
+//
+//
+//    /**
+//     * 获取需要 上报腾讯有数的 商户号
+//     *
+//     * @return
+//     */
+//    @LogIgnoreFeign(logMessage="getFilterPartner")
+//    @PostMapping("/thirdApp/getFilterPartner")
+//    BaseResponse<GetFilterPartnerResponse> getFilterPartner(@RequestBody OrderGetPartnerRequest request);
 
     /**
      * 获取需要 上报腾讯有数的 商户号

order-application-service/src/main/java/cn/freemud/xxljob/OrderCountJobHandler.java

@@ -7,7 +7,8 @@ import cn.freemud.entities.dto.openplatform.OrderGetPartnerRequest;
 import cn.freemud.entities.vo.OrderCountRequestVo;
 import cn.freemud.entities.vo.SendOrderCountsMsg;
 import cn.freemud.service.Orderservice;
-import cn.freemud.service.thirdparty.MicroOpenplatformClient;
+import cn.freemud.service.thirdparty.EcologyAdminApplicationClient;
+//import cn.freemud.service.thirdparty.MicroOpenplatformClient;
 import cn.freemud.utils.AppLogUtil;
 import com.freemud.application.sdk.api.constant.ResponseResultEnum;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
@@ -39,7 +40,8 @@ public class OrderCountJobHandler extends IJobHandler {
     private Orderservice orderservice;
 
     @Autowired
-    private MicroOpenplatformClient microOpenplatformClient;
+    private EcologyAdminApplicationClient ecologyAdminClient;
+//    private MicroOpenplatformClient microOpenplatformClient;
 
     /**
      * 【ID1028455】 【订单】非码-腾讯有数数据上报V1.0.0
@@ -56,7 +58,7 @@ public class OrderCountJobHandler extends IJobHandler {
         OrderGetPartnerRequest build1 = OrderGetPartnerRequest.builder().type(3).build();
         // 获取需要 上报的商户号
         try {
-            BaseResponse<GetFilterPartnerResponse> filterPartner = microOpenplatformClient.getFilterPartner(build1);
+            BaseResponse<GetFilterPartnerResponse> filterPartner = ecologyAdminClient.getFilterPartner(build1);
 //            AppLogUtil.infoLog("上报商户号查询结果", build1, filterPartner == null ? null : JSON.toJSONString(filterPartner));
             if (filterPartner == null
                     || filterPartner.getResult() == null
@@ -86,7 +88,7 @@ public class OrderCountJobHandler extends IJobHandler {
             // 每次推送 只能 50条 让生态端处理
             List<OrderCountResp> orderCounts = result.getResult();
             SendOrderCountsMsg build = SendOrderCountsMsg.builder().partnerRequests(orderCounts).build();
-            BaseResponse baseResponse = microOpenplatformClient.addOrderSum(build);
+            BaseResponse baseResponse = ecologyAdminClient.addOrderSum(build);
 //            AppLogUtil.infoLog("orderCountJobHandlersendreportorderend", JSON.toJSONString(build), JSON.toJSONString(baseResponse));
         } catch (Exception e) {
             AppLogUtil.errorLog("orderCountJobHandlersendreportorderend", null, null,e);