Commit d536e60d by 徐康

麦咖啡推送数据

parent 07724381
...@@ -2516,7 +2516,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2516,7 +2516,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
public BaseResponse mcCafePushOrder(McCafeQueryOrderVo queryOrderVo) { public BaseResponse mcCafePushOrder(McCafeQueryOrderVo queryOrderVo) {
// executor.submit(() -> { executor.submit(() -> {
for(int i=1;;i++) { for(int i=1;;i++) {
OrderConditionsReq orderConditionsReq = new OrderConditionsReq(); OrderConditionsReq orderConditionsReq = new OrderConditionsReq();
orderConditionsReq.setPartnerId(mcCafePartnerId); orderConditionsReq.setPartnerId(mcCafePartnerId);
...@@ -2540,10 +2540,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2540,10 +2540,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
orderInfoReqs.setReceiveTime(new Date().getTime()+""); orderInfoReqs.setReceiveTime(new Date().getTime()+"");
} }
McCafePushOrderDto mcCafePushOrderDto = convert2McCafePushOrderInfo(orderInfoReqs); McCafePushOrderDto mcCafePushOrderDto = convert2McCafePushOrderInfo(orderInfoReqs);
System.out.println(JSON.toJSONString(mcCafePushOrderDto)); AppLogUtil.infoLog("订单推送入参: "+JSON.toJSONString(mcCafePushOrderDto),null,null);
if(null != mcCafePushOrderDto) {
return ResponseUtil.success(mcCafePushOrderDto);
}
McCafePushOrderResponseDto responseDto = mcCafePushOrderClient.mcCafePushOrder(mcCafePushOrderDto); McCafePushOrderResponseDto responseDto = mcCafePushOrderClient.mcCafePushOrder(mcCafePushOrderDto);
PushMccafeOrder pushMccafeOrder = new PushMccafeOrder(); PushMccafeOrder pushMccafeOrder = new PushMccafeOrder();
pushMccafeOrder.setOrderCode(orderInfoReqs.getOrderCode()); pushMccafeOrder.setOrderCode(orderInfoReqs.getOrderCode());
...@@ -2583,7 +2580,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2583,7 +2580,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
} }
} }
// }); });
BaseResponse baseResponse = new BaseResponse(); BaseResponse baseResponse = new BaseResponse();
baseResponse.setCode("100"); baseResponse.setCode("100");
......
...@@ -3,17 +3,19 @@ package cn.freemud.service.thirdparty; ...@@ -3,17 +3,19 @@ package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign; import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.entities.dto.order.McCafePushOrderDto; import cn.freemud.entities.dto.order.McCafePushOrderDto;
import cn.freemud.entities.dto.McCafePushOrderResponseDto; import cn.freemud.entities.dto.McCafePushOrderResponseDto;
import feign.Headers;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@FeignClient(name = "MCD-PUSH-SERVICE", url = "http://") @FeignClient(name = "MCD-PUSH-SERVICE", url = "http://oms.uat.mcd.com.cn/order/migration")
@RequestMapping(produces = {"application/json;charset=UTF-8"}) @RequestMapping(produces = {"application/json;charset=UTF-8"})
public interface McCafePushOrderClient { public interface McCafePushOrderClient {
@LogIgnoreFeign(logMessage="mcCafePushOrder") @LogIgnoreFeign(logMessage="mcCafePushOrder")
@PostMapping("/mp/order") @PostMapping(value="/mp/order",headers={"ContentType=application/json","Provider=WX"})
@Headers(value={"ContentType=application/json","Provider=WX"})
McCafePushOrderResponseDto mcCafePushOrder(@RequestBody McCafePushOrderDto mcCafePushOrderDto); McCafePushOrderResponseDto mcCafePushOrder(@RequestBody McCafePushOrderDto mcCafePushOrderDto);
} }
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