Commit 6dab277d by huiyang.chen

fix 外卖单才同步配送取餐码

parent 55738b82
......@@ -72,18 +72,20 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
return ResponseUtil.error(ResponseResult.ORDER_UPDATE_PICKUP_FAILED);
}
SimpleDateFormat dateFormat =new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
DeliveryOrderAssemblyackRequest assemblyAckRequest =new DeliveryOrderAssemblyackRequest();
if (Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
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(DateUtil.addHours(new Date(), -8)));
assemblyAckRequest.setStoreId(orderBean.getShopId());
//入机成功通知配送
DeliveryResponseDto deliveryResponse = deliveryMCCafeClient.assemblyAck(assemblyAckRequest);
if (deliveryResponse == null || !StringUtils.equals(ResponseResult.SUCCESS.getCode(), deliveryResponse.getCode()+"")) {
if (deliveryResponse == null || !StringUtils.equals(ResponseResult.SUCCESS.getCode(), deliveryResponse.getCode() + "")) {
return ResponseUtil.error(ResponseResult.DELIVERY_ASSEMBLY_ACK_ERROR);
}
}
}
if (!Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
// 异步核销券码
couponHandle.asyncVerificationCoupon(orderBean);
......
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