ufo / yohoufo-fore · Commits

Go to a project

Authored by chenjian
Commit f8c9ad6478fe3a51a8f6107ded9dc4c1956b1ab3 2 parents aaecb120 bd235c92

Merge branch 'hotfix-bid-seller-cache' into test6.9.14

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