Commit 0c395dc3 authored by 周健威's avatar 周健威

修改优惠券bug

parent b4301c95
...@@ -313,7 +313,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl ...@@ -313,7 +313,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
List<String> usedTickerNos = CollUtil.newArrayList(); List<String> usedTickerNos = CollUtil.newArrayList();
for(String no : detail.getTickerNo()) { for(String no : detail.getTickerNo()) {
BigDecimal tempCouponAmount = activityFeign.use(dto.getUserid(), CollUtil.newArrayList(no), detail.getOrder().getNo(), channel, vehicleAmount, ActivityFeign.TYPE_NO_USE); BigDecimal tempCouponAmount = activityFeign.use(dto.getUserid(), CollUtil.newArrayList(no), detail.getOrder().getNo(), channel, vehicleAmount, ActivityFeign.TYPE_NO_USE);
if(couponAmount.compareTo(BigDecimal.ZERO) > 0) { if(tempCouponAmount.compareTo(BigDecimal.ZERO) > 0) {
//加入总couponAmount //加入总couponAmount
couponAmount = couponAmount.add(tempCouponAmount); couponAmount = couponAmount.add(tempCouponAmount);
usedTickerNos.add(no); usedTickerNos.add(no);
......
...@@ -255,7 +255,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To ...@@ -255,7 +255,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
List<String> usedTickerNos = CollUtil.newArrayList(); List<String> usedTickerNos = CollUtil.newArrayList();
for(String no : detail.getTickerNo()) { for(String no : detail.getTickerNo()) {
BigDecimal tempCouponAmount = activityFeign.use(dto.getUserid(), CollUtil.newArrayList(no), detail.getOrder().getNo(), channel, tourAmount, ActivityFeign.TYPE_NO_USE); BigDecimal tempCouponAmount = activityFeign.use(dto.getUserid(), CollUtil.newArrayList(no), detail.getOrder().getNo(), channel, tourAmount, ActivityFeign.TYPE_NO_USE);
if(couponAmount.compareTo(BigDecimal.ZERO) > 0) { if(tempCouponAmount.compareTo(BigDecimal.ZERO) > 0) {
//加入总couponAmount //加入总couponAmount
couponAmount = couponAmount.add(tempCouponAmount); couponAmount = couponAmount.add(tempCouponAmount);
usedTickerNos.add(no); usedTickerNos.add(no);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment