Merge branch 'master-zjw' into dev

53208bee · 周健威 · f98c7a45 · d63a8041 · 53208bee
Commit 53208bee authored Nov 20, 2019 by 周健威
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

OrderCalculateBiz.java .../com/xxfc/platform/order/biz/inner/OrderCalculateBiz.java +1 -1

No files found.
--- a/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCalculateBiz.java
+++ b/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCalculateBiz.java
@@ -187,7 +187,7 @@ public class OrderCalculateBiz {
            //返回优惠券
            if(StrUtil.isNotBlank(baseOrder.getCouponTickerNos())) {
                //没有租车消费金额，所以返回所有优惠券
-                inProgressVO.setBackCoupons(StrUtil.split(baseOrder.getCouponTickerNos(), ','));
+                backCouponNos.addAll(StrUtil.split(baseOrder.getCouponTickerNos(), ','));
            }

            //设置消费金额，添加租车以外的消费金额