Merge branch 'feature/20201021_万能券展示问题_xukang' into 2020/10/29-fabu-huiyang

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

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

@@ -1220,6 +1220,7 @@ public class OrderAdapter {
             Long promotionAmount = 0L;
             Long deliveryAmount = 0L;
             Long packageAmount = 0L;
+            Long originalDeliveryAmount = 0L;
             //限时特价优惠金额
             Long discountLimitAmount = 0L;
             Long couponAmount = 0L;
@@ -1246,6 +1247,7 @@ public class OrderAdapter {
                     if (OrderAccountType.DELIVERY_AMOUNT.getCode().equals(accountBean.getType())) {
                         //deliveryAmount = accountBean.getPrice();
                         deliveryAmount = null != accountBean.getActualCostAmount() ? accountBean.getActualCostAmount() : accountBean.getPrice();
+                        originalDeliveryAmount = accountBean.getPrice();
                     }
                     if (OrderAccountType.PACK_AMOUNT.getCode().equals(accountBean.getType())) {
                         packageAmount = accountBean.getPrice();
@@ -1268,9 +1270,13 @@ public class OrderAdapter {
                         customerScorePrompt = decimalFormat.format(customerScoreAmount / 100.0);
 //                        customerScorePrompt = "积分抵扣-¥" + customerScoreAmountStr;
                     }
+                    if (Integer.valueOf(99).equals(accountBean.getType())) {
+                        responseVo.setFreightCouponName(accountBean.getName());
+                    }
                 }
             }
             responseVo.setDeliveryAmount(deliveryAmount);
+            responseVo.setOriginalDeliveryAmount(originalDeliveryAmount);
             responseVo.setPackageAmount(packageAmount);
             responseVo.setDiscountLimitAmount(discountLimitAmount);
             responseVo.setFullDiscountAmount(fullDiscountAmount);
@@ -1999,7 +2005,8 @@ public class OrderAdapter {
                 discountTotalAmount = discountTotalAmount + productDiscount.getDiscountAmount()*productDiscount.getDiscountQty();
                 if (OrderAccountType.PRODUCT_COUPON.getCode().equals(productDiscount.getDiscountType())) {
                     hasProductCoupon = true;
-                    if("啡常月享卡".equals(productDiscount.getDiscountDesc())) {
+                    Integer extendType = StringUtils.isBlank(productDiscount.getAddInfo())?null:JSON.parseObject(productDiscount.getAddInfo()).getInteger("extendType");
+                    if(null != extendType && (4 == extendType || 5 == extendType)) {
                         productVo.setCouponName(productDiscount.getDiscountDesc());
                     } else {
                         productVo.setName(productDiscount.getDiscountDesc());

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

@@ -42,6 +42,8 @@ public class ProductVo {
      * 商品spu名称
      */
     private String spuName;
+
+    private String couponName;
     /**
      * 商品的规格信息加属性信息
      */

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

@@ -99,6 +99,14 @@ public class QueryOrderResponseVo {
      */
     private Long deliveryAmount;
     /**
+     * 配送费原价
+     */
+    private Long originalDeliveryAmount;
+    /**
+     * 运费券名称
+     */
+    private String freightCouponName;
+    /**
      * 限时折扣优惠金额
      */
     private Long discountLimitAmount;