Merge remote-tracking branch 'origin/feature/20200727_麦咖啡p1v2支付券码路由' into…

Merge remote-tracking branch 'origin/feature/20200727_麦咖啡p1v2支付券码路由' into feature/20200727_麦咖啡p1v2支付券码路由

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

@@ -88,6 +88,7 @@ import com.freemud.sdk.api.assortment.message.enums.MessageEventType;
 import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest;
 import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest;
 import com.freemud.sdk.api.assortment.message.service.IMessageTemplatePushService;
+import com.freemud.sdk.api.assortment.order.enums.NewOrderType;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderType;
 import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.*;
@@ -632,6 +633,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         try {
             UnifiedOrderRequest request = orderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount, transId);
             com.freemud.application.sdk.api.base.BaseResponse<UnifiedOrderResponse> responseBase = standardPaymentService.unifiedOrder(request, trackingNo);
+            log.error("支付SDK返回信息,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase));
             if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode())) {
                 log.error("支付SDK返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase));
                 return null;
@@ -1031,14 +1033,20 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         if (OrderStatus.COMPLETE.getCode().equals(orderBean.getStatus())) {
             return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单已完成，无法退款");
         }
-        if(OldOrderType.COLLECT_GOODS.getCode().equals(orderBean.getOrderType()) || OldOrderType.EAT_IN.getCode().equals(orderBean.getOrderType())) {
-            return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "麦咖啡到店订单不支持退款");
+        if(NewOrderType.GENERAL_DINE_IN.getCode().equals(orderBean.getOrderType()) || NewOrderType.GENERAL_SELF_PICKUP.getCode().equals(orderBean.getOrderType())) {
+            return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "实时到店订单无法退款");
         }
-
-        if (OrderStatus.DISTRIBUTION.getCode().equals(orderBean.getStatus())) {
-            return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单配送中，退款请联系售后！");
+        if(NewOrderType.RESERVED_DINE_IN.getCode().equals(orderBean.getOrderType()) || NewOrderType.RESERVED_SELF_PICKUP.getCode().equals(orderBean.getOrderType())) {
+            Date expectTime = new Date(orderBean.getGmtExpect());
+            if(expectTime.before(new Date())) {
+                return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "预约到店订单超过预约时间后无法退款");
+            }
         }
 
+//        if (OrderStatus.DISTRIBUTION.getCode().equals(orderBean.getStatus())) {
+//            return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单配送中，退款请联系售后！");
+//        }
+
         /**
          * 已接单，制作完成，配送中,未接单，用户可申请退款
          *
@@ -1145,6 +1153,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         if (orderBean.getAmount() != 0) {
             //调用支付退款
             com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
+            orderPayRefundRequest.setRefundAmount(1l);
             response = standardPaymentService.orderRefund(orderPayRefundRequest, LogTreadLocal.getTrackingNo());
             if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
                 return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");