diff --git a/src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java b/src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java index 91ae4bd..e4f8a23 100644 --- a/src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java +++ b/src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java @@ -100,6 +100,8 @@ public interface OrdersDao extends BaseMapper { BigDecimal selectOrdersArtificerIntegralEarnings(Long artificerId, String endDate, String startDate); + BigDecimal selectOrdersArtificerIntegralProjectEarnings(Long artificerId, String endDate, String startDate); + String selectOrdersArtificerIntegral(Long artificerId, String endDate, String startDate); String selectOrdersArtificerIntegraladdNum(Long artificerId, String endDate, String startDate); diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index 5be82ae..a29ae37 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -1289,11 +1289,13 @@ public class OrdersServiceImpl extends ServiceImpl implements if(oldOrders.getCouponMoney()!=null){ massageMoney = massageMoney.subtract(oldOrders.getCouponMoney()); } - BigDecimal projectBenefits = massageMoney; BigDecimal subtract = oldOrders.getPayMoney(); //计算用户收益 BigDecimal artificerPrice = subtract.multiply(artificer.getRate()); artificerPrice = artificerPrice.setScale(2, BigDecimal.ROUND_HALF_UP); +// BigDecimal projectBenefits = massageMoney; +// projectBenefits = projectBenefits.multiply(artificer.getRate()); +// projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); if(oldOrders.getPayWay().equals(5)){ BigDecimal rate = new BigDecimal(commonInfoService.findOne(449).getValue()); ordersOld.setWalletRate(rate); @@ -1304,16 +1306,14 @@ public class OrdersServiceImpl extends ServiceImpl implements ordersOld.setValueStorageDeduction(valueStorageDeduction); artificerPrice = artificerPrice.multiply(rate); artificerPrice = artificerPrice.setScale(2, BigDecimal.ROUND_HALF_UP); - projectBenefits = projectBenefits.multiply(artificer.getRate()); - projectBenefits = projectBenefits.multiply(rate); - projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); - ordersOld.setProjectBenefits(projectBenefits); +// projectBenefits = projectBenefits.multiply(rate); +// ordersOld.setProjectBenefits(projectBenefits); + ordersOld.setProjectBenefits(artificerPrice); }else{ ordersOld.setValueStorageDeduction(BigDecimal.ZERO); //计算技师项目提成金额 - projectBenefits = projectBenefits.multiply(artificer.getRate()); - projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); - ordersOld.setProjectBenefits(projectBenefits); +// ordersOld.setProjectBenefits(projectBenefits); + ordersOld.setProjectBenefits(artificerPrice); } UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); @@ -2043,11 +2043,13 @@ public class OrdersServiceImpl extends ServiceImpl implements BigDecimal artificerPrice = orders.getPayMoney().subtract(taxiMoney); artificerPrice = artificerPrice.multiply(artificer.getRate()); artificerPrice = artificerPrice.setScale(2, BigDecimal.ROUND_HALF_UP); - BigDecimal massageMoney = orders.getMassageMoney(); - if(orders.getCouponMoney()!=null){ - massageMoney = massageMoney.subtract(orders.getCouponMoney()); - } - BigDecimal projectBenefits = massageMoney; +// BigDecimal massageMoney = orders.getMassageMoney(); +// if(orders.getCouponMoney()!=null){ +// massageMoney = massageMoney.subtract(orders.getCouponMoney()); +// } +// BigDecimal projectBenefits = massageMoney; +// projectBenefits = projectBenefits.multiply(artificer.getRate()); +// projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); if(oldOrders.getPayWay().equals(5)){ BigDecimal rate = new BigDecimal(commonInfoService.findOne(449).getValue()); orders.setWalletRate(rate); @@ -2058,16 +2060,15 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setValueStorageDeduction(valueStorageDeduction); artificerPrice = artificerPrice.multiply(rate); artificerPrice = artificerPrice.setScale(2, BigDecimal.ROUND_HALF_UP); - projectBenefits = projectBenefits.multiply(artificer.getRate()); - projectBenefits = projectBenefits.multiply(rate); - projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); - orders.setProjectBenefits(projectBenefits); +// projectBenefits = projectBenefits.multiply(rate); +// projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); +// orders.setProjectBenefits(projectBenefits); + orders.setProjectBenefits(artificerPrice); }else{ orders.setValueStorageDeduction(BigDecimal.ZERO); //计算技师项目提成金额 - projectBenefits = projectBenefits.multiply(artificer.getRate()); - projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); - orders.setProjectBenefits(projectBenefits); +// orders.setProjectBenefits(projectBenefits); + orders.setProjectBenefits(artificerPrice); } UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); @@ -2262,16 +2263,17 @@ public class OrdersServiceImpl extends ServiceImpl implements //设置出租车扣款为0 ordersOld.setPingTaxiMoney(BigDecimal.ZERO); } - - BigDecimal massageMoney = oldOrders.getMassageMoney(); - if(oldOrders.getCouponMoney()!=null){ - massageMoney = massageMoney.subtract(oldOrders.getCouponMoney()); - } - BigDecimal projectBenefits = massageMoney; //计算用户收益 BigDecimal oldArtificerPrice = oldOrders.getPayMoney().subtract(oldOrders.getTaxiMoney()); oldArtificerPrice = oldArtificerPrice.multiply(artificer.getRate()); oldArtificerPrice = oldArtificerPrice.setScale(2, BigDecimal.ROUND_HALF_UP); +// BigDecimal massageMoney = oldOrders.getMassageMoney(); +// if(oldOrders.getCouponMoney()!=null){ +// massageMoney = massageMoney.subtract(oldOrders.getCouponMoney()); +// } +// BigDecimal projectBenefits = massageMoney; +// projectBenefits = projectBenefits.multiply(artificer.getRate()); +// projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); if(oldOrders.getPayWay().equals(5)){ BigDecimal rate = new BigDecimal(commonInfoService.findOne(449).getValue()); ordersOld.setWalletRate(rate); @@ -2282,16 +2284,15 @@ public class OrdersServiceImpl extends ServiceImpl implements ordersOld.setValueStorageDeduction(oldValueStorageDeduction); oldArtificerPrice = oldArtificerPrice.multiply(rate); oldArtificerPrice = oldArtificerPrice.setScale(2, BigDecimal.ROUND_HALF_UP); - projectBenefits = projectBenefits.multiply(artificer.getRate()); - projectBenefits = projectBenefits.multiply(rate); - projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); - ordersOld.setProjectBenefits(projectBenefits); +// projectBenefits = projectBenefits.multiply(rate); +// projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); +// ordersOld.setProjectBenefits(projectBenefits); + ordersOld.setProjectBenefits(oldArtificerPrice); }else{ ordersOld.setValueStorageDeduction(BigDecimal.ZERO); //计算技师项目提成金额 - projectBenefits = projectBenefits.multiply(artificer.getRate()); - projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); - ordersOld.setProjectBenefits(projectBenefits); +// ordersOld.setProjectBenefits(projectBenefits); + ordersOld.setProjectBenefits(oldArtificerPrice); } UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); @@ -3305,40 +3306,40 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setPingTaxiMoney(pingTaxiMoney); UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); - UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); - BigDecimal oneArtificerMoney = BigDecimal.ZERO; - if (oneArtificerUser != null && oneArtificerUser.getIsAgency() != null && oneArtificerUser.getIsAgency() == 1) { - orders.setOneArtificerUserId(oneArtificerUser.getUserId()); - orders.setOneArtificerUserName(oneArtificerUser.getUserName()); - } - orders.setOneArtificerMoney(oneArtificerMoney); - BigDecimal shopMoney = BigDecimal.ZERO; - if (artificerUser.getConsortiaId() != null) { - Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId()); - if (consortia != null && consortia.getUserId() != null) { - UserEntity consortiaUser = userService.getById(consortia.getUserId()); - if (consortiaUser != null) { - orders.setConsortiaId(consortia.getConsortiaId()); - orders.setShopUserId(consortiaUser.getUserId()); - orders.setShopUserName(consortiaUser.getUserName()); - } - } - } - orders.setShopMoney(shopMoney); - artificerTaxiMoney = artificerTaxiMoney.subtract(oneArtificerMoney); - artificerTaxiMoney = artificerTaxiMoney.subtract(shopMoney); +// UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); +// BigDecimal oneArtificerMoney = BigDecimal.ZERO; +// if (oneArtificerUser != null && oneArtificerUser.getIsAgency() != null && oneArtificerUser.getIsAgency() == 1) { +// orders.setOneArtificerUserId(oneArtificerUser.getUserId()); +// orders.setOneArtificerUserName(oneArtificerUser.getUserName()); +// } +// orders.setOneArtificerMoney(oneArtificerMoney); +// BigDecimal shopMoney = BigDecimal.ZERO; +// if (artificerUser.getConsortiaId() != null) { +// Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId()); +// if (consortia != null && consortia.getUserId() != null) { +// UserEntity consortiaUser = userService.getById(consortia.getUserId()); +// if (consortiaUser != null) { +// orders.setConsortiaId(consortia.getConsortiaId()); +// orders.setShopUserId(consortiaUser.getUserId()); +// orders.setShopUserName(consortiaUser.getUserName()); +// } +// } +// } +// orders.setShopMoney(shopMoney); +// artificerTaxiMoney = artificerTaxiMoney.subtract(oneArtificerMoney); +// artificerTaxiMoney = artificerTaxiMoney.subtract(shopMoney); orders.setArtificerMoney(artificerTaxiMoney); orders.setSumArtificerMoney(artificerTaxiMoney); - UserEntity user = userService.selectUserById(orders.getUserId()); - UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode()); - BigDecimal oneUserMoney = BigDecimal.ZERO; - if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) { - orders.setOneUserId(oneUser.getUserId()); - orders.setOneUserName(oneUser.getUserName()); - } - orders.setOneUserMoney(oneUserMoney); - orders.setPingMoney(BigDecimal.ZERO); +// UserEntity user = userService.selectUserById(orders.getUserId()); +// UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode()); +// BigDecimal oneUserMoney = BigDecimal.ZERO; +// if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) { +// orders.setOneUserId(oneUser.getUserId()); +// orders.setOneUserName(oneUser.getUserName()); +// } +// orders.setOneUserMoney(oneUserMoney); +// orders.setPingMoney(BigDecimal.ZERO); userMoneyService.updateMoney(1, artificerUser.getUserId(), orders.getSumArtificerMoney().doubleValue()); userMoneyDetails = new UserMoneyDetails(); @@ -3748,40 +3749,40 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setPingTaxiMoney(pingTaxiMoney); UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); - UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); - BigDecimal oneArtificerMoney = BigDecimal.ZERO; - if (oneArtificerUser != null && oneArtificerUser.getIsAgency() != null && oneArtificerUser.getIsAgency() == 1) { - orders.setOneArtificerUserId(oneArtificerUser.getUserId()); - orders.setOneArtificerUserName(oneArtificerUser.getUserName()); - } - orders.setOneArtificerMoney(oneArtificerMoney); - BigDecimal shopMoney = BigDecimal.ZERO; - if (artificerUser.getConsortiaId() != null) { - Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId()); - if (consortia != null && consortia.getUserId() != null) { - UserEntity consortiaUser = userService.getById(consortia.getUserId()); - if (consortiaUser != null) { - orders.setConsortiaId(consortia.getConsortiaId()); - orders.setShopUserId(consortiaUser.getUserId()); - orders.setShopUserName(consortiaUser.getUserName()); - } - } - } - orders.setShopMoney(shopMoney); - artificerTaxiMoney = artificerTaxiMoney.subtract(oneArtificerMoney); - artificerTaxiMoney = artificerTaxiMoney.subtract(shopMoney); +// UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); +// BigDecimal oneArtificerMoney = BigDecimal.ZERO; +// if (oneArtificerUser != null && oneArtificerUser.getIsAgency() != null && oneArtificerUser.getIsAgency() == 1) { +// orders.setOneArtificerUserId(oneArtificerUser.getUserId()); +// orders.setOneArtificerUserName(oneArtificerUser.getUserName()); +// } +// orders.setOneArtificerMoney(oneArtificerMoney); +// BigDecimal shopMoney = BigDecimal.ZERO; +// if (artificerUser.getConsortiaId() != null) { +// Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId()); +// if (consortia != null && consortia.getUserId() != null) { +// UserEntity consortiaUser = userService.getById(consortia.getUserId()); +// if (consortiaUser != null) { +// orders.setConsortiaId(consortia.getConsortiaId()); +// orders.setShopUserId(consortiaUser.getUserId()); +// orders.setShopUserName(consortiaUser.getUserName()); +// } +// } +// } +// orders.setShopMoney(shopMoney); +// artificerTaxiMoney = artificerTaxiMoney.subtract(oneArtificerMoney); +// artificerTaxiMoney = artificerTaxiMoney.subtract(shopMoney); orders.setArtificerMoney(artificerTaxiMoney); orders.setSumArtificerMoney(artificerTaxiMoney); - UserEntity user = userService.selectUserById(orders.getUserId()); - UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode()); - BigDecimal oneUserMoney = BigDecimal.ZERO; - if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) { - orders.setOneUserId(oneUser.getUserId()); - orders.setOneUserName(oneUser.getUserName()); - } - orders.setOneUserMoney(oneUserMoney); - orders.setPingMoney(BigDecimal.ZERO); +// UserEntity user = userService.selectUserById(orders.getUserId()); +// UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode()); +// BigDecimal oneUserMoney = BigDecimal.ZERO; +// if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) { +// orders.setOneUserId(oneUser.getUserId()); +// orders.setOneUserName(oneUser.getUserName()); +// } +// orders.setOneUserMoney(oneUserMoney); +// orders.setPingMoney(BigDecimal.ZERO); userMoneyService.updateMoney(1, artificerUser.getUserId(), orders.getSumArtificerMoney().doubleValue()); userMoneyDetails = new UserMoneyDetails(); @@ -4813,17 +4814,21 @@ public class OrdersServiceImpl extends ServiceImpl implements //计算用户收益 ！计算前先减去通行费用再计算技师抽成 artificerPrice = subtract.multiply(artificer.getRate()); artificerPrice = artificerPrice.setScale(2, BigDecimal.ROUND_HALF_UP); + //储值扣费 valueStorageDeduction = artificerPrice.multiply(storageRate);//技师提成中扣除金额 valueStorageDeduction = valueStorageDeduction.setScale(2, BigDecimal.ROUND_HALF_UP); orders.setValueStorageDeduction(valueStorageDeduction); - BigDecimal projectBenefits = orders.getProjectBenefits().multiply(rate); - projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); - orders.setProjectBenefits(projectBenefits); + //用户收益不含交通费 artificerPrice = artificerPrice.multiply(rate); artificerPrice = artificerPrice.setScale(2, BigDecimal.ROUND_HALF_UP); +// BigDecimal projectBenefits = orders.getProjectBenefits().multiply(rate); +// projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); +// orders.setProjectBenefits(projectBenefits); + orders.setProjectBenefits(artificerPrice); + UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); BigDecimal oneArtificerMoney = BigDecimal.ZERO; @@ -4882,6 +4887,7 @@ public class OrdersServiceImpl extends ServiceImpl implements if(orders.getIsSupplement() != null){ if(!orders.getIsSupplement().equals(2)){ Orders oldOrders = baseMapper.selectById(orders.getOrdersId()); + BigDecimal projectBenefits = orders.getProjectBenefits(); projectBenefits = projectBenefits.add(oldOrders.getProjectBenefits()); orders.setProjectBenefits(projectBenefits); } @@ -5210,13 +5216,16 @@ public class OrdersServiceImpl extends ServiceImpl implements valueStorageDeduction = artificerPrice.multiply(storageRate);//技师提成中扣除金额 valueStorageDeduction = valueStorageDeduction.setScale(2, BigDecimal.ROUND_HALF_UP); orders.setValueStorageDeduction(valueStorageDeduction); - BigDecimal projectBenefits = orders.getProjectBenefits().multiply(rate); - projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); - orders.setProjectBenefits(projectBenefits); + //用户收益不含交通费 artificerPrice = artificerPrice.multiply(rate); artificerPrice = artificerPrice.setScale(2, BigDecimal.ROUND_HALF_UP); +// BigDecimal projectBenefits = orders.getProjectBenefits().multiply(rate); +// projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); +// orders.setProjectBenefits(projectBenefits); + orders.setProjectBenefits(artificerPrice); + UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); BigDecimal oneArtificerMoney = BigDecimal.ZERO; @@ -5274,6 +5283,7 @@ public class OrdersServiceImpl extends ServiceImpl implements if(orders.getIsSupplement() != null){ if(!orders.getIsSupplement().equals(2)){ Orders oldOrders = baseMapper.selectById(orders.getOrdersId()); + BigDecimal projectBenefits = orders.getProjectBenefits(); projectBenefits = projectBenefits.add(oldOrders.getProjectBenefits()); orders.setProjectBenefits(projectBenefits); } @@ -6690,7 +6700,11 @@ public class OrdersServiceImpl extends ServiceImpl implements BigDecimal sy = ordersDao.selectOrdersArtificerIntegralEarnings(artificerId,endDate,startDate); userMoneyArtificerDetails.setTotalRevenue(sy); + BigDecimal xmsy = ordersDao.selectOrdersArtificerIntegralProjectEarnings(artificerId,endDate,startDate); + userMoneyArtificerDetails.setProjectBenefits(xmsy); + BigDecimal cfsy = sy.subtract(xmsy); + userMoneyArtificerDetails.setVehicleFareAmount(cfsy); //资金明细添加到返回对象中 return Result.success().put("data", userMoneyArtificerDetails); 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 eb6028f..5d170ba 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 @@ -618,13 +618,16 @@ public class AliPayController { valueStorageDeduction = artificerPrice.multiply(storageRate);//技师提成中扣除金额 valueStorageDeduction = valueStorageDeduction.setScale(2, BigDecimal.ROUND_HALF_UP); orders.setValueStorageDeduction(valueStorageDeduction); - BigDecimal projectBenefits = orders.getProjectBenefits().multiply(rate); - projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); - orders.setProjectBenefits(projectBenefits); + //用户收益不含交通费 artificerPrice = artificerPrice.multiply(rate); artificerPrice = artificerPrice.setScale(2, BigDecimal.ROUND_HALF_UP); +// BigDecimal projectBenefits = orders.getProjectBenefits().multiply(rate); +// projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); +// orders.setProjectBenefits(projectBenefits); + orders.setProjectBenefits(artificerPrice); + UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); BigDecimal oneArtificerMoney = BigDecimal.ZERO; @@ -1548,13 +1551,16 @@ public class AliPayController { valueStorageDeduction = artificerPrice.multiply(storageRate);//技师提成中扣除金额 valueStorageDeduction = valueStorageDeduction.setScale(2, BigDecimal.ROUND_HALF_UP); orders.setValueStorageDeduction(valueStorageDeduction); - BigDecimal projectBenefits = orders.getProjectBenefits().multiply(rate); - projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); - orders.setProjectBenefits(projectBenefits); + //用户收益不含交通费 artificerPrice = artificerPrice.multiply(rate); artificerPrice = artificerPrice.setScale(2, BigDecimal.ROUND_HALF_UP); +// BigDecimal projectBenefits = orders.getProjectBenefits().multiply(rate); +// projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); +// orders.setProjectBenefits(projectBenefits); + orders.setProjectBenefits(artificerPrice); + UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); BigDecimal oneArtificerMoney = BigDecimal.ZERO; 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 e92d77b..b078609 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 @@ -1148,13 +1148,16 @@ public class WxServiceImpl implements WxService { valueStorageDeduction = artificerPrice.multiply(storageRate);//技师提成中扣除金额 valueStorageDeduction = valueStorageDeduction.setScale(2, BigDecimal.ROUND_HALF_UP); orders.setValueStorageDeduction(valueStorageDeduction); - BigDecimal projectBenefits = orders.getProjectBenefits().multiply(rate); - projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); - orders.setProjectBenefits(projectBenefits); + //用户收益不含交通费 artificerPrice = artificerPrice.multiply(rate); artificerPrice = artificerPrice.setScale(2, BigDecimal.ROUND_HALF_UP); +// BigDecimal projectBenefits = orders.getProjectBenefits().multiply(rate); +// projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); +// orders.setProjectBenefits(projectBenefits); + orders.setProjectBenefits(artificerPrice); + UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); BigDecimal oneArtificerMoney = BigDecimal.ZERO; @@ -1786,13 +1789,16 @@ public class WxServiceImpl implements WxService { valueStorageDeduction = artificerPrice.multiply(storageRate);//技师提成中扣除金额 valueStorageDeduction = valueStorageDeduction.setScale(2, BigDecimal.ROUND_HALF_UP); orders.setValueStorageDeduction(valueStorageDeduction); - BigDecimal projectBenefits = orders.getProjectBenefits().multiply(rate); - projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); - orders.setProjectBenefits(projectBenefits); + //用户收益不含交通费 artificerPrice = artificerPrice.multiply(rate); artificerPrice = artificerPrice.setScale(2, BigDecimal.ROUND_HALF_UP); +// BigDecimal projectBenefits = orders.getProjectBenefits().multiply(rate); +// projectBenefits = projectBenefits.setScale(2, BigDecimal.ROUND_HALF_UP); +// orders.setProjectBenefits(projectBenefits); + orders.setProjectBenefits(artificerPrice); + UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); BigDecimal oneArtificerMoney = BigDecimal.ZERO; diff --git a/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java b/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java index 507c9dc..ff8b8fa 100644 --- a/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java +++ b/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java @@ -61,7 +61,7 @@ public class AllTaskServiceImpl implements AllTaskSercice { * A0,A1,A2,A3,A4,A5等 */ // @Scheduled(cron = "0 * * * * ?") - @Scheduled(cron = "0 25 17 * * ?") +// @Scheduled(cron = "0 00 21 * * ?") public void upgradeJishi() { System.out.println("------------计算技师升级规则-----------"); //1.获取全部参与积分规则的技师 @@ -84,7 +84,7 @@ public class AllTaskServiceImpl implements AllTaskSercice { String lastMonth = format.format(calendar2.getTime()); startTime = lastMonth+"-21 00:00:00"; endTime = lastMonth+"-"+lastDayOfMonth+" 23:59:59"; - }else if(dayOfMonth == 12){ + }else if(dayOfMonth == 11){ Calendar calendar4 = Calendar.getInstance(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM"); String lastMonth = format.format(calendar4.getTime()); @@ -182,7 +182,6 @@ public class AllTaskServiceImpl implements AllTaskSercice { } } - //技师汇总逻辑 QueryWrapper blArtificerZqhzQueryWrapper = new QueryWrapper<>(); blArtificerZqhzQueryWrapper.eq("artificer_id",jsPar.getArtificerId()); @@ -205,9 +204,6 @@ public class AllTaskServiceImpl implements AllTaskSercice { blArtificerZqhz.setZxsc(zxscHour+""); blArtificerZqhz.setJf(jsjfStr); blArtificerZqhzDao.insert(blArtificerZqhz); - - - } } } diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml index 86361de..77cb9e5 100644 --- a/src/main/resources/mapper/artificer/OrdersDao.xml +++ b/src/main/resources/mapper/artificer/OrdersDao.xml @@ -1248,6 +1248,53 @@ and o.status in (3,5) ) t + +