ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit 05dd5700376182c300dc1347eb8d49f2c64e9bad 2 parents d2125652 2ab94bb2

Merge branch 'test6.9.14' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.14

Inline Side-by-side
Showing 1 changed file with 2 additions and 0 deletions
@@ -20,6 +20,8 @@ public class OfflinePaymentResponse extends PaymentResponse { @@ -20,6 +20,8 @@ public class OfflinePaymentResponse extends PaymentResponse {
20 offlinePaymentResponse.setPromotionFormulaList(paymentResponse.getPromotionFormulaList()); 20 offlinePaymentResponse.setPromotionFormulaList(paymentResponse.getPromotionFormulaList());
21 offlinePaymentResponse.setRecommendedCouponInfo(paymentResponse.getRecommendedCouponInfo()); 21 offlinePaymentResponse.setRecommendedCouponInfo(paymentResponse.getRecommendedCouponInfo());
22 offlinePaymentResponse.setCouponList(paymentResponse.getCouponList()); 22 offlinePaymentResponse.setCouponList(paymentResponse.getCouponList());
  23 + offlinePaymentResponse.setPromotionList(paymentResponse.getPromotionList());
  24 + offlinePaymentResponse.setPromotionTips(paymentResponse.getPromotionTips());
23 offlinePaymentResponse.setDamagesDesc("店内闪购：请确保您可到指定地点进行提货，并在支付前检查商品是否完好。店内购买商品若无质量问题不支持退换。"); 25 offlinePaymentResponse.setDamagesDesc("店内闪购：请确保您可到指定地点进行提货，并在支付前检查商品是否完好。店内购买商品若无质量问题不支持退换。");
24 26
25 return offlinePaymentResponse; 27 return offlinePaymentResponse;