Commit 2a3170bd by 周晓航

上报数据日志添加

parent 0e860b5d
...@@ -26,6 +26,9 @@ import cn.freemud.service.impl.MallOrderServiceImpl; ...@@ -26,6 +26,9 @@ import cn.freemud.service.impl.MallOrderServiceImpl;
import cn.freemud.utils.ResponseUtil; import cn.freemud.utils.ResponseUtil;
import com.freemud.application.sdk.api.log.ApiAnnotation; import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams; import com.freemud.application.sdk.api.log.LogParams;
import com.freemud.application.sdk.api.ordercenter.request.OrderCountReqs;
import com.freemud.application.sdk.api.ordercenter.response.OrderCountResp;
import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -33,6 +36,8 @@ import org.springframework.validation.BindingResult; ...@@ -33,6 +36,8 @@ import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List;
@Slf4j @Slf4j
@RequestMapping("/order") @RequestMapping("/order")
@RestController @RestController
...@@ -418,4 +423,14 @@ public class OrderController { ...@@ -418,4 +423,14 @@ public class OrderController {
public BaseResponse scoreRecord(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo) { public BaseResponse scoreRecord(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo) {
return orderservice.scoreRecord(queryOrderVo); return orderservice.scoreRecord(queryOrderVo);
} }
@Autowired
OrderSdkService orderSdkService;
@PostMapping("/test")
public BaseResponse test(@RequestBody OrderCountReqs orderCountReqs) {
com.freemud.application.sdk.api.ordercenter.response.BaseResponse<List<OrderCountResp>> listBaseResponse = orderSdkService.countOrdersByPartnerIds(orderCountReqs, null);
System.out.println(listBaseResponse);
return null;
}
} }
...@@ -6,6 +6,7 @@ import cn.freemud.entities.dto.delivery.PartnerFilterResponse; ...@@ -6,6 +6,7 @@ import cn.freemud.entities.dto.delivery.PartnerFilterResponse;
import cn.freemud.entities.vo.OrderCountRequestVo; import cn.freemud.entities.vo.OrderCountRequestVo;
import cn.freemud.service.Orderservice; import cn.freemud.service.Orderservice;
import cn.freemud.service.thirdparty.MicroOpenplatformClient; import cn.freemud.service.thirdparty.MicroOpenplatformClient;
import cn.freemud.utils.LogUtil;
import com.freemud.application.sdk.api.constant.ResponseResultEnum; import com.freemud.application.sdk.api.constant.ResponseResultEnum;
import com.freemud.application.sdk.api.log.LogThreadLocal; import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.request.OrderCountReqs; import com.freemud.application.sdk.api.ordercenter.request.OrderCountReqs;
...@@ -59,7 +60,7 @@ public class OrderCountJobHandler extends IJobHandler { ...@@ -59,7 +60,7 @@ public class OrderCountJobHandler extends IJobHandler {
// 获取需要 上报的商户号 // 获取需要 上报的商户号
BaseResponse<GetFilterPartnerResponse> filterPartner = microOpenplatformClient.getFilterPartner(OrderGetPartnerRequest.builder().type(2).build()); BaseResponse<GetFilterPartnerResponse> filterPartner = microOpenplatformClient.getFilterPartner(OrderGetPartnerRequest.builder().type(2).build());
log.info("orderCountJobHandler getFilterPartner filterPartner: {} , trackingNo:{}", filterPartner.toString(), trackingNo); LogUtil.info("orderCountJobHandler getFilterPartner", null, filterPartner);
if (filterPartner == null || filterPartner.getResult() == null) { if (filterPartner == null || filterPartner.getResult() == null) {
return ReturnT.SUCCESS; return ReturnT.SUCCESS;
} }
...@@ -69,16 +70,14 @@ public class OrderCountJobHandler extends IJobHandler { ...@@ -69,16 +70,14 @@ public class OrderCountJobHandler extends IJobHandler {
// 时间设置 前一天 // 时间设置 前一天
setBeginAndEndTime(orderCountRequestVo); setBeginAndEndTime(orderCountRequestVo);
BaseResponse<List<OrderCountResp>> result = orderservice.selectCountOrdersByPartnerIds(orderCountRequestVo, trackingNo); BaseResponse<List<OrderCountResp>> result = orderservice.selectCountOrdersByPartnerIds(orderCountRequestVo, trackingNo);
log.info("orderCountJobHandler send report order count msg request:{} response:{} , trackingNo:{} ", orderCountRequestVo.toString(), result.toString(), trackingNo); LogUtil.info("orderCountJobHandler send report order count msg ", orderCountRequestVo, result);
if (!ResponseResultEnum.SUCCESS.getCode().equalsIgnoreCase(result.getCode()) || Objects.isNull(result.getResult())) { if (!ResponseResultEnum.SUCCESS.getCode().equalsIgnoreCase(result.getCode()) || Objects.isNull(result.getResult())) {
return ReturnT.SUCCESS; return ReturnT.SUCCESS;
} }
// 每次推送 只能 50条 让生态端处理 // 每次推送 只能 50条 让生态端处理
List<OrderCountResp> orderCounts = result.getResult(); List<OrderCountResp> orderCounts = result.getResult();
BaseResponse baseResponse = microOpenplatformClient.addOrderSum(orderCounts); BaseResponse baseResponse = microOpenplatformClient.addOrderSum(orderCounts);
log.info("orderCountJobHandler send report order end result :{} , trackingNo:{}", baseResponse.toString(), trackingNo); LogUtil.info("orderCountJobHandler send report order end ", null, baseResponse);
log.info("end xxl-job by send report msg -------- trackingNo:{}", trackingNo); log.info("end xxl-job by send report msg -------- trackingNo:{}", trackingNo);
return ReturnT.SUCCESS; return ReturnT.SUCCESS;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment