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

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

@@ -672,6 +672,18 @@ public class CouponAdapter {
                     }
                 }
             }
+        } else if (QueryOrderAccountType.COUPON.equals(orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(accountBean.getType())))) {
+            for (int i = 0; i < orderBean.getProductList().size(); i++) {
+                QueryOrdersResponseDto.DataBean.OrderBean.ProductBean productBean = orderBean.getProductList().get(i);
+                String pid = org.apache.commons.lang3.StringUtils.isNotBlank(productBean.getSpecification()) ? productBean.getSpecification() : productBean.getProductId();
+                MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
+                mcCafeProductRedeemVo.setPid(pid);
+                mcCafeProductRedeemVo.setKeyProductCode(productBean.getCustomerCode());
+                mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode());
+                mcCafeProductRedeemVo.setConsume_num(productBean.getNumber());
+                mcCafeProductRedeemVo.setSeq(i + 1);
+                products.add(mcCafeProductRedeemVo);
+            }
         }
         MCCafeCouponRequest mcCafeCouponRequest = new MCCafeCouponRequest();
         mcCafeCouponRequest.setVer(Integer.valueOf(Version.VERSION_1));

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

@@ -386,57 +386,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         }
     }
 
-
-    /**
-     * 获取父子订单商品第三方商品编号
-     *
-     * @param
-     * @return
-     */
-    private CreateFatherSonOrderRequest getProductCustomerCodeNew(CreateFatherSonOrderRequest fatherSonOrderRequest) {
-        List<String> pids = new ArrayList<>();
-        List<CreateFatherSonOrderRequest.OrderInfo> productOrderInfoList = fatherSonOrderRequest.getOrderInfoList().stream().filter(orderInfo -> orderInfo.getProducts() != null).collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(productOrderInfoList)) {
-            return fatherSonOrderRequest;
-        }
-        for (CreateOrderProductRequest productDto : productOrderInfoList.get(0).getProducts()) {
-            pids.add(productDto.getProductId());
-        }
-        Map<String, GetProductsVo> products = itemService.getSpuProducts(pids, fatherSonOrderRequest.getPartnerId(), productOrderInfoList.get(0).getShopId(),fatherSonOrderRequest.getMenuType());
-        if (products.isEmpty()) {
-            return fatherSonOrderRequest;
-        }
-        for (CreateOrderProductRequest productDto : productOrderInfoList.get(0).getProducts()) {
-            if (StringUtils.isNotEmpty(productDto.getSpecification()) && products.get(productDto.getSpecification()) != null) {
-                productDto.setCustomerCode(products.get(productDto.getSpecification()).getCustomerCode());
-                productDto.setProductCode(products.get(productDto.getSpecification()).getProductCode());
-                productDto.setThirdProductSpecId(products.get(productDto.getSpecification()).getThirdProductSpecId());
-                productDto.setThirdProductPropertyId(getThirdPropertyId(products.get(productDto.getSpecification()).getProductAttributeGroupList(),productDto.getAddInfo()));
-            } else {
-                productDto.setCustomerCode("");
-                productDto.setProductCode("");
-                LogUtil.error("getProducts_exception", JSONObject.toJSONString(pids), JSONObject.toJSONString(products));
-            }
-            //套餐子商品
-            if(CollectionUtils.isNotEmpty(productDto.getComboProduct())){
-                for (CreateOrderProductRequest comboProduct : productDto.getComboProduct()){
-                    String comboSkuId = comboProduct.getSpecification();
-                    if (products.get(comboSkuId) != null) {
-                        comboProduct.setCustomerCode(products.get(comboSkuId).getCustomerCode());
-                        comboProduct.setProductCode(products.get(comboSkuId).getProductCode());
-                        comboProduct.setThirdProductSpecId(products.get(comboSkuId).getThirdProductSpecId());
-                        comboProduct.setThirdProductPropertyId(getThirdPropertyId(products.get(comboSkuId).getProductAttributeGroupList(),comboProduct.getAddInfo()));
-                    } else {
-                        comboProduct.setCustomerCode("");
-                        comboProduct.setProductCode("");
-                        LogUtil.error("getProducts_exception", JSONObject.toJSONString(comboSkuId), JSONObject.toJSONString(products), null);
-                    }
-                }
-            }
-        }
-        return fatherSonOrderRequest;
-    }
-
     /**
      * 获取商品第三方商品编号
      *
@@ -1000,6 +949,10 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 return sendPaySuccessNoticeMessage();
             }
             CreateDeliveryVo createDeliveryVo = deliveryAdapter.buildDeliveryOrderRequestDto(orderBean, storeInfo, deliveryCallBackUrl, linkedHashMap.get("downstreamThirdOrderCode"));
+            createDeliveryVo.getProductInfos().get(0).setProductCode("1000011");
+            createDeliveryVo.setStoreId("1450026");
+            createDeliveryVo.setStoreCode("1450026");
+            createDeliveryVo.setDisplayOrderId(createDeliveryVo.getDisplayOrderId().replace("768-", "1450026-"));
             //创建配送单
             //暂时写死配送店铺id
             createDeliveryVo.setStoreId("1450026");