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

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

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

@@ -502,6 +502,7 @@ public class OrderSdkAdapter {
                     if(StringUtils.isNotBlank(accountRequest.getAddInfo())) {
                         orderCostCreateReq.setExtInfo(accountRequest.getAddInfo());
                     }
+                    orderCostCreateReq.setNote(accountRequest.getNote());
                     orderCostCreateReqs.add(orderCostCreateReq);
                 } else {
                     OrderSettlementCreateReq orderSettlementCreateReq = new OrderSettlementCreateReq();

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderAccountRequest.java

@@ -40,6 +40,8 @@ public class CreateOrderAccountRequest extends BaseConfig {
      */
     private String addInfo;
 
+    private String note;
+
     private String productId;
 
     private Integer discountQty;

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

@@ -190,6 +190,7 @@ public class OrderAdapter {
             }
         }
         createOrderDto.setProducts(products);
+        boolean hasDeliveryMonthCard = false;
         for (ActivityDiscountsDto activityDiscountsDto : activityDiscountsDtos) {
             CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
                     .accountId(activityDiscountsDto.getActivityCode())
@@ -206,6 +207,9 @@ public class OrderAdapter {
                     jsonObject.put("tenderId", activityDiscountsDto.getTenderId());
                 } else if(ActivityTypeEnum.TYPE_34.getCode().equals(activityDiscountsDto.getActivityType())) {
                     jsonObject.put("customerCode", activityDiscountsDto.getTenderId());
+                    if(null != activityDiscountsDto.getExtendType() && activityDiscountsDto.getExtendType() == 2) {
+                        hasDeliveryMonthCard = true;
+                    }
                 }
                 if(null != activityDiscountsDto.getExtendType()) {
                     jsonObject.put("extendType", activityDiscountsDto.getExtendType());
@@ -224,6 +228,9 @@ public class OrderAdapter {
                     .sequence(orderAccountIndex++)
                     .actualPrice(discountDeliveryAmount)
                     .build();
+            if(hasDeliveryMonthCard && StringUtils.isNotBlank(storeResponseDto.getBenefitCardDiscountAmount())) {
+                createOrderAccountDto.setNote((Integer.parseInt(storeResponseDto.getBenefitCardDiscountAmount())*100)+"");
+            }
             orderAccountDtos.add(createOrderAccountDto);
         }
         if (packageAmount > 0) {
@@ -1124,6 +1131,10 @@ public class OrderAdapter {
             responseVo.setPayStatusDesc(Optional.ofNullable(PayStatus.getByCode(ordersBean.getPayStatus()))
                     .map(PayStatus::getDesc).orElse(""));
             responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
+            if(mcCafePartnerId.equals(ordersBean.getCompanyId())) {
+                responseVo.setPayVoucherBarCode(Base64.getEncoder().encodeToString(
+                        BarcodeUtil.generateBarCode128(responseVo.getPayVoucher(),null,null, true, true)));
+            }
             responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : "");
             responseVo.setPayChannel(ordersBean.getPayChannel());
             if (StringUtils.isNotBlank(ordersBean.getPayChannel())) {
@@ -1171,6 +1182,9 @@ public class OrderAdapter {
             if (CollectionUtils.isNotEmpty(ordersBean.getRefundList())) {
                 responseVo.setRefundTips(orderViewStatusDto.getRefundStatusText());
             }
+            if(OrderStatus.COMPLETE.getCode().equals(ordersBean.getStatus()) && null != ordersBean.getGmtCompleteTime() && 0l != ordersBean.getGmtCompleteTime()) {
+                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/utils/DateUtils.java

@@ -14,7 +14,7 @@ public class DateUtils {
         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/service/adapter/OrderManagerAdapter.java

@@ -122,7 +122,12 @@ public class OrderManagerAdapter {
         //查询订单
         QueryOrdersResponse.DataBean.OrderBean orderBean = orderBaseService.getByOrderCode(request.getOrderId());
         //订单接单参数校验
-        BaseResponse verifyResponse = orderVerifyHandle.orderRejectVerify(orderBean, request);
+        BaseResponse verifyResponse;
+        if (!macCafePartnerId.equals(orderBean.getCompanyId())) {
+            verifyResponse = orderVerifyHandle.orderRejectVerify(orderBean, request);
+        } else {
+            verifyResponse = orderVerifyHandle.mcCafeOrderRejectVerify(orderBean, request);
+        }
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
             return handleResponse(request,orderBean,verifyResponse);
         }

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

@@ -208,6 +208,40 @@ public class OrderVerifyHandle {
         if (OrderStatus.COMPLETE.getCode().equals(status)) {
             return ResponseUtil.error(ResponseResult.REJECT_FAIL_ORDER_IS_COMPLETE, getOrderManagerResponse(orderBean));
         }
+        if (!OrderStatus.TAKE_ORDER.getCode().equals(status)) {
+            return ResponseUtil.error(ResponseResult.REJECT_FAIL_ORDER_IS_NOT_NEW, getOrderManagerResponse(orderBean));
+        }
+        return ResponseUtil.success();
+    }
+
+    /**
+     * 拒单
+     *
+     * @param orderBean
+     * @param request
+     * @return
+     */
+    public BaseResponse mcCafeOrderRejectVerify(QueryOrdersResponse.DataBean.OrderBean orderBean, OrderManagerRequest request) {
+        if (orderBean == null) {
+            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
+        }
+        Integer status = orderBean.getStatus();
+        //判断订单是否已经被拒单
+        if (OrderStatus.REFUSE.getCode().equals(status)) {
+            return ResponseUtil.error(ResponseResult.REJECT_FAIL_REPETITION, getOrderManagerResponse(orderBean));
+        }
+        //判断订单是否已经取消
+        if (OrderStatus.CANCEL.getCode().equals(status)) {
+            return ResponseUtil.error(ResponseResult.ORDER_HAS_CANCELED, getOrderManagerResponse(orderBean));
+        }
+        //判断订单是否在配送中
+        if (OrderStatus.DISTRIBUTION.getCode().equals(status)) {
+            return ResponseUtil.error(ResponseResult.REJECT_FAIL_ORDER_IS_DELIVERY, getOrderManagerResponse(orderBean));
+        }
+        //判断订单是否已送达
+        if (OrderStatus.COMPLETE.getCode().equals(status)) {
+            return ResponseUtil.error(ResponseResult.REJECT_FAIL_ORDER_IS_COMPLETE, getOrderManagerResponse(orderBean));
+        }
         if (!OrderStatus.TAKE_ORDER.getCode().equals(status) && !OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
             return ResponseUtil.error(ResponseResult.REJECT_FAIL_ORDER_IS_NOT_NEW, getOrderManagerResponse(orderBean));
         }