麦咖啡推送数据测试

order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

@@ -2514,7 +2514,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
 
     public BaseResponse mcCafePushOrder(McCafeQueryOrderVo queryOrderVo) {
 
-        executor.submit(() -> {
+//        executor.submit(() -> {
             for(int i=1;;i++) {
                 OrderConditionsReq orderConditionsReq = new OrderConditionsReq();
                 orderConditionsReq.setPartnerId(mcCafePartnerId);
@@ -2535,6 +2535,9 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                     try {
                         McCafePushOrderDto mcCafePushOrderDto = convert2McCafePushOrderInfo(orderInfoReqs);
                         System.out.println(JSON.toJSONString(mcCafePushOrderDto));
+                        if(null != mcCafePushOrderDto) {
+                            return ResponseUtil.success(mcCafePushOrderDto);
+                        }
                         McCafePushOrderResponseDto responseDto = mcCafePushOrderClient.mcCafePushOrder(mcCafePushOrderDto);
                         PushMccafeOrder pushMccafeOrder = new PushMccafeOrder();
                         pushMccafeOrder.setOrderCode(orderInfoReqs.getOrderCode());
@@ -2563,7 +2566,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
 
                 }
             }
-        });
+//        });
 
         BaseResponse baseResponse = new BaseResponse();
         baseResponse.setCode("100");
@@ -2591,7 +2594,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         mcCafePushOrderDto.setStoreCode(orderInfoReqs.getStoreId());
         mcCafePushOrderDto.setStoreName(orderInfoReqs.getStoreName());
         mcCafePushOrderDto.setBusinessDate(orderInfoReqs.getCreateTime().substring(0, 10));
-        mcCafePushOrderDto.setTablewareInfo(orderExtInfoDto.getNeedTableware()==1?"01":"02");
+        mcCafePushOrderDto.setTablewareInfo(Integer.valueOf(1).equals(orderExtInfoDto.getNeedTableware())?"01":"02");
         mcCafePushOrderDto.setTotalAmount(orderInfoReqs.getActualPayAmount().intValue());
         mcCafePushOrderDto.setDiscountTotalAmount(orderInfoReqs.getOriginalAmount().subtract(orderInfoReqs.getActualPayAmount()).intValue());
         mcCafePushOrderDto.setRealTotalAmount(orderInfoReqs.getActualPayAmount().intValue());