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

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

@@ -217,7 +217,10 @@ public class DeliveryAdapter {
             List<CreateDeliveryPreferentialVo> createDeliveryPreferentialVos = new ArrayList<>();
             order.getAccountList().stream().forEach(accountBean -> {
                 if (OldOrderAccountType.COUPON.getCode().equals(accountBean.getType())
-                        || OldOrderAccountType.BUY_DISCOUNT.getCode().equals(accountBean.getType())) {
+                        || OldOrderAccountType.BUY_DISCOUNT.getCode().equals(accountBean.getType())
+                        || OldOrderAccountType.PRODUCT_COUPON.getCode().equals(accountBean.getType())
+                        || OldOrderAccountType.SUPER_PURCHASE.getCode().equals(accountBean.getType())
+                        || OldOrderAccountType.DISCOUNT_AMOUNT.getCode().equals(accountBean.getType())) {
                     CreateDeliveryPreferentialVo createDeliveryPreferentialVo = new CreateDeliveryPreferentialVo();
                     createDeliveryPreferentialVo.setPreferentialContent(accountBean.getName());
                     createDeliveryPreferentialVo.setPreferentialPrice(0-accountBean.getPrice());

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

@@ -215,7 +215,7 @@ public class CreateOrderVo {
     /**
      * 是否需要开发票，1 需要 0不需要
      */
-    private Integer isInvoice;
+    private Integer needInvoice;
 
     /**
      * 发票抬头

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

@@ -742,7 +742,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         orderExtInfoDto.setSessionKey(createOrderVo.getSessionKey());
         orderExtInfoDto.setFormId(createOrderVo.getFormId());
         orderExtInfoDto.setFromAppId(userLoginInfoDto.getWxAppId());
-        orderExtInfoDto.setIsInvoice(createOrderVo.getIsInvoice());
+        orderExtInfoDto.setNeedInvoice(createOrderVo.getNeedInvoice());
         orderExtInfoDto.setInvoiceTitle(createOrderVo.getInvoiceTitle());
         orderExtInfoDto.setNeedTableware(createOrderVo.getNeedTableware());
         orderExtInfoDto.setThirdPartyMemberId(userLoginInfoDto.getThirdPartyMemberID());
@@ -826,17 +826,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             return sendPaySuccessNoticeMessage();
         }
 
-        String downstreamThirdOrderCode = "";
-        if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
-            //调用基础订单接口更新信息
-            UpdateDownstreamOrderCodeReq updateDownstreamOrderCodeReq = new UpdateDownstreamOrderCodeReq();
-            updateDownstreamOrderCodeReq.setOrderCode(orderBean.getOid());
-            com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = orderSdkService.updateDownstreamThirdOrderCode(updateDownstreamOrderCodeReq, LogThreadLocal.getTrackingNo());
-
-            LinkedHashMap<String, String> linkedHashMap = (LinkedHashMap) baseResponse.getResult();
-            downstreamThirdOrderCode = linkedHashMap.get("downstreamThirdOrderCode");
-        }
-
         // 如果是到店，则冻结优惠券
         // 如果是外卖，则核销优惠券
         // 失败重试三次
@@ -879,6 +868,19 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         }
         // 订单支付成功
         com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccessMCCafe(var1);
+
+        //调用基础服务生成第三方订单号
+        String downstreamThirdOrderCode = "";
+        if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
+            //调用基础订单接口更新信息
+            UpdateDownstreamOrderCodeReq updateDownstreamOrderCodeReq = new UpdateDownstreamOrderCodeReq();
+            updateDownstreamOrderCodeReq.setOrderCode(orderBean.getOid());
+            com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = orderSdkService.updateDownstreamThirdOrderCode(updateDownstreamOrderCodeReq, LogThreadLocal.getTrackingNo());
+
+            LinkedHashMap<String, String> linkedHashMap = (LinkedHashMap) baseResponse.getResult();
+            downstreamThirdOrderCode = linkedHashMap.get("downstreamThirdOrderCode");
+        }
+
         String string2 = JSONObject.toJSONString(payAccessRes);
         JSONObject jsonObject2 = JSONObject.parseObject(string2);
         payAccessResponse = jsonObject2.toJavaObject(PayAccessResponse.class);
@@ -1074,20 +1076,20 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                     return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "您的申请已被商家拒绝，请联系门店沟通。");
                 }
             }
-            List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = cacheOpenPlatformPartnerWxappConfigManager.cacheSelectDefaultPage(userInfo.getWxAppId(), "2");
+//            List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = cacheOpenPlatformPartnerWxappConfigManager.cacheSelectDefaultPage(userInfo.getWxAppId(), "2");
 
-            Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity()));
+//            Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity()));
 
-            //是否退配送费
+            //是否退配送费  麦咖啡必退配送费
             boolean isRefundDeliveryFee = true;
-            AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get(OrderRefundEnum.REFUND_DELIVERY_FEE_ENABLE.getKeyValue());
-            LogUtil.info("orderRefund of oid:{}, {}, {}", orderBean.getOid(),orderBean.getStatus(), (null != refundDeliveryFeeConfig ? ToStringBuilder.reflectionToString(refundDeliveryFeeConfig) : null));
-            // 0、null表示 关闭 ; 1 表示开启
-            if (null != refundDeliveryFeeConfig
-                    && Arrays.asList(OrderStatus.DISTRIBUTION.getCode()).contains(orderBean.getStatus())
-                    && !ALLOW_REFUND.equals(refundDeliveryFeeConfig.getAppValue())) {
-                isRefundDeliveryFee = false;
-            }
+//            AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get(OrderRefundEnum.REFUND_DELIVERY_FEE_ENABLE.getKeyValue());
+//            LogUtil.info("orderRefund of oid:{}, {}, {}", orderBean.getOid(),orderBean.getStatus(), (null != refundDeliveryFeeConfig ? ToStringBuilder.reflectionToString(refundDeliveryFeeConfig) : null));
+//            // 0、null表示 关闭 ; 1 表示开启
+//            if (null != refundDeliveryFeeConfig
+//                    && Arrays.asList(OrderStatus.DISTRIBUTION.getCode()).contains(orderBean.getStatus())
+//                    && !ALLOW_REFUND.equals(refundDeliveryFeeConfig.getAppValue())) {
+//                isRefundDeliveryFee = false;
+//            }
 
             //申请取消配送单/取消配送单
             BaseResponseDto deliveryBaseResponse = new BaseResponseDto();

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

@@ -164,7 +164,7 @@ public class OrderExtInfoDto {
     /**
      * 是否需要开发票，1 需要 0不需要
      */
-    private Integer isInvoice;
+    private Integer needInvoice;
 
     /**
      * 发票抬头