yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yangjun:58ebb4b44ec553e2c971c1ea3d986c7f887fb096
Branches Tags
yangjun:master
..
compare: yangjun:9ee55fdfa2ed36a7a10df9df1e347e7e453467f8
Branches Tags
yangjun:master

No commits in common. "58ebb4b44ec553e2c971c1ea3d986c7f887fb096" and "9ee55fdfa2ed36a7a10df9df1e347e7e453467f8" have entirely different histories.
58ebb4b44e ... 9ee55fdfa2

2 changed files with 4 additions and 11 deletions
Show Stats Expand all files Collapse all files

1
src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java
View File

@ -200,7 +200,6 @@ 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();
//按条件取配置， //按条件取配置，

14
src/main/java/com/sqx/modules/travelconf/vo/TravelPriceVo.java
View File

@ -5,8 +5,6 @@ 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
@ -20,21 +18,17 @@ public class TravelPriceVo {
/**出行价格（元）*/ /**出行价格（元）*/
@ApiModelProperty("出行价格（元）") @ApiModelProperty("出行价格（元）")
private String travelPrice; String travelPrice;
/**出行距离（米）*/ /**出行距离（米）*/
@ApiModelProperty("出行距离（米）") @ApiModelProperty("出行距离（米）")
private Integer distances; Integer distances;
/**出行距离（公里/千米）*/ /**出行距离（公里/千米）*/
@ApiModelProperty("出行距离（公里）") @ApiModelProperty("出行距离（公里）")
private String kilometerNum; String kilometerNum;
/**技师免费公里数*/
@ApiModelProperty("技师免费公里数")
private String freeKilometers;
/**出行配置具体参数*/ /**出行配置具体参数*/
@ApiModelProperty("出行配置具体参数") @ApiModelProperty("出行配置具体参数")
private TravelConf conf; TravelConf conf;
} }