Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -82,7 +82,7 @@ public class OrderController {
      * 麦咖啡创建订单
      */
     @ApiAnnotation(logMessage = "createMCCafeOrder")
-    @PostMapping("/mcCafe/createOrder")
+    @PostMapping("/MCoffee/createMCCafeOrder")
     public BaseResponse createOrderMCCafe(@Validated @LogParams @RequestBody CreateOrderVo createOrderVo) {
         return orderAdapterService.createMCCafeOrder(createOrderVo);
     }
@@ -127,7 +127,7 @@ public class OrderController {
      * 麦咖啡订单支付成功后通知
      */
     @ApiAnnotation(logMessage = "mcCafePaySuccessCallback")
-    @PostMapping({"/mcCafePaySuccessCallback","/openStoreMCCafeQueryPaymentCallback"})
+    @PostMapping({"/MCoffee/mcCafePaySuccessCallback","/openStoreMCCafeQueryPaymentCallback"})
     public String mcCafePaySuccessCallback(@LogParams @RequestBody NewPaysuccessNoticeMessage message) {
         return mcCafeOrderService.mcCafePaySuccessCallback(message);
     }
@@ -212,6 +212,15 @@ public class OrderController {
     }
 
     /**
+     * 麦咖啡用户申请退款
+     */
+    @ApiAnnotation(logMessage = "mcCafeRefund")
+    @PostMapping("/MCoffee/mcCafeRefund")
+    public BaseResponse mcCafeRefund(@Validated @LogParams @RequestBody OrderRefundVo orderRefundVo) {
+        return mcCafeOrderService.orderRefund(orderRefundVo);
+    }
+
+    /**
      * 获取订单排队号
      */
     @ApiAnnotation(logMessage = "queueIndex")

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

@@ -206,6 +206,16 @@ public class CreateOrderVo {
     private String channelType;
 
     /**
+     * 是否需要餐具，1 需要 0不需要
+     */
+    private Integer needTableware;
+
+    /**
+     * 是否需要开发票，1 需要 0不需要
+     */
+    private Integer needInvoice;
+
+    /**
      * 微信配送地址信息
      */
     private WeixinDeliveryAddressDto weixinDeliveryAddress;

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

@@ -30,4 +30,10 @@ public interface MCCafeOrderService {
      */
     String paySuccessCallback(PaysuccessNoticeMessage message, ConfirmOrderDto confirmOrderDto, Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans);
 
+    /**
+     * 麦咖啡订单申请退款
+     */
+    BaseResponse orderRefund(OrderRefundVo orderRefundVo);
+
+
 }

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

@@ -152,19 +152,19 @@ public class MCCafeOrderCenterSdkServiceImpl implements MCCafeOrderCenterSdkServ
 //            }
 //        }
         // 扣减积分，扣减失败冲正积分返回错误
-        UserScoreRequest userScoreRequest = orderSdkAdapter.convent2UserScoreRequest(orderBean, accounts, true);
-        if (userScoreRequest != null) {
-            BaseResponse userScoreResponse = memberScoreService.useScore(userScoreRequest, "");
-            if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, userScoreResponse.getCode())) {
-                //TODO 失败取消订单,异步冲正库存
-                CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "积分不足", "", null);
-                orderCenterSdkService.orderCancel(cancelOrderRequest);
-                //失败异步冲正库存，取消订单
-                backOrdersNotifyActivity(orderBean, mqMessageRequest.getBackOrdersNotifyActivityQueue(), mqMessageRequest.getBackOrdersNotifyActivityExchange());
-                return BaseOrderResponse.getErrorBaseOrderResponse(userScoreResponse.getCode(), "积分不足");
-            }
-        }
+//        UserScoreRequest userScoreRequest = orderSdkAdapter.convent2UserScoreRequest(orderBean, accounts, true);
+//        if (userScoreRequest != null) {
+//            BaseResponse userScoreResponse = memberScoreService.useScore(userScoreRequest, "");
+//            if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, userScoreResponse.getCode())) {
+//                //TODO 失败取消订单,异步冲正库存
+//                CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
+//                        AfterSalesType.SYSTEM_CANCEL, "积分不足", "", null);
+//                orderCenterSdkService.orderCancel(cancelOrderRequest);
+//                //失败异步冲正库存，取消订单
+//                backOrdersNotifyActivity(orderBean, mqMessageRequest.getBackOrdersNotifyActivityQueue(), mqMessageRequest.getBackOrdersNotifyActivityExchange());
+//                return BaseOrderResponse.getErrorBaseOrderResponse(userScoreResponse.getCode(), "积分不足");
+//            }
+//        }
 
 //        CouponBaseResponse couponBaseResponse = couponClientService.lock(orderBean, accounts);
 //        if (couponBaseResponse!=null){