Commit a2594ded authored by 周健威's avatar 周健威

修改接口

parent cebefa57
...@@ -84,10 +84,11 @@ public class OrderTourController extends BaseController<OrderTourDetailBiz,Order ...@@ -84,10 +84,11 @@ public class OrderTourController extends BaseController<OrderTourDetailBiz,Order
@ApiModelProperty(value = "具体商品(商品项)id") @ApiModelProperty(value = "具体商品(商品项)id")
private String spePriceId; private String spePriceId;
//自己乘客ids @ApiModelProperty(value = "成人个数")
@ApiModelProperty(value = "自己乘客ids") Integer number;
private String tourUserIds;
@ApiModelProperty(value = "儿童个数")
Integer childNumber;
} }
} }
\ No newline at end of file
...@@ -131,6 +131,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To ...@@ -131,6 +131,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
BigDecimal tourAmount = BigDecimal.ZERO; BigDecimal tourAmount = BigDecimal.ZERO;
BigDecimal realAmount = BigDecimal.ZERO; BigDecimal realAmount = BigDecimal.ZERO;
if(StrUtil.isNotBlank(detail.getTourUserIds())) {
List<TourUser> users = new ArrayList<TourUser>(); List<TourUser> users = new ArrayList<TourUser>();
if(StrUtil.isNotBlank(detail.getTourUserIds())) { if(StrUtil.isNotBlank(detail.getTourUserIds())) {
users = tourFeign.getTourUsers(detail.getTourUserIds()).getData(); users = tourFeign.getTourUsers(detail.getTourUserIds()).getData();
...@@ -147,6 +148,10 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To ...@@ -147,6 +148,10 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
detail.setNumber(childs.size()); detail.setNumber(childs.size());
detail.setChildNumber(notChilds.size()); detail.setChildNumber(notChilds.size());
detail.setTotalNumber(users.size()); detail.setTotalNumber(users.size());
}else{
detail.setTotalNumber(detail.getNumber() + detail.getChildNumber());
}
//计算旅游价格 //计算旅游价格
ObjectRestResponse<TourSpePriceVo> objectRestResponse = tourFeign.refund(new TourSpePriceDTO(){{ ObjectRestResponse<TourSpePriceVo> objectRestResponse = tourFeign.refund(new TourSpePriceDTO(){{
......
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