diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java index 69608af..4adaf1a 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java @@ -153,7 +153,7 @@ public class ArtificerServiceImpl extends ServiceImpl i }else{ stringBuilder.append(minuteInt); } - ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper().eq("artificer_id", artificer.getArtificerId()).eq("artificer_date", date).eq("artificer_time", stringBuilder.toString())); + ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper().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()); diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java index 5d170ba..2990db7 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java @@ -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); } diff --git a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java index b078609..86e0f1a 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java @@ -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); }