Merge branch '2020/10/06-随单购买月享卡-huiyang' into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/activity/ActivityDiscountsDto.java

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

@@ -298,6 +298,19 @@ public class DeliveryAdapter {
                     createDeliveryPreferentialVo.setPreferentialContent(accountBean.getName());
                     createDeliveryPreferentialVo.setPreferentialPrice(0-accountBean.getPrice());
                     createDeliveryPreferentialVos.add(createDeliveryPreferentialVo);
+                } else if (OldOrderAccountType.WITH_ORDER_BUY_COUPON_FEE.getCode().equals(accountBean.getType())) {
+                    ProductInfo productInfo = new ProductInfo();
+                    productInfo.setProductCode(accountBean.getAccountId());
+                    productInfo.setProductName(accountBean.getName());
+                    productInfo.setProductNumber(1);
+                    productInfo.setProductPrice(accountBean.getPrice().intValue());
+                    //餐道使用
+                    productInfo.setCumulatedTotal(accountBean.getPrice().intValue());
+                    productInfo.setTaxId("10");
+                    productInfo.setTaxRate(6d);
+                    productInfo.setParentCode(-1l);
+
+                    productInfos.add(productInfo);
                 }
             });
             deliveryOrderRequestDto.setPreferentials(createDeliveryPreferentialVos);