Merge remote-tracking branch 'origin/master'

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -97,6 +97,7 @@ import java.math.BigDecimal;
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.InvalidKeySpecException;
 import java.text.DecimalFormat;
+import java.time.Instant;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -3235,7 +3236,8 @@ public class OrderAdapter {
         createOrderResponseVo.setWxappId(orderPayResponse.getWxAppid());
         createOrderResponseVo.setFmId(orderPayResponse.getFmId());
         OrderPayResponse.PayOrderBean payOrderBean = orderPayResponse.getPayOrder();
-        createOrderResponseVo.setTimestamp(payOrderBean == null ? "" : payOrderBean.getTimestamp());
+        //  腾讯有数数据上报 时间戳不能为空
+        createOrderResponseVo.setTimestamp(payOrderBean == null ? Instant.now().getEpochSecond()+"" : payOrderBean.getTimestamp());
         createOrderResponseVo.setNonceStr(payOrderBean == null ? "" : payOrderBean.getNonceStr());
         createOrderResponseVo.setPackageX(payOrderBean == null ? "" : payOrderBean.getPackageX());
         createOrderResponseVo.setSignType(payOrderBean == null ? "" : payOrderBean.getSignType());

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

@@ -13,18 +13,15 @@ import com.freemud.application.sdk.api.constant.ResponseResultEnum;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.response.OrderCountResp;
 import com.freemud.application.sdk.api.ordercenter.response.OrderGetPartnerRequest;
+import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.IJobHandler;
-import com.xxl.job.core.handler.annotation.JobHandler;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -60,26 +57,41 @@ public class OrderCountJobHandler extends IJobHandler {
 
         OrderGetPartnerRequest build1 = OrderGetPartnerRequest.builder().type(3).build();
         // 获取需要 上报的商户号
-        BaseResponse<GetFilterPartnerResponse> filterPartner = microOpenplatformClient.getFilterPartner(build1);
-        if (filterPartner == null || filterPartner.getResult() == null) {
-            LogUtil.info("上报商户号没有数据", build1, filterPartner == null ? null : JSON.toJSONString(filterPartner));
-            return ReturnT.SUCCESS;
-        }
-        OrderCountRequestVo orderCountRequestVo = new OrderCountRequestVo();
-        Set<String> partnerFilter = getPartnerFilter(filterPartner.getResult());
-        orderCountRequestVo.setPartnerIds(partnerFilter);
-        // 时间设置 前一天
-        setBeginAndEndTime(orderCountRequestVo);
-        BaseResponse<List<OrderCountResp>> result = orderservice.selectCountOrdersByPartnerIds(orderCountRequestVo, trackingNo);
-        LogUtil.info("orderCountJobHandlersendreportordercountmsg", orderCountRequestVo, result == null ? null : JSON.toJSONString(result));
-        if (!ResponseResultEnum.SUCCESS.getCode().equalsIgnoreCase(result.getCode()) || Objects.isNull(result.getResult())) {
-            return ReturnT.SUCCESS;
+        try {
+            BaseResponse<GetFilterPartnerResponse> filterPartner = microOpenplatformClient.getFilterPartner(build1);
+            LogUtil.info("上报商户号查询结果", build1, filterPartner == null ? null : JSON.toJSONString(filterPartner));
+            if (filterPartner == null
+                    || filterPartner.getResult() == null
+                    || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(filterPartner.getCode())
+                    || filterPartner.getResult().getPartnerFilterVos() == null
+                    || filterPartner.getResult().getPartnerFilterVos().isEmpty()) {
+                return ReturnT.SUCCESS;
+            }
+            OrderCountRequestVo orderCountRequestVo = new OrderCountRequestVo();
+            Set<String> partners = getPartnerFilter(filterPartner.getResult());
+            if (partners.isEmpty()) {
+                return ReturnT.SUCCESS;
+            }
+            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())) {
+                return ReturnT.SUCCESS;
+            }
+            // 每次推送 只能 50条 让生态端处理
+            List<OrderCountResp> orderCounts = result.getResult();
+            SendOrderCountsMsg build = SendOrderCountsMsg.builder().orders(orderCounts).build();
+            BaseResponse baseResponse = microOpenplatformClient.addOrderSum(build);
+            LogUtil.info("orderCountJobHandlersendreportorderend", null, JSON.toJSONString(baseResponse));
+        } catch (Exception e) {
+            LogUtil.error("orderCountJobHandlersendreportorderend", null, JSON.toJSONString(e));
         }
-        // 每次推送 只能 50条 让生态端处理
-        List<OrderCountResp> orderCounts = result.getResult();
-        SendOrderCountsMsg build = SendOrderCountsMsg.builder().orders(orderCounts).build();
-        BaseResponse baseResponse = microOpenplatformClient.addOrderSum(build);
-        LogUtil.info("orderCountJobHandlersendreportorderend", null,  JSON.toJSONString(baseResponse));
         return ReturnT.SUCCESS;
     }
 
@@ -106,8 +118,8 @@ public class OrderCountJobHandler extends IJobHandler {
 
 
     private Set<String> getPartnerFilter(GetFilterPartnerResponse data) {
-        if (data.getPartnerFilterVos().isEmpty()) {
-            return null;
+        if (data.getPartnerFilterVos() == null || data.getPartnerFilterVos().isEmpty()) {
+            return new HashSet<>();
         }
         return data.getPartnerFilterVos().stream().map(PartnerFilterResponse::getPartnerId).collect(Collectors.toSet());
     }