预约单

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

@@ -2549,36 +2549,32 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 if(CollectionUtils.isEmpty(response.getResult())) {
                     break;
                 }
-
+                RestTemplate client = new RestTemplate();
                 for(OrderInfoReqs orderInfoReqs : response.getResult()) {
                     try {
-                        if(StringUtils.isBlank(orderInfoReqs.getReceiveTime())) {
-                            orderInfoReqs.setReceiveTime(DateUtil.addHours(new Date(Long.valueOf(orderInfoReqs.getCreateTime())), 1).getTime()+"");
-                        }
                         McCafePushOrderDto mcCafePushOrderDto = convert2McCafePushOrderInfo(orderInfoReqs);
                         AppLogUtil.infoLog("订单推送入参: "+JSON.toJSONString(mcCafePushOrderDto),null,null);
 
-//                        String timestamp = System.currentTimeMillis()+"";
-//                        String sign = getMcdOpenApiSign(mccafePushOrderAppId,JSON.toJSONString(mcCafePushOrderDto),mccafePushOrderMerchantId,timestamp,mccafePushOrderKey);
-//
-//                        RestTemplate client = new RestTemplate();
-//                        HttpHeaders headers = new HttpHeaders();
-//                        headers.setContentType(MediaType.APPLICATION_JSON);
-//                        headers.set("Provider", "WX");
-//                        headers.set("Version", "1.0");
-//                        headers.set("AppId", mccafePushOrderAppId);
-//                        headers.set("MerchantId", mccafePushOrderMerchantId);
-//                        headers.set("Timestamp", timestamp);
-//                        headers.set("Sign", sign);
-//                        headers.add("Accept", MediaType.APPLICATION_JSON_VALUE);
-//                        Gson gson = new Gson();
-//                        String json = gson.toJson(mcCafePushOrderDto);
-//                        HttpEntity<String> requestEntity = new HttpEntity<>(json, headers);
-//                        ResponseEntity<String> responseEntity = client.exchange(mccafePushOrderUrl+"/mp/order", HttpMethod.POST, requestEntity, String.class);
-//
-//                        McCafePushOrderResponseDto responseDto = JSON.parseObject(responseEntity.getBody(), McCafePushOrderResponseDto.class);
-
-                        McCafePushOrderResponseDto responseDto = mcCafePushOrderClient.mcCafePushOrder(mcCafePushOrderDto);
+                        String timestamp = System.currentTimeMillis()+"";
+                        String sign = getMcdOpenApiSign(mccafePushOrderAppId,JSON.toJSONString(mcCafePushOrderDto),mccafePushOrderMerchantId,timestamp,mccafePushOrderKey);
+
+                        HttpHeaders headers = new HttpHeaders();
+                        headers.setContentType(MediaType.APPLICATION_JSON);
+                        headers.set("Provider", "WX");
+                        headers.set("Version", "1.0");
+                        headers.set("AppId", mccafePushOrderAppId);
+                        headers.set("MerchantId", mccafePushOrderMerchantId);
+                        headers.set("Timestamp", timestamp);
+                        headers.set("Sign", sign);
+                        headers.add("Accept", MediaType.APPLICATION_JSON_VALUE);
+                        Gson gson = new Gson();
+                        String json = gson.toJson(mcCafePushOrderDto);
+                        HttpEntity<String> requestEntity = new HttpEntity<>(json, headers);
+                        ResponseEntity<String> responseEntity = client.exchange(mccafePushOrderGatewayUrl+"/mp/order", HttpMethod.POST, requestEntity, String.class);
+
+                        McCafePushOrderResponseDto responseDto = JSON.parseObject(responseEntity.getBody(), McCafePushOrderResponseDto.class);
+
+//                        McCafePushOrderResponseDto responseDto = mcCafePushOrderClient.mcCafePushOrder(mcCafePushOrderDto);
                         PushMccafeOrder pushMccafeOrder = new PushMccafeOrder();
                         pushMccafeOrder.setOrderCode(orderInfoReqs.getOrderCode());
                         pushMccafeOrder.setPartnerId(orderInfoReqs.getPartnerId());
@@ -2626,6 +2622,12 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
     }
 
     private McCafePushOrderDto convert2McCafePushOrderInfo(OrderInfoReqs orderInfoReqs) {
+        if(StringUtils.isBlank(orderInfoReqs.getReceiveTime())) {
+            orderInfoReqs.setReceiveTime(DateUtil.addHours(new Date(Long.valueOf(orderInfoReqs.getCreateTime())), 1).getTime()+"");
+        }
+        if(StringUtils.isBlank(orderInfoReqs.getAcceptTime())) {
+            orderInfoReqs.setAcceptTime(orderInfoReqs.getCreateTime());
+        }
         OrderExtInfoDto orderExtInfoDto = JSON.parseObject(orderInfoReqs.getExtInfo(), OrderExtInfoDto.class);
         McCafePushOrderDto mcCafePushOrderDto = new McCafePushOrderDto();
         mcCafePushOrderDto.setMpOrderId(orderInfoReqs.getOrderCode());
@@ -2678,7 +2680,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 mcCafePushOrderDto.setCancellationRemark(afterSalesOrderRespOptional.get().getReqRemark());
             }
         }
-        mcCafePushOrderDto.setAcceptTime(StringUtils.isNotBlank(orderInfoReqs.getAcceptTime())?DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getAcceptTime())), "yyyy-MM-dd HH:mm:ss.SSS"):"");
+        mcCafePushOrderDto.setAcceptTime(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getAcceptTime())), "yyyy-MM-dd HH:mm:ss.SSS"));
         mcCafePushOrderDto.setPickupCode(orderInfoReqs.getPickUpGoodsNo());
         mcCafePushOrderDto.setOpenId(orderExtInfoDto.getOpenid());
         GetMemberInfoByIdRequestDto getMemberInfoByIdRequestDto = new GetMemberInfoByIdRequestDto();