Merge remote-tracking branch 'origin/feature-2020/8/6-McCafe-会阳' into feature-2020/8/6-McCafe-会阳

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

@@ -1285,7 +1285,7 @@ public class OrderServiceImpl implements Orderservice {
         QueryOrderResponseVo queryOrderResponseVo = queryOrderResponseVos.get(0);
 
         //麦咖啡 预约外卖单重新封装取餐时间
-        if (OrderType.TAKE_OUT.getCode().equals(queryOrderResponseVo.getOrderType()) && queryOrderResponseVo.getTakeMealType() == 1 &&  StringUtils.isNotEmpty(queryOrderResponseVo.getReserveDeliveryTime())) {
+        if (OrderType.TAKE_OUT.getCode().equals(queryOrderResponseVo.getOrderType()) && StringUtils.isNotEmpty(queryOrderResponseVo.getReserveDeliveryTime())) {
             Date reserveDeliveryTime = DateUtil.convert2Date(queryOrderResponseVo.getReserveDeliveryTime(), "yyyy-MM-dd HH:mm:ss");
             queryOrderResponseVo.setReserveDeliveryTime(formatSpecialDate(reserveDeliveryTime));
         }
@@ -2846,34 +2846,12 @@ public class OrderServiceImpl implements Orderservice {
         if (userLoginInfoDto == null || StringUtils.isBlank(userLoginInfoDto.getMemberId())) {
             return ResponseUtil.error(ResponseResult.NOT_LOGIN);
         }
-       /* BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
-        baseQueryOrderRequest.setOrderId(vo.getOid());
-        baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
-        QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
-        if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode()) || response.getData() == null) {
-            return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
-        }
-        QueryOrdersResponse.DataBean.OrderBean orderBean = response.getData();
-        //判断订单状态
-        if (!cn.freemud.management.enums.OrderStatus.DISTRIBUTION.getCode().equals(orderBean.getStatus())) {
-            return ResponseUtil.error(ResponseResult.DELIVERY_QUERY_RIDER_STATUS_ERROR);
-        }*/
         QueryLocusRiderTrackDto dto =new QueryLocusRiderTrackDto();
         dto.setDeliveryChannel("CanDao");
         dto.setOrderId(vo.getOid());
         BaseResponse<ResRiderTrackDto> responses = deliveryFeiginClient.listFreeRider(dto);
         if(responses == null || RESPONSE_SUCCESS_CODE != Integer.valueOf(responses.getCode()) || responses.getResult() ==null ) {
-            ResRiderTrackDto trackDto =new ResRiderTrackDto();
-            trackDto.setReceiverDistance(1832.0);
-            trackDto.setReceiverLat("23.401341");
-            trackDto.setReceiverLng("116.733883");
-            trackDto.setRiderLat("23.385071");
-            trackDto.setRiderLng("116.731188");
-            trackDto.setStoreDistance(3.0);
-            trackDto.setStoreLat("23.385068");
-            trackDto.setStoreLng("116.731158");
-            return ResponseUtil.success(trackDto);
-            //return ResponseUtil.error(ResponseResult.DELIVERY_QUERY_RIDER_ERROR);
+            return ResponseUtil.error(ResponseResult.DELIVERY_QUERY_RIDER_ERROR);
         }
         return ResponseUtil.success(responses.getResult());
     }

order-management/src/main/java/cn/freemud/management/service/impl/McCafeMangerServiceImpl.java

@@ -58,29 +58,27 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
         saasOrderHandle.orderConfirm(orderManagerRequest, orderBean);
 
         //支付成功已经 创建配送单
-        if (!Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
-            if (StringUtils.isNotEmpty(request.getPickUpGoodsNo())){
-                //更新取餐码
-                BaseResponse baseResponse = saasOrderHandle.updatePickUpGoodNo(request, orderBean);
-                if (!ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode())){
-                    return ResponseUtil.error(ResponseResult.ORDER_UPDATE_PICKUP_FAILED);
-                }
+        if (StringUtils.isNotEmpty(request.getPickUpGoodsNo())){
+            //更新取餐码
+            BaseResponse baseResponse = saasOrderHandle.updatePickUpGoodNo(request, orderBean);
+            if (!ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode())){
+                return ResponseUtil.error(ResponseResult.ORDER_UPDATE_PICKUP_FAILED);
+            }
 
-                SimpleDateFormat dateFormat =new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-                DeliveryOrderAssemblyackRequest assemblyAckRequest =new DeliveryOrderAssemblyackRequest();
-                assemblyAckRequest.setOrderKey(request.getOrderId());
-                assemblyAckRequest.setDisplayOrderNumber(request.getPickUpGoodsNo());
-                assemblyAckRequest.setAssemblyTimeUTC(dateFormat.format(new Date()));
-                assemblyAckRequest.setStoreId(orderBean.getShopId());
-                //入机成功通知配送
-                DeliveryResponseDto deliveryResponse = deliveryMCCafeClient.assemblyAck(assemblyAckRequest);
-                if (deliveryResponse == null || !StringUtils.equals(ResponseResult.SUCCESS.getCode(), deliveryResponse.getCode()+"")) {
-                    return ResponseUtil.error(ResponseResult.DELIVERY_ASSEMBLY_ACK_ERROR);
-                }
+            SimpleDateFormat dateFormat =new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+            DeliveryOrderAssemblyackRequest assemblyAckRequest =new DeliveryOrderAssemblyackRequest();
+            assemblyAckRequest.setOrderKey(request.getOrderId());
+            assemblyAckRequest.setDisplayOrderNumber(request.getPickUpGoodsNo());
+            assemblyAckRequest.setAssemblyTimeUTC(dateFormat.format(new Date()));
+            assemblyAckRequest.setStoreId(orderBean.getShopId());
+            //入机成功通知配送
+            DeliveryResponseDto deliveryResponse = deliveryMCCafeClient.assemblyAck(assemblyAckRequest);
+            if (deliveryResponse == null || !StringUtils.equals(ResponseResult.SUCCESS.getCode(), deliveryResponse.getCode()+"")) {
+                return ResponseUtil.error(ResponseResult.DELIVERY_ASSEMBLY_ACK_ERROR);
             }
-            // 异步核销券码
-            couponHandle.asyncVerificationCoupon(orderBean);
         }
+        // 异步核销券码
+        couponHandle.asyncVerificationCoupon(orderBean);
         return ResponseUtil.success();
     }