Merge remote-tracking branch 'origin/feature/xukang_20200321_麦咖啡p5v9' into…

Merge remote-tracking branch 'origin/feature/xukang_20200321_麦咖啡p5v9' into feature/xukang_20210321_麦咖啡p5v9

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

@@ -311,7 +311,7 @@ public class OrderAdapter {
         if(shoppingCartGoodsDto.getMonthCardDiscount() != null && shoppingCartGoodsDto.getMonthCardDiscount().getDiscountAmount() != 0) {
             CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
                     .accountId("")
-                    .name("月享卡优惠总金额")
+                    .name(shoppingCartGoodsDto.getMonthCardDiscount().getDiscountDesc())
                     .price(shoppingCartGoodsDto.getMonthCardDiscount().getDiscountAmount())
                     .accountType(QueryOrderAccountType.MONTH_CARD_TOTAL_DISCOUNT)
                     .sequence(orderAccountIndex++)
@@ -1398,6 +1398,7 @@ public class OrderAdapter {
                     }
                     if (OldOrderAccountType.MONTH_CARD_TOTAL_DISCOUNT.getCode().equals(accountBean.getType())) {
                         responseVo.setMonthCardTotalDiscount(accountBean.getPrice());
+                        responseVo.setMonthCardTotalDiscountName(accountBean.getName());
                     }
                     if (OldOrderAccountType.FREIGHT_COUPON.getCode().equals(accountBean.getType())) {
                         responseVo.setFreightCouponName(accountBean.getName());

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

@@ -118,6 +118,10 @@ public class QueryOrderResponseVo {
      */
     private Long monthCardTotalDiscount;
     /**
+     * 月享卡优惠总金额
+     */
+    private String monthCardTotalDiscountName;
+    /**
      * 限时折扣优惠金额
      */
     private Long discountLimitAmount;