Compare commits

...

2 Commits

2 changed files with 11 additions and 4 deletions

View File

@ -200,6 +200,7 @@ public class TravelConfServiceImpl extends ServiceImpl<TravelConfDao, TravelConf
@Override @Override
public TravelPriceVo calcTravelPrice(Integer _travelType, BigDecimal freeKilometers, String longitude, String latitude, String toLongitude, String toLatitude){ public TravelPriceVo calcTravelPrice(Integer _travelType, BigDecimal freeKilometers, String longitude, String latitude, String toLongitude, String toLatitude){
TravelPriceVo vo = new TravelPriceVo(); TravelPriceVo vo = new TravelPriceVo();
vo.setFreeKilometers(NumberUtil.decimalFormat("0.00",freeKilometers));
Date now = DateTime.now(); Date now = DateTime.now();
//按条件取配置 //按条件取配置

View File

@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
/** /**
* @ClassName TravelPriceVo * @ClassName TravelPriceVo
* @Description TODO * @Description TODO
@ -18,17 +20,21 @@ public class TravelPriceVo {
/**出行价格(元)*/ /**出行价格(元)*/
@ApiModelProperty("出行价格(元)") @ApiModelProperty("出行价格(元)")
String travelPrice; private String travelPrice;
/**出行距离(米)*/ /**出行距离(米)*/
@ApiModelProperty("出行距离(米)") @ApiModelProperty("出行距离(米)")
Integer distances; private Integer distances;
/**出行距离(公里/千米)*/ /**出行距离(公里/千米)*/
@ApiModelProperty("出行距离(公里)") @ApiModelProperty("出行距离(公里)")
String kilometerNum; private String kilometerNum;
/**技师免费公里数*/
@ApiModelProperty("技师免费公里数")
private String freeKilometers;
/**出行配置具体参数*/ /**出行配置具体参数*/
@ApiModelProperty("出行配置具体参数") @ApiModelProperty("出行配置具体参数")
TravelConf conf; private TravelConf conf;
} }