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

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

@@ -219,7 +219,7 @@ public class DeliveryAdapter {
                         && !OldOrderAccountType.DRIVER_FEE.getCode().equals(accountBean.getType())) {
                     CreateDeliveryPreferentialVo createDeliveryPreferentialVo = new CreateDeliveryPreferentialVo();
                     createDeliveryPreferentialVo.setPreferentialContent(accountBean.getName());
-                    createDeliveryPreferentialVo.setPreferentialPrice(accountBean.getPrice());
+                    createDeliveryPreferentialVo.setPreferentialPrice(0-accountBean.getPrice());
                     createDeliveryPreferentialVos.add(createDeliveryPreferentialVo);
                 }
             });

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

@@ -745,6 +745,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         orderExtInfoDto.setIsInvoice(createOrderVo.getIsInvoice());
         orderExtInfoDto.setInvoiceTitle(createOrderVo.getInvoiceTitle());
         orderExtInfoDto.setNeedTableware(createOrderVo.getNeedTableware());
+        orderExtInfoDto.setThirdPartyMemberId(userLoginInfoDto.getThirdPartyMemberID());
         if (StringUtils.isNotBlank(createOrderVo.getScene())) {
             orderExtInfoDto.setScene(createOrderVo.getScene());
         }
@@ -1085,7 +1086,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
 
             //
             if ((OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType()) && CancelDeliveryResponseDto.notCollectMsg.equals(deliveryBaseResponse.getErrmsg()))
-                || OldOrderType.COLLECT_GOODS.getCode().equals(orderBean.getOrderType())
+                    || OldOrderType.COLLECT_GOODS.getCode().equals(orderBean.getOrderType())
                     || OldOrderType.EAT_IN.getCode().equals(orderBean.getOrderType())) {
                 //商家未接单逻辑处理    1.调用支付退款 2.根据支付退款返回状态组装订单取消参数,调用订单取消接口
                 BaseResponse baseResponse = partnerNoTakeOrder(orderRefundVo, orderBean, orderId,AfterSalesType.USER_CANCEL,isRefundDeliveryFee);
@@ -1195,11 +1196,11 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                     .reviewId(orderBean.getOid().substring(0, 20))
                     .build();
             CancelDeliveryResponseDto deliveryBaseResponse = deliveryFeiginMCCafeClient.cancelRequest(cancelDeliveryRequest);
+            baseResponseDto.setErrcode(deliveryBaseResponse.getCode());
+            baseResponseDto.setErrmsg(deliveryBaseResponse.getMsg());
 
             if (deliveryBaseResponse == null || !ResponseConstant.SUCCESS_RESPONSE_CODE.equals(deliveryBaseResponse.getCode())) {
                 LogUtil.error("申请取消配送单失败", cancelDeliveryRequest, deliveryBaseResponse);
-                baseResponseDto.setErrcode(deliveryBaseResponse.getCode());
-                baseResponseDto.setErrmsg(deliveryBaseResponse.getMsg());
                 return baseResponseDto;
             }
         }

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

@@ -170,4 +170,9 @@ public class OrderExtInfoDto {
      * 发票抬头
      */
     private String invoiceTitle;
+
+    /**
+     * 麦咖啡会员号
+     */
+    private String thirdPartyMemberId;
 }