Merge branch 'feature/20201021_万能券展示问题_xukang' into feature-yu.sun-material-20201030

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -922,7 +922,7 @@ public class OrderSdkAdapter {
                 productDiscount.setDiscountAmount(orderSettlementResp.getShopDiscountAmount());
                 //无数据
                 productDiscount.setCustomerCode("");
-                productDiscount.setAddInfo("");
+                productDiscount.setAddInfo(orderSettlementResp.getExtInfo());
                 productDiscount.setProductId(orderSettlementResp.getProductId());
                 discountList.add(productDiscount);
             }

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

@@ -1173,6 +1173,7 @@ public class OrderAdapter {
             Long promotionAmount = 0L;
             Long deliveryAmount = 0L;
             Long packageAmount = 0L;
+            Long originalDeliveryAmount = 0L;
             //限时特价优惠金额
             Long discountLimitAmount = 0L;
             Long couponAmount = 0L;
@@ -1199,6 +1200,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();
@@ -1221,9 +1223,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);
@@ -1942,10 +1948,15 @@ public class OrderAdapter {
                 discountTotalAmount = discountTotalAmount + productDiscount.getDiscountAmount()*productDiscount.getDiscountQty();
                 if (OrderAccountType.PRODUCT_COUPON.getCode().equals(productDiscount.getDiscountType())) {
                     hasProductCoupon = true;
-                    productVo.setName(productDiscount.getDiscountDesc());
-                    productVo.setSpuName(productDiscount.getDiscountDesc());
-                    productVo.setExtras("");
-                    productVo.setSpecification("");
+                    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());
+                        productVo.setSpuName(productDiscount.getDiscountDesc());
+                        productVo.setExtras("");
+                        productVo.setSpecification("");
+                    }
                 }
                 if (OrderAccountType.BUYM_SENDN.getCode().equals(productDiscount.getDiscountType())) {
                     activityType = ActivityTypeEnum.TYPE_61.getCode();

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;

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

@@ -215,7 +215,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
                 return sellCouponOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
             }
             //麦咖啡订单处理
-            if(mcCafePartnerId.equals(orderBean.getOid())) {
+            if(mcCafePartnerId.equals(orderBean.getCompanyId())) {
                 return mcCafeOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
             }
             /**

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

@@ -1222,9 +1222,9 @@ public class OrderServiceImpl implements Orderservice {
                 && queryOrderResponseVo.getRefundStatus() != null && queryOrderResponseVo.getRefundStatus() == 1) {
             Integer automaticRefund = storeInfo.getBizVO().getStoreConfig().getAutomaticRefund();
             if(automaticRefund != null && automaticRefund == 1){
-                queryOrderResponseVo.setRefundTips("若48小时后商家未处理，自动同意");
+                queryOrderResponseVo.setRefundTips("若48小时内未成功退款，请联系商家人工处理");
             }else {
-                queryOrderResponseVo.setRefundTips("若48小时后商家未处理，拒绝退款");
+                queryOrderResponseVo.setRefundTips("若48小时内未成功退款，请联系商家人工处理");
             }
         }
 
@@ -1349,9 +1349,9 @@ public class OrderServiceImpl implements Orderservice {
                 && queryOrderResponseVo.getRefundStatus() != null && queryOrderResponseVo.getRefundStatus() == 1) {
             Integer automaticRefund = storeInfo.getBizVO().getStoreConfig().getAutomaticRefund();
             if(automaticRefund != null && automaticRefund == 1){
-                queryOrderResponseVo.setRefundTips("若48小时后商家未处理，自动同意");
+                queryOrderResponseVo.setRefundTips("若48小时内未成功退款，请联系商家人工处理");
             }else {
-                queryOrderResponseVo.setRefundTips("若48小时后商家未处理，拒绝退款");
+                queryOrderResponseVo.setRefundTips("若48小时内未成功退款，请联系商家人工处理");
             }
         }