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

Compare commits

base: yangjun:349f74140f1c8b3cba152ee41ac9bad908f869ed
Branches Tags
yangjun:master
..
compare: yangjun:24450664b13d93356ba5581fc966131f856c0270
Branches Tags
yangjun:master

No commits in common. "349f74140f1c8b3cba152ee41ac9bad908f869ed" and "24450664b13d93356ba5581fc966131f856c0270" have entirely different histories.
349f74140f ... 24450664b1

3 changed files with 889 additions and 354 deletions
Show Stats Expand all files Collapse all files

26
src/main/java/com/sqx/modules/artificer/entity/Orders.java
View File

@ -472,30 +472,8 @@ public class Orders implements Serializable {
private String startRemark;
/**
* 选择技师后，计算完技师加成后的价格
*/
private BigDecimal priceMarkup;
/**
* 原技师加成后的价格
*/
private BigDecimal oldPriceMarkup;
/**
* 技师加成金额
*/
private BigDecimal technicianMoney;
/**
* 原技师加成金额
*/
private BigDecimal oldTechnicianMoney;
/**
* VIP减免价格
*/
private BigDecimal vipReductionMoney;
/**
* 原VIP减免价格
*/
private BigDecimal oldVipReductionMoney;
@TableField(exist = false)
private List<OrdersMassage> ordersMassageList;

1209
src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

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

@ -279,9 +279,7 @@ public class TravelConfServiceImpl extends ServiceImpl<TravelConfDao, TravelConf
// fixedPrice = NumberUtil.mul(fixedPrice, 2);
// }
//最终价格
// vo.setTravelPrice(NumberUtil.decimalFormat("0", fixedPrice));
fixedPrice = fixedPrice.setScale(0,BigDecimal.ROUND_UP);
vo.setTravelPrice(fixedPrice.toString());
vo.setTravelPrice(NumberUtil.decimalFormat("0.00", fixedPrice));
}else if(TravelEnum.PricingType.TRENDS.getValue().equals(pricingType)){
//动态的
BigDecimal nightTravelExpenses = new BigDecimal("0");//白天
@ -300,9 +298,7 @@ public class TravelConfServiceImpl extends ServiceImpl<TravelConfDao, TravelConf
//最终价格
//计算公式为【起步价 + 夜间出行费 + ((公里数 -起步公里数 - 免费公里数) * 每公里价格)= 最终价格】
BigDecimal travelPrice = NumberUtil.add(startingPrice, nightTravelExpenses, NumberUtil.mul(NumberUtil.sub(NumberUtil.sub(kilometerNum,startKilometers), freeKilometers), pricePerKilometer));
// vo.setTravelPrice(NumberUtil.decimalFormat("0.00", travelPrice));
travelPrice = travelPrice.setScale(0,BigDecimal.ROUND_UP);
vo.setTravelPrice(travelPrice.toString());
vo.setTravelPrice(NumberUtil.decimalFormat("0.00", travelPrice));
}
return vo;