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

Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_java

This commit is contained in:
yangjun 2024-07-12 15:10:42 +08:00
parent d4d4c2d91e c1f120a658
commit e58c618f13
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java
View File

@ -153,7 +153,7 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
}else{ }else{
stringBuilder.append(minuteInt); 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(artificerTime==null){
if(oldDate.equals(date)){ if(oldDate.equals(date)){
artificer.setTime(stringBuilder.toString()); artificer.setTime(stringBuilder.toString());

6
src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java
View File

@ -655,7 +655,8 @@ public class AliPayController {
orders.setShopMoney(shopMoney); orders.setShopMoney(shopMoney);
artificerPrice = artificerPrice.subtract(oneArtificerMoney); artificerPrice = artificerPrice.subtract(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(shopMoney); 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); artificerPrice = artificerPrice.add(artificerTaxiPrice);
} }
@ -1588,7 +1589,8 @@ public class AliPayController {
orders.setShopMoney(shopMoney); orders.setShopMoney(shopMoney);
artificerPrice = artificerPrice.subtract(oneArtificerMoney); artificerPrice = artificerPrice.subtract(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(shopMoney); 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); artificerPrice = artificerPrice.add(artificerTaxiPrice);
} }

6
src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java
View File

@ -1185,7 +1185,8 @@ public class WxServiceImpl implements WxService {
orders.setShopMoney(shopMoney); orders.setShopMoney(shopMoney);
artificerPrice = artificerPrice.subtract(oneArtificerMoney); artificerPrice = artificerPrice.subtract(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(shopMoney); 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); artificerPrice = artificerPrice.add(artificerTaxiPrice);
} }
@ -1826,7 +1827,8 @@ public class WxServiceImpl implements WxService {
orders.setShopMoney(shopMoney); orders.setShopMoney(shopMoney);
artificerPrice = artificerPrice.subtract(oneArtificerMoney); artificerPrice = artificerPrice.subtract(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(shopMoney); 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); artificerPrice = artificerPrice.add(artificerTaxiPrice);
} }