在线支付车费没加的BUG
This commit is contained in:
parent
92e3019ecf
commit
c1f120a658
|
@ -153,7 +153,7 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
|
|||
}else{
|
||||
stringBuilder.append(minuteInt);
|
||||
}
|
||||
ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("artificer_id", artificer.getArtificerId()).eq("artificer_date", date).eq("artificer_time", stringBuilder.toString()));
|
||||
ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("artificer_id", artificer.getArtificerId()).eq("artificer_date", date).eq("artificer_time", stringBuilder.toString()).last(" limit 1"));
|
||||
if(artificerTime==null){
|
||||
if(oldDate.equals(date)){
|
||||
artificer.setTime(stringBuilder.toString());
|
||||
|
|
|
@ -655,7 +655,8 @@ public class AliPayController {
|
|||
orders.setShopMoney(shopMoney);
|
||||
artificerPrice = artificerPrice.subtract(oneArtificerMoney);
|
||||
artificerPrice = artificerPrice.subtract(shopMoney);
|
||||
if(orders.getIsSupplement()!=null && !orders.getIsSupplement().equals(2)){
|
||||
if(orders.getIsSupplement()!=null && orders.getIsSupplement().equals(2)){
|
||||
}else{
|
||||
//用户收益加上通行费用
|
||||
artificerPrice = artificerPrice.add(artificerTaxiPrice);
|
||||
}
|
||||
|
@ -1588,7 +1589,8 @@ public class AliPayController {
|
|||
orders.setShopMoney(shopMoney);
|
||||
artificerPrice = artificerPrice.subtract(oneArtificerMoney);
|
||||
artificerPrice = artificerPrice.subtract(shopMoney);
|
||||
if(orders.getIsSupplement()!=null && !orders.getIsSupplement().equals(2)){
|
||||
if(orders.getIsSupplement()!=null && orders.getIsSupplement().equals(2)){
|
||||
}else{
|
||||
//用户收益加上通行费用
|
||||
artificerPrice = artificerPrice.add(artificerTaxiPrice);
|
||||
}
|
||||
|
|
|
@ -1185,7 +1185,8 @@ public class WxServiceImpl implements WxService {
|
|||
orders.setShopMoney(shopMoney);
|
||||
artificerPrice = artificerPrice.subtract(oneArtificerMoney);
|
||||
artificerPrice = artificerPrice.subtract(shopMoney);
|
||||
if(orders.getIsSupplement()!=null && !orders.getIsSupplement().equals(2)){
|
||||
if(orders.getIsSupplement()!=null && orders.getIsSupplement().equals(2)){
|
||||
}else{
|
||||
//用户收益加上通行费用
|
||||
artificerPrice = artificerPrice.add(artificerTaxiPrice);
|
||||
}
|
||||
|
@ -1826,7 +1827,8 @@ public class WxServiceImpl implements WxService {
|
|||
orders.setShopMoney(shopMoney);
|
||||
artificerPrice = artificerPrice.subtract(oneArtificerMoney);
|
||||
artificerPrice = artificerPrice.subtract(shopMoney);
|
||||
if(orders.getIsSupplement()!=null && !orders.getIsSupplement().equals(2)){
|
||||
if(orders.getIsSupplement()!=null && orders.getIsSupplement().equals(2)){
|
||||
}else{
|
||||
//用户收益加上通行费用
|
||||
artificerPrice = artificerPrice.add(artificerTaxiPrice);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue