macafe 更新取餐码

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -2352,6 +2352,14 @@ public class OrderSdkAdapter {
 
     }
 
+    public BaseOrderResponse convent2UpdatePickUpGoodNo(BaseResponse baseResponse) {
+        BaseOrderResponse baseOrderResponse = new BaseOrderResponse();
+        baseOrderResponse.setErrcode(baseResponse.getCode() != null ? Integer.parseInt(baseResponse.getCode()) : 500);
+        baseOrderResponse.setErrmsg(baseResponse.getMessage());
+        return baseOrderResponse;
+
+    }
+
     public SdkUpdateAbnormalState convert2SdkUpdateAbnormalState(AssortmentUpdateDeliveryAbnormalRequest request) {
         SdkUpdateAbnormalState result = new SdkUpdateAbnormalState();
         result.setOrderClient(OrderClientType.SAAS.getIndex());

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/OrderCenterSdkService.java

 package com.freemud.sdk.api.assortment.order.service;
 
+import com.freemud.application.sdk.api.ordercenter.request.OrderModifyRelatingCodeReq;
 import com.freemud.application.sdk.api.ordercenter.request.QueryAfterSalesOrderConditionsReq;
 import com.freemud.application.sdk.api.ordercenter.response.AfterSalesListResp;
 import com.freemud.sdk.api.assortment.order.request.order.*;
@@ -311,4 +312,11 @@ public interface OrderCenterSdkService {
      */
     BaseOrderResponse updateDownstreamThirdOrderCode(AssortmentSdkUpdateDownstreamThirdOrderCodeRequest assortmentSdkUpdateDownstreamThirdOrderCodeRequest);
 
+    /**
+     * 修改桌号、取餐码
+     * @param orderModifyRelatingCodeReq
+     * @return
+     */
+    BaseOrderResponse updatePickUpGoodNo(OrderModifyRelatingCodeReq orderModifyRelatingCodeReq, String trackingNo);
+
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -1462,6 +1462,11 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         return orderSdkAdapter.convent2NewOrderUpdateThirdOrderCode(orderSdkService.updateDownstreamThirdOrderCode(updateDownstreamOrderCodeReq, assortmentSdkUpdateDownstreamThirdOrderCodeRequest.getTrackingNo()));
     }
 
+    @Override
+    public BaseOrderResponse updatePickUpGoodNo(OrderModifyRelatingCodeReq orderModifyRelatingCodeReq, String trackingNo) {
+        return orderSdkAdapter.convent2UpdatePickUpGoodNo(orderSdkService.updatePickUpGoodNo(orderModifyRelatingCodeReq, trackingNo));
+    }
+
     private void setTimeout(BaseQueryOrderRequest baseQueryOrderRequest,POSOrderOperationBaseReq request){
         String partnerId = baseQueryOrderRequest.getPartnerId();
         String storeCode = baseQueryOrderRequest.getShopId();

order-application-service/src/main/java/cn/freemud/OrderApplication.java

@@ -48,7 +48,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 @ComponentScan({"cn.freemud", "com.freemud"})
 @MapperScan({"cn.freemud.*.dao","com.freemud.sdk.api.assortment.orderdistributor.mapper","com.freemud.api.assortment.datamanager.manager",
                 "com.freemud.api.assortment.datamanager.queue.dao","com.freemud.api.assortment.datamanager.rbac.dao","com.freemud.api.assortment.datamanager.queue.entity"})
-@EnableFeignClients({"cn.freemud.service.thirdparty","com.freemud.sdk.api.assortment.message"})
+@EnableFeignClients({"cn.freemud.service.thirdparty","com.freemud.sdk.api.assortment.message","cn.freemud.management.thirdparty"})
 @EnableAutoConfiguration
 public class OrderApplication {
     public static void main(String[] args) {

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

@@ -52,10 +52,7 @@ import cn.freemud.service.CouponActivityService;
 import cn.freemud.service.OrderAdapterService;
 import cn.freemud.service.Orderservice;
 import cn.freemud.service.thirdparty.*;
-import cn.freemud.utils.BeanUtil;
-import cn.freemud.utils.LogUtil;
-import cn.freemud.utils.ResponseUtil;
-import cn.freemud.utils.ValidationCode;
+import cn.freemud.utils.*;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -134,7 +131,7 @@ import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.time.DateUtils;
+import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -145,6 +142,7 @@ import tk.mybatis.mapper.util.StringUtil;
 
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -1086,10 +1084,11 @@ public class OrderServiceImpl implements Orderservice {
         }
         QueryOrderResponseVo queryOrderResponseVo = queryOrderResponseVos.get(0);
 
-        /*if (queryOrderResponseVo.getTakeMealType() == 1) {
-            //麦咖啡预单重新封装取餐时间
-            queryOrderResponseVo.setTakeMealTime();
-        }*/
+        //麦咖啡 预约外卖单重新封装取餐时间
+        if (OrderType.TAKE_OUT.getCode().equals(queryOrderResponseVo.getOrderType()) && queryOrderResponseVo.getTakeMealType() == 1 &&  StringUtils.isNotEmpty(queryOrderResponseVo.getReserveDeliveryTime())) {
+            Date reserveDeliveryTime = DateUtil.convert2Date(queryOrderResponseVo.getReserveDeliveryTime(), "yyyy-MM-dd HH:mm:ss");
+            queryOrderResponseVo.setReserveDeliveryTime(formatSpecialDate(reserveDeliveryTime));
+        }
 
         //48小时自动退款描述
         if (storeInfo != null && storeInfo.getBizVO() != null && storeInfo.getBizVO().getStoreConfig()!= null
@@ -1105,6 +1104,26 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.success(queryOrderResponseVo);
     }
 
+    public static String formatSpecialDate(Date date) {
+        if (date == null ){
+            return null;
+        }
+        System.out.println(new DateTime(date).toString("yyyy-MM-dd HH:mm"));
+        DateTime now = new DateTime();
+        DateTime today_start = new DateTime(now.getYear(), now.getMonthOfYear(), now.getDayOfMonth(), 0, 0, 0);
+        DateTime today_end = today_start.plusDays(1);
+        System.out.println(new DateTime(today_end).toString("yyyy-MM-dd HH:mm"));
+        DateTime tomorrow_start = today_start.plusDays(2);
+        System.out.println(new DateTime(tomorrow_start).toString("yyyy-MM-dd HH:mm"));
+
+        if(date.after(today_start.toDate()) && date.before(today_end.toDate())) {
+            return String.format("%s", new DateTime(date).toString("HH:mm"));
+        } else if(date.after(today_end.toDate()) && date.before(tomorrow_start.toDate())) {
+            return String.format("明天%s%s", DateUtils.getDayWeek(date), new DateTime(date).toString("HH:mm"));
+        }
+        return new DateTime(date).toString("yyyy-MM-dd") + DateUtils.getDayWeek(date) + new DateTime(date).toString("HH:mm") ;
+    }
+
     /**
      * 如果有第三方配送，返回值添加第三方配送信息
      */

order-application-service/src/main/java/cn/freemud/utils/DateUtils.java

@@ -10,11 +10,11 @@ public class DateUtils {
      * @param date
      * @return
      */
-    public String getDayWeek(Date date){
+    public static String getDayWeek(Date date){
         if (date == null ){
             return null;
         }
-        String[] week={"周一","周二","周三","周四","周五","周六","周日"};
+        String[] week={"(周一)","(周二)","(周三)","(周四)","(周五)","(周六)","(周日)"};
         Calendar calendar =Calendar.getInstance();
         calendar.setTime(date);
         int w = calendar.get(Calendar.DAY_OF_WEEK) -1 ;

order-management/src/main/java/cn/freemud/management/controller/OrderManagerController.java

 package cn.freemud.management.controller;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.management.entities.dto.request.order.McCafeOrderManagerRequest;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.enums.McCafeOperateType;
 import cn.freemud.management.enums.OperateType;
@@ -68,7 +69,7 @@ public class OrderManagerController {
     @ApiAnnotation(logMessage = "麦咖啡订单入机")
     @ApiOperation(value = "麦咖啡订单入机", notes = "麦咖啡订单入机", produces = "application/json")
     @PostMapping("/mcCafe/statusOperate")
-    public BaseResponse mcCafeDeliveryCreate(@Validated @LogParams @RequestBody OrderManagerRequest request) {
+    public BaseResponse mcCafeDeliveryCreate(@Validated @LogParams @RequestBody McCafeOrderManagerRequest request) {
         McCafeOperateType byOpType = McCafeOperateType.getByOpType(request.getOperateType());
         if (byOpType==null){
             return ResponseUtil.error(ResponseResult.ORDER_OPERATE_TYPE_NOT_VALIDATE);

order-management/src/main/java/cn/freemud/management/entities/dto/request/order/McCafeOrderManagerRequest.java

+package cn.freemud.management.entities.dto.request.order;
+
+import cn.freemud.management.enums.OperateType;
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.Size;
+
+@Data
+public class McCafeOrderManagerRequest {
+
+    /**
+     * 商户号
+     */
+    @NotEmpty(message = "商户号不允许为null")
+    private String partnerId;
+
+    /**
+     * 门店号
+     */
+    private String storeId;
+
+    /**
+     * 取餐码
+     */
+    private String pickUpGoodsNo;
+
+    /**
+     * 订单号
+     */
+    @NotEmpty(message = "订单号不允许为nul")
+    private String orderId;
+
+    /**
+     * 订单操作类型
+     * @see OperateType
+     */
+    @NotEmpty(message = "操作类型不能为空")
+    private String operateType;
+
+    /**
+     * 操作人
+     * pos
+     * 开放平台
+     * 小助手
+     * 系统自动履单
+     */
+    @NotEmpty(message = "操作人不能为空")
+    private String operator;
+}

order-management/src/main/java/cn/freemud/management/service/OrderManagerService.java

 package cn.freemud.management.service;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.management.entities.dto.request.order.McCafeOrderManagerRequest;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
@@ -24,7 +25,7 @@ public interface OrderManagerService {
      * @param orderBean 订单实体
      * @return
      */
-    BaseResponse mcCafeOrderConfirm(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean);
+    BaseResponse mcCafeOrderConfirm(McCafeOrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean);
 
     /**
      * 制作完成
@@ -64,7 +65,7 @@ public interface OrderManagerService {
      * @param orderBean
      * @return
      */
-    BaseResponse mcCafeOrderReject(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean);
+    BaseResponse mcCafeOrderReject(McCafeOrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean);
 
     /**
      * 同意退款

order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java

 package cn.freemud.management.service.adapter;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.management.entities.dto.request.order.McCafeOrderManagerRequest;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.enums.OperateType;
@@ -202,7 +203,7 @@ public class OrderManagerAdapter {
      * @param request
      * @return
      */
-    public BaseResponse mcCafeOrderSuccess(OrderManagerRequest request) {
+    public BaseResponse mcCafeOrderSuccess(McCafeOrderManagerRequest request) {
         //查询订单
         QueryOrdersResponse.DataBean.OrderBean orderBean = orderBaseService.getByOrderCode(request.getOrderId());
         //订单接单参数校验
@@ -210,9 +211,8 @@ public class OrderManagerAdapter {
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
             return verifyResponse;
         }
-        BaseResponse orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).mcCafeOrderConfirm(request, orderBean);
 
-        return orderManagerResponse;
+        return orderBeanFactory.getOrderManagerService(orderBean).mcCafeOrderConfirm(request, orderBean);
     }
 
 
@@ -221,7 +221,7 @@ public class OrderManagerAdapter {
      * @param request
      * @return
      */
-    public BaseResponse mcCafeOrderRefund(OrderManagerRequest request) {
+    public BaseResponse mcCafeOrderRefund(McCafeOrderManagerRequest request) {
         //查询订单
         QueryOrdersResponse.DataBean.OrderBean orderBean = orderBaseService.getByOrderCode(request.getOrderId());
         //订单接单参数校验
@@ -229,7 +229,6 @@ public class OrderManagerAdapter {
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
             return verifyResponse;
         }
-        BaseResponse orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).mcCafeOrderReject(request, orderBean);
-        return orderManagerResponse;
+        return orderBeanFactory.getOrderManagerService(orderBean).mcCafeOrderReject(request, orderBean);
     }
 }

order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java

 package cn.freemud.management.service.handle;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.management.entities.dto.request.order.McCafeOrderManagerRequest;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
 import cn.freemud.management.enums.ResponseResult;
@@ -60,6 +61,17 @@ public class SaasOrderHandle {
     }
 
     /**
+     * 更新取餐码
+     * @param request
+     * @param orderBean
+     * @return
+     */
+    public BaseResponse updatePickUpGoodNo(McCafeOrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
+        //todo 更新取餐码
+        return ResponseUtil.success();
+    }
+
+    /**
      * 订单制作完成
      *
      * @param request

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

@@ -3,6 +3,7 @@ package cn.freemud.management.service.impl;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.management.adapter.McCafeCouponAdapter;
 import cn.freemud.management.entities.dto.request.coupon.MCCafeCouponLockRequest;
+import cn.freemud.management.entities.dto.request.order.McCafeOrderManagerRequest;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
@@ -21,6 +22,8 @@ import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.freemud.sdk.api.assortment.message.enums.OrderType;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -90,13 +93,22 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
      * @return
      */
     @Override
-    public BaseResponse mcCafeOrderConfirm(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
+    public BaseResponse mcCafeOrderConfirm(McCafeOrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
+        OrderManagerRequest orderManagerRequest =new OrderManagerRequest();
+        BeanUtils.copyProperties(request,orderManagerRequest);
         // 订单接单
-        saasOrderHandle.orderConfirm(request, orderBean);
+        saasOrderHandle.orderConfirm(orderManagerRequest, orderBean);
+
         //支付成功已经 创建配送单
         if (!Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
+            if (StringUtils.isNotEmpty(request.getPickUpGoodsNo())){
+                //更新取餐码
+                saasOrderHandle.updatePickUpGoodNo(request,orderBean);
+            }
+
             // 异步核销券码
             couponHandle.asyncVerificationCoupon(orderBean);
+
         }
         return ResponseUtil.success();
     }
@@ -185,7 +197,9 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
      * @return
      */
     @Override
-    public BaseResponse mcCafeOrderReject(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
+    public BaseResponse mcCafeOrderReject(McCafeOrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
+        OrderManagerRequest orderManagerRequest =new OrderManagerRequest();
+        BeanUtils.copyProperties(request,orderManagerRequest);
         //根据是否是外卖单来判断
         if (Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
             // 订单接单
@@ -197,11 +211,11 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
 
         }else {
             //支付退款
-            PayRefundResponse refundResponse = paymentHandle.refund(request, orderBean);
+            PayRefundResponse refundResponse = paymentHandle.refund(orderManagerRequest, orderBean);
             //订单拒单
-            saasOrderHandle.orderReject(request, refundResponse, orderBean);
+            saasOrderHandle.orderReject(orderManagerRequest, refundResponse, orderBean);
             //冲正库存
-            stockHandle.revert(request, orderBean);
+            stockHandle.revert(orderManagerRequest, orderBean);
             // 券码解冻
             couponHandle.unlock(orderBean);
         }

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

@@ -3,6 +3,7 @@ package cn.freemud.management.service.impl;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.log.LogTreadLocal;
 import cn.freemud.management.adapter.WaimaiSdkAdapter;
+import cn.freemud.management.entities.dto.request.order.McCafeOrderManagerRequest;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.enums.ResponseResult;
@@ -56,7 +57,7 @@ public class WaimaiOrderMangerServiceImpl implements OrderManagerService {
     }
 
     @Override
-    public BaseResponse mcCafeOrderConfirm(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
+    public BaseResponse mcCafeOrderConfirm(McCafeOrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         return null;
     }
 
@@ -124,7 +125,7 @@ public class WaimaiOrderMangerServiceImpl implements OrderManagerService {
     }
 
     @Override
-    public BaseResponse mcCafeOrderReject(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
+    public BaseResponse mcCafeOrderReject(McCafeOrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         return null;
     }
 

order-management/src/main/java/cn/freemud/management/thirdparty/DeliveryMCCafeClient.java

@@ -6,11 +6,11 @@ import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@FeignClient(name = "Delivery_maCafe",url="XXXX")
+@FeignClient(name = "DeliveryMaCafe",url="http://coupon-api-gateway-koderover-dev-coupon.api-ingress.sandload.cn")
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface DeliveryMCCafeClient {
 
-    // 核销优惠券
+    // 配送停单
     @PostMapping("/delivery/halted")
     DeliveryResponseDto halted(DeliveryOrderHaltedRequest deliveryOrderHaltedRequest);
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java

@@ -207,5 +207,10 @@ public class InterfaceAddressConstant {
      */
     public static final String PARKING_V2_CANCEL = "/parking/v2/cancel";
 
+    /**
+     * 修改桌号、取餐码
+     */
+    public static final String UPDATE_PICKUP_GOODNO = "/order/v2/updatePickUpGoodNo";
+
 
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderModifyRelatingCodeReq.java

+/*
+ * Copyright (c) 2018  www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+
+package com.freemud.application.sdk.api.ordercenter.request;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author qi.xu  2018/09/05 10:30
+ */
+@Getter
+@Setter
+@ToString
+public class OrderModifyRelatingCodeReq {
+
+    /**
+     * 商户号
+     */
+    private String partnerId;
+
+    /**
+     *  操作人
+     */
+    private String operator;
+
+    /**
+     *订单编号
+     */
+    private String orderCode;
+
+    /**
+     * 取货号 取餐号
+     */
+    private String pickUpGoodsNo;
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -793,4 +793,17 @@ public class OrderSdkService {
         return responseHandle(responseDTO);
     }
 
+    /**
+     * 修改桌号、取餐码
+     * @param request
+     * @param trackingNo
+     * @return
+     */
+    public BaseResponse updatePickUpGoodNo(OrderModifyRelatingCodeReq request, String trackingNo) {
+        OrderBaseResp responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, UPDATE_PICKUP_GOODNO,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp>() {
+                });
+        return responseHandle(responseDTO);
+    }
+
 }