Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg'

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.0.17-RELEASE</version>
+    <version>2.0.22-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

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

@@ -371,7 +371,11 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setCompleteOrderCode(confirmOrderRequest.getCompleteOrderCode());
         request.setOrderCode(confirmOrderRequest.getOrderId());
         // 引入门店基础服务 查询自动制作完成配置时间，预约单单独超时任务设置
-        request.setTimeout(getMCCafePaySuccessTimeout(confirmOrderRequest,request));
+        if(confirmOrderRequest.getTimeout() == null || confirmOrderRequest.getTimeout() == 0) {
+            request.setTimeout(getMCCafePaySuccessTimeout(confirmOrderRequest,request));
+        } else {
+            request.setTimeout(confirmOrderRequest.getTimeout());
+        }
 
         if (!org.springframework.util.CollectionUtils.isEmpty(confirmOrderRequest.getOrderSettlements())) {
             List<OrderSettlementCreateReq> orderSettlementCreateReqs = new ArrayList<>();
@@ -800,6 +804,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             request.setAfterSalesType(cancelOrderRequest.getAfterSalesType().getIndex() == null ? 1 : cancelOrderRequest.getAfterSalesType().getIndex());
             request.setOrderClient(OrderClientType.SAAS.getIndex());
             request.setCancelReason(cancelOrderRequest.getReason());
+            request.setReqRemark(request.getReqRemark());
+            request.setAfterSalesReason(cancelOrderRequest.getReason());
             //若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
             request.setCreateEvent(4);
             request.setOperator(cancelOrderRequest.getOperator());
@@ -817,6 +823,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                     request.setAfterSerialNo(cancelOrderRequest.getRefundSerialNo());
                     request.setAdultRemark(cancelOrderRequest.getReason());
                     request.setOperator(cancelOrderRequest.getOperator());
+                    request.setAdultRemark(cancelOrderRequest.getReqRemark());
                     com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultApproveWithRefundComplete(request, cancelOrderRequest.getTrackingNo());
                     return orderSdkAdapter.convent2BaseOrderResponse(response);
                 }

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.17-RELEASE</version>
+            <version>2.0.22-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1150,6 +1150,9 @@ public class OrderAdapter {
             if (CollectionUtils.isNotEmpty(ordersBean.getRefundList())) {
                 responseVo.setRefundTips(orderViewStatusDto.getRefundStatusText());
             }
+            if(OrderStatus.COMPLETE.getCode().equals(ordersBean.getStatus())) {
+                responseVo.setCompleteTime(DateUtil.convert2String(new Date(ordersBean.getGmtCompleteTime()), "yyyy-MM-dd HH:mm:ss"));
+            }
             responseVo.setTakeMealFlows(getTakeMealFlows(ordersBean));
             responseVo.setRiderName(orderViewStatusDto.getRiderName());
             responseVo.setRiderText(orderViewStatusDto.getRiderText());

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java

@@ -60,6 +60,10 @@ public class QueryOrderResponseVo {
      */
     private String reserveDeliveryTime;
     /**
+     * 订单完成时间
+     */
+    private String completeTime;
+    /**
      * 是否外带 ,打包  1 是 0 否
      */
     private Integer takeOut;

order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -31,6 +31,7 @@ public enum ActivityTypeEnum {
     TYPE_31(31, "折扣券"),
     TYPE_32(32, "商品券"),
     TYPE_34(34, "运费券"),
+    TYPE_35(35, "买1赠3券"),
     TYPE_5(5, "整单满金额折"),
     TYPE_51(51, "每满金额折"),
     TYPE_52(52, "阶梯满金额折"),

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

@@ -507,6 +507,11 @@ public class CheckMCCafeOrder {
                     .channel(UserLoginChannelEnum.ALIPAY.getCode().equals(userLoginInfoDto.getChannel())?MCCafeChannelEnum.MOCOFFEE_ZFB.getName():MCCafeChannelEnum.MOCOFFEE_WX.getName())
                     .couponlist(couponCodeList)
                     .sign("skip")
+                    .memberInfo(new MCCafeCouponRequest.MemberInfo(userLoginInfoDto.getMemberId(),
+                            userLoginInfoDto.getWxAppId(),
+                            userLoginInfoDto.getUnionId(),
+                            userLoginInfoDto.getThirdPartyMemberID(),
+                            createOrderVo.getOrderType()==1?"mccafe_pickup":"mccafe"))
                     .build();
             McdNetBatchQueryResponse mcdNetBatchQueryResponse = couponClientService.batchQuery(mcCafeCouponRequest);
             if (mcdNetBatchQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode())
@@ -514,13 +519,17 @@ public class CheckMCCafeOrder {
                 LogUtil.error("部分优惠券当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
                 throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券当前不可用");
             } else if(!ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getCouponlist().get(0).getStatusCode())) {
-                if(mcdNetBatchQueryResponse.getCouponlist().get(0).getCodeInfo() != null) {
-                    LogUtil.error(mcdNetBatchQueryResponse.getCouponlist().get(0).getCodeInfo().getAct_name()+"当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
-                    throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, mcdNetBatchQueryResponse.getCouponlist().get(0).getCodeInfo().getAct_name()+"当前不可用");
-                } else {
-                    LogUtil.error("部分优惠券暂时不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
-                    throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券暂时不可用");
-                }
+                mcdNetBatchQueryResponse.getCouponlist().forEach(o -> {
+                    if(!ResponseCodeConstant.RESPONSE_SUCCESS.equals(o.getStatusCode())) {
+                        if(o.getCodeInfo() != null) {
+                            LogUtil.error(o.getCodeInfo().getAct_name()+"当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
+                            throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, o.getCodeInfo().getAct_name()+"当前不可用");
+                        } else {
+                            LogUtil.error("部分优惠券暂时不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
+                            throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券暂时不可用");
+                        }
+                    }
+                });
             }
             String activeCode = mcdNetBatchQueryResponse.getCouponlist().get(0).getCodeInfo().getAct_id();
             // 校验点餐方式,查询购物车接口内部已校验
@@ -550,7 +559,8 @@ public class CheckMCCafeOrder {
         List<MCCafeCouponVo> mcCafeCouponVos = new ArrayList<>();
         if(CollectionUtils.isNotEmpty(shoppingCartGoodsDto.getActivityDiscountsDtos())) {
             shoppingCartGoodsDto.getActivityDiscountsDtos().forEach(o-> {
-                if(ActivityTypeEnum.TYPE_3.getCode().equals(o.getActivityType()) || ActivityTypeEnum.TYPE_32.getCode().equals(o.getActivityType())) {
+                if(ActivityTypeEnum.TYPE_3.getCode().equals(o.getActivityType()) || ActivityTypeEnum.TYPE_32.getCode().equals(o.getActivityType())
+                        || ActivityTypeEnum.TYPE_34.getCode().equals(o.getActivityType()) || ActivityTypeEnum.TYPE_35.getCode().equals(o.getActivityType())) {
                     mcCafeCouponVos.add(new MCCafeCouponVo(o.getActivityCode()));
                 }
             });
@@ -566,6 +576,11 @@ public class CheckMCCafeOrder {
                     .channel(UserLoginChannelEnum.ALIPAY.getCode().equals(userLoginInfoDto.getChannel())?MCCafeChannelEnum.MOCOFFEE_ZFB.getName():MCCafeChannelEnum.MOCOFFEE_WX.getName())
                     .couponlist(mcCafeCouponVos)
                     .sign("skip")
+                    .memberInfo(new MCCafeCouponRequest.MemberInfo(userLoginInfoDto.getMemberId(),
+                            userLoginInfoDto.getWxAppId(),
+                            userLoginInfoDto.getUnionId(),
+                            userLoginInfoDto.getThirdPartyMemberID(),
+                            createOrderVo.getOrderType()==1?"mccafe_pickup":"mccafe"))
                     .build();
             McdNetBatchQueryResponse mcdNetBatchQueryResponse = couponClientService.batchQuery(mcCafeCouponRequest);
             if (mcdNetBatchQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode())

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

@@ -868,6 +868,9 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         }
         if (orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0) {
             var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+            if(OldOrderType.COLLECT_GOODS.getCode().equals(orderBean.getType()) || OldOrderType.EAT_IN.getCode().equals(orderBean.getType())) {
+                var1.setTimeout(-5);
+            }
         }
         // 订单支付成功
         com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccessMCCafe(var1);

order-management/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.15-RELEASE</version>
+            <version>2.0.22-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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;
@@ -11,6 +12,8 @@ import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -68,16 +71,29 @@ 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) {
+        OrderManagerRequest orderManagerRequest = new OrderManagerRequest();
+        BeanUtils.copyProperties(request, orderManagerRequest);
+        String reason = request.getReason();
+        if(StringUtils.isNotEmpty(reason)) {
+            if(reason.length() > 50) {
+                orderManagerRequest.setReason(reason.substring(reason.length()-50));
+            }
+            if(reason.length() > 200) {
+                orderManagerRequest.setRemark(reason.substring(reason.length()-200));
+            } else {
+                orderManagerRequest.setRemark(reason);
+            }
+        }
         McCafeOperateType byOpType = McCafeOperateType.getByOpType(request.getOperateType());
         if (byOpType==null){
             return ResponseUtil.error(ResponseResult.ORDER_OPERATE_TYPE_NOT_VALIDATE);
         }
         switch (byOpType) {
             case ORDER_SUCCESS:
-                return orderManagerAdapter.orderConfirmTake(request);
+                return orderManagerAdapter.orderConfirmTake(orderManagerRequest);
             case ORDER_REFUND:
-                return orderManagerAdapter.orderReject(request);
+                return orderManagerAdapter.orderReject(orderManagerRequest);
             default:
                 return ResponseUtil.error(ResponseResult.ORDER_OPERATE_TYPE_NOT_VALIDATE);
         }

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

@@ -106,4 +106,24 @@ public class MCCafeCouponRequest {
     private String channel;
 
     private List<MCCafeCouponVo> couponlist;
+
+    private MemberInfo memberInfo;
+
+    @Data
+    @AllArgsConstructor
+    public static class MemberInfo {
+        private String memberId;
+
+        private String appId;
+
+        private String unionId;
+
+        private String thirdPartyMemberId;
+
+        /**
+         * 自提："mccafe_pickup"
+         * 外卖: "mccafe"
+         */
+        private String tag;
+    }
 }

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;
@@ -9,56 +8,54 @@ 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;
 
-    */
-/**
+    /**
+     * 退款原因
+     */
+    private String reason;
+
+    /**
+     * 退款原因code
+     * 用于平台外卖（美团、饿了么）
+     */
+    private Integer reason_code;
+
+    /**
      * 订单操作类型
      * @see OperateType
-     *//*
-
+     */
     @NotEmpty(message = "操作类型不能为空")
     private String operateType;
 
-    */
-/**
+    /**
      * 操作人
      * pos
      * 开放平台
      * 小助手
      * 系统自动履单
-     *//*
-
+     */
     @NotEmpty(message = "操作人不能为空")
     private String operator;
+
+    /**
+     * 取餐码
+     * 麦咖啡专用
+     */
+    private String pickUpGoodsNo;
 }
-*/

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

@@ -59,4 +59,6 @@ public class OrderManagerRequest {
      * 麦咖啡专用
      */
     private String pickUpGoodsNo;
+
+    private String remark;
 }

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

@@ -162,6 +162,7 @@ public class SaasOrderHandle {
     public BaseResponse mcCafeOrderReject(OrderManagerRequest request, PayRefundResponse refundResponse, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         //作废订单
         CancelOrderRequest cancelOrderRequest = orderSdkAdapter.getCancelOrderRequest(request.getOperator(), request.getReason(), refundResponse.getPayRefundStatus(), refundResponse.getRefundId(), orderBean);
+        cancelOrderRequest.setReqRemark(request.getRemark());
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.mcCafeOrderReject(cancelOrderRequest, orderBean);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
             return ResponseUtil.error(ResponseResult.AFFIRM_ORDER_FAIL);