Merge branch 'feature/20210517/v2.0.30-腾讯有数数据上报计算修改-周晓航-ID1029765'

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

@@ -15,5 +15,5 @@ import java.util.List;
 @Data
 @Builder
 public class SendOrderCountsMsg {
-    private List<OrderCountResp> orders;
+    private List<OrderCountResp> partnerRequests;
 }

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

@@ -19,6 +19,7 @@ import com.xxl.job.core.handler.IJobHandler;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -75,20 +76,21 @@ public class OrderCountJobHandler extends IJobHandler {
             orderCountRequestVo.setPartnerIds(partners);
             // 时间设置 前一天
             setBeginAndEndTime(orderCountRequestVo);
+            // 查询 自己的数据
             BaseResponse<List<OrderCountResp>> result = orderservice.selectCountOrdersByPartnerIds(orderCountRequestVo, trackingNo);
             if (Objects.isNull(result)) {
                 return ReturnT.SUCCESS;
             }
             LogUtil.info("orderCountJobHandlersendreportordercountmsg", orderCountRequestVo, JSON.toJSONString(result));
 
-            if (!ResponseResultEnum.SUCCESS.getCode().equalsIgnoreCase(result.getCode()) || Objects.isNull(result.getResult())) {
+            if (!ResponseResultEnum.SUCCESS.getCode().equalsIgnoreCase(result.getCode()) || CollectionUtils.isEmpty(result.getResult())) {
                 return ReturnT.SUCCESS;
             }
             // 每次推送 只能 50条 让生态端处理
             List<OrderCountResp> orderCounts = result.getResult();
-            SendOrderCountsMsg build = SendOrderCountsMsg.builder().orders(orderCounts).build();
+            SendOrderCountsMsg build = SendOrderCountsMsg.builder().partnerRequests(orderCounts).build();
             BaseResponse baseResponse = microOpenplatformClient.addOrderSum(build);
-            LogUtil.info("orderCountJobHandlersendreportorderend", null, JSON.toJSONString(baseResponse));
+            LogUtil.info("orderCountJobHandlersendreportorderend", JSON.toJSONString(build), JSON.toJSONString(baseResponse));
         } catch (Exception e) {
             LogUtil.error("orderCountJobHandlersendreportorderend", null, JSON.toJSONString(e));
         }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/OrderCountKey.java

+package com.freemud.application.sdk.api.ordercenter.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2021/5/18 下午3:32
+ * @description :
+ * ref_date	string	Y	日期，unix时间戳，字段长度为13字节
+ * give_order_amount_sum	float	Y	该日期的下单金额之和
+ * give_order_num_sum	integer	Y	该日期的下单数量之和
+ * payment_amount_sum	float	Y	该日期的支付金额之和
+ * payed_num_sum	integer	Y	该日期的支付数量之和
+ */
+@Data
+@Builder
+public class OrderCountKey {
+
+    // 日期，unix时间戳，字段长度为13字节
+    private Date ref_date;
+
+    // 该日期的下单金额之和GetFilterPartnerResponse
+    private Float give_order_amount_sum;
+
+    // 该日期的下单数量之和
+    private Integer give_order_num_sum;
+
+    // 该日期的支付金额之和
+    private Float payment_amount_sum;
+
+    // 该日期的支付数量之和
+    private Integer payed_num_sum;
+
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/OrderCountResp.java

@@ -24,19 +24,9 @@ public class OrderCountResp {
     // 商户号 用于内存剔除 不需要的商户号统计
     private String partnerId;
 
-    // 日期，unix时间戳，字段长度为13字节
-    private Date ref_date;
+    // 商户号 下面的小程序
+    private String wxAppId;
 
-    // 该日期的下单金额之和
-    private Float give_order_amount_sum;
-
-    // 该日期的下单数量之和
-    private Integer give_order_num_sum;
-
-    // 该日期的支付金额之和
-    private Float payment_amount_sum;
-
-    // 该日期的支付数量之和
-    private Integer payed_num_sum;
+    private OrderCountRespList orderSumRequest;
 
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/OrderCountRespList.java

+package com.freemud.application.sdk.api.ordercenter.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2021/5/18 下午3:27
+ * @description :
+ */
+@Data
+@Builder
+public class OrderCountRespList {
+
+    List<OrderCountKey> orders;
+
+}