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

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

@@ -405,16 +405,12 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         for (CreateOrderProductRequest productDto : createOrderDto.getProducts()) {
             String skuId = productDto.getSpecification();
             if (products.get(skuId) != null) {
-                productDto.setCustomerCode(products.get(skuId).getCustomerCode());
-                productDto.setProductCode(products.get(skuId).getProductCode());
                 productDto.setThirdProductSpecId(products.get(productDto.getSpecification()).getThirdProductSpecId());
                 productDto.setThirdProductPropertyId(getThirdPropertyId(products.get(productDto.getSpecification()).getProductAttributeGroupList(),productDto.getAddInfo()));
 
                 // todo 商品组信息
                 setProductGroupInfo(products.get(skuId).getProductGroupList(), productDto);
             } else {
-                productDto.setCustomerCode("");
-                productDto.setProductCode("");
                 LogUtil.error("getProducts_exception", JSONObject.toJSONString(skuId), JSONObject.toJSONString(products), null);
             }
             //套餐子商品
@@ -423,16 +419,12 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                     String comboSkuId = comboProduct.getSpecification();
                     System.out.println(comboSkuId);
                     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()));
                         comboProduct.setStapleFood(products.get(comboSkuId).getStapleFood());
                         // todo 套餐商品的商品组信息
                         setProductGroupInfo(products.get(comboSkuId).getProductGroupList(), comboProduct);
                     } else {
-                        comboProduct.setCustomerCode("");
-                        comboProduct.setProductCode("");
                         LogUtil.error("getProducts_exception", JSONObject.toJSONString(skuId), JSONObject.toJSONString(products), null);
                     }
                 }