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

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

@@ -176,39 +176,37 @@ public class DeliveryAdapter {
         List<ProductInfo> productInfos = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(order.getProductList())) {
             order.getProductList().forEach(productList -> {
-                if (productList.getPrice() > 0) {
-                    ProductInfo deliveryProductInfo = new ProductInfo();
-                    deliveryProductInfo.setProductCode(productList.getProductId());
-                    deliveryProductInfo.setProductName(productList.getProductName());
-                    deliveryProductInfo.setProductNumber(productList.getNumber());
-                    deliveryProductInfo.setProductPrice(productList.getPrice().intValue());
-                    //餐道使用
-                    deliveryProductInfo.setCumulatedTotal(productList.getNumber() * productList.getPrice().intValue());
-                    OrderProductAddInfoDto orderProductAddInfoDto = JSON.parseObject(productList.getAddInfo(), OrderProductAddInfoDto.class);
-                    deliveryProductInfo.setTaxId(StringUtils.isNotEmpty(orderProductAddInfoDto.getTaxId()) ? orderProductAddInfoDto.getTaxId() : "10");
-                    deliveryProductInfo.setTaxRate(orderProductAddInfoDto.getTax() > 0 ? orderProductAddInfoDto.getTax() : 6);
-                    deliveryProductInfo.setParentCode(-1l);
-
-                    productInfos.add(deliveryProductInfo);
-
-                    if(CollectionUtils.isNotEmpty(productList.getComboProduct())) {
-                        productList.getComboProduct().forEach(comboProduct -> {
-                            ProductInfo deliveryComboProductInfo = new ProductInfo();
-                            deliveryComboProductInfo.setProductCode(comboProduct.getProductId());
-                            deliveryComboProductInfo.setProductName(comboProduct.getProductName());
-                            deliveryComboProductInfo.setProductNumber(comboProduct.getNumber());
-                            deliveryComboProductInfo.setProductPrice(comboProduct.getPrice().intValue());
-                            //餐道使用
-                            deliveryComboProductInfo.setCumulatedTotal(comboProduct.getNumber() * comboProduct.getPrice().intValue());
-                            OrderProductAddInfoDto orderComboProductAddInfoDto = JSON.parseObject(comboProduct.getAddInfo(), OrderProductAddInfoDto.class);
-                            deliveryComboProductInfo.setTaxId(StringUtils.isNotEmpty(orderComboProductAddInfoDto.getTaxId()) ? orderComboProductAddInfoDto.getTaxId() : "10");
-                            deliveryComboProductInfo.setTaxRate(orderComboProductAddInfoDto.getTax() > 0 ? orderComboProductAddInfoDto.getTax() : 6);
-
-                            deliveryComboProductInfo.setParentCode(Long.valueOf(comboProduct.getParentProductId().split("_")[0]));
-
-                            productInfos.add(deliveryComboProductInfo);
-                        });
-                    }
+                ProductInfo deliveryProductInfo = new ProductInfo();
+                deliveryProductInfo.setProductCode(productList.getProductId());
+                deliveryProductInfo.setProductName(productList.getProductName());
+                deliveryProductInfo.setProductNumber(productList.getNumber());
+                deliveryProductInfo.setProductPrice(productList.getPrice().intValue());
+                //餐道使用
+                deliveryProductInfo.setCumulatedTotal(productList.getNumber() * productList.getPrice().intValue());
+                OrderProductAddInfoDto orderProductAddInfoDto = JSON.parseObject(productList.getAddInfo(), OrderProductAddInfoDto.class);
+                deliveryProductInfo.setTaxId(StringUtils.isNotEmpty(orderProductAddInfoDto.getTaxId()) ? orderProductAddInfoDto.getTaxId() : "10");
+                deliveryProductInfo.setTaxRate(orderProductAddInfoDto.getTax() > 0 ? orderProductAddInfoDto.getTax() : 6);
+                deliveryProductInfo.setParentCode(-1l);
+
+                productInfos.add(deliveryProductInfo);
+
+                if(CollectionUtils.isNotEmpty(productList.getComboProduct())) {
+                    productList.getComboProduct().forEach(comboProduct -> {
+                        ProductInfo deliveryComboProductInfo = new ProductInfo();
+                        deliveryComboProductInfo.setProductCode(comboProduct.getProductId());
+                        deliveryComboProductInfo.setProductName(comboProduct.getProductName());
+                        deliveryComboProductInfo.setProductNumber(comboProduct.getNumber());
+                        deliveryComboProductInfo.setProductPrice(comboProduct.getPrice().intValue());
+                        //餐道使用
+                        deliveryComboProductInfo.setCumulatedTotal(comboProduct.getNumber() * comboProduct.getPrice().intValue());
+                        OrderProductAddInfoDto orderComboProductAddInfoDto = JSON.parseObject(comboProduct.getAddInfo(), OrderProductAddInfoDto.class);
+                        deliveryComboProductInfo.setTaxId(StringUtils.isNotEmpty(orderComboProductAddInfoDto.getTaxId()) ? orderComboProductAddInfoDto.getTaxId() : "10");
+                        deliveryComboProductInfo.setTaxRate(orderComboProductAddInfoDto.getTax() > 0 ? orderComboProductAddInfoDto.getTax() : 6);
+
+                        deliveryComboProductInfo.setParentCode(Long.valueOf(comboProduct.getParentProductId().split("_")[0]));
+
+                        productInfos.add(deliveryComboProductInfo);
+                    });
                 }
             });
             deliveryOrderRequestDto.setProductTotal(productInfos.stream().mapToInt(t -> t.getCumulatedTotal()).sum());

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

@@ -826,6 +826,17 @@ 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");
+        }
+
         // 如果是到店，则冻结优惠券
         // 如果是外卖，则核销优惠券
         // 失败重试三次
@@ -943,19 +954,12 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         buriedPointService.BuriedPointPayment(requestDto, orderBean);
 
         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();
-
             //获取门店信息
             StoreResponse storeInfo = storeCenterService.getStoreInfo(new StoreInfoRequest(orderBean.getCompanyId(), orderBean.getShopId()), "");
             if (storeInfo == null || ObjectUtils.notEqual(cn.freemud.management.enums.ResponseResult.SUCCESS.getCode(), storeInfo.getStatusCode().toString()) || storeInfo.getBizVO() == null) {
                 return sendPaySuccessNoticeMessage();
             }
-            CreateDeliveryVo createDeliveryVo = deliveryAdapter.buildDeliveryOrderRequestDto(orderBean, storeInfo, deliveryCallBackUrl, linkedHashMap.get("downstreamThirdOrderCode"));
+            CreateDeliveryVo createDeliveryVo = deliveryAdapter.buildDeliveryOrderRequestDto(orderBean, storeInfo, deliveryCallBackUrl, downstreamThirdOrderCode);
             //创建配送单
             CreateDeliveryOrderResponseDto deliveryResponse = deliveryFeiginClient.deliveryOrderAdd(createDeliveryVo);
             //创建配送单失败，更新订单为异常单