Merge remote-tracking branch 'origin/dev' into dev

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(), ','));
             }
 
             //设置消费金额，添加租车以外的消费金额