diff --git a/src/main/java/com/sqx/modules/artificer/entity/Orders.java b/src/main/java/com/sqx/modules/artificer/entity/Orders.java index ca26311..21d4987 100644 --- a/src/main/java/com/sqx/modules/artificer/entity/Orders.java +++ b/src/main/java/com/sqx/modules/artificer/entity/Orders.java @@ -190,6 +190,11 @@ public class Orders implements Serializable { */ private BigDecimal addMoney; + /** + * 加钟项目收益 + */ + private BigDecimal addProjectBenefits; + /** * 加钟技师价 */ 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 cd682cb..60dea5b 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 @@ -820,7 +820,9 @@ public class OrdersServiceImpl extends ServiceImpl implements } } //加上车费 - orders.setPayMoney(payMoney.add(taxiMoney)); + payMoney = payMoney.add(taxiMoney); + payMoney = payMoney.setScale(2,BigDecimal.ROUND_HALF_UP); + orders.setPayMoney(payMoney); //查询是否计算出租车扣费 String taxi = commonInfoService.findOne(394).getValue(); @@ -1046,7 +1048,9 @@ public class OrdersServiceImpl extends ServiceImpl implements } } //加上车费 - orders.setPayMoney(payMoney.add(taxiMoney)); + payMoney = payMoney.add(taxiMoney); + payMoney = payMoney.setScale(2,BigDecimal.ROUND_HALF_UP); + orders.setPayMoney(payMoney); //查询是否计算出租车扣费 String taxi = commonInfoService.findOne(394).getValue(); @@ -1255,6 +1259,7 @@ public class OrdersServiceImpl extends ServiceImpl implements } BigDecimal taxiMoney = new BigDecimal(travelPriceVo.getTravelPrice()); + taxiMoney = taxiMoney.setScale(2,BigDecimal.ROUND_HALF_UP); orders.setTaxiMoney(taxiMoney); orders.setKm(travelPriceVo.getKilometerNum()); orders.setPayMoney(taxiMoney); @@ -1618,7 +1623,9 @@ public class OrdersServiceImpl extends ServiceImpl implements massageMoney = massageMoney.subtract(oldOrders.getCouponMoney()); } //加上车费 - orders.setPayMoney(massageMoney.add(taxiMoney)); + BigDecimal payMoney = massageMoney.add(taxiMoney); + payMoney = payMoney.setScale(2,BigDecimal.ROUND_HALF_UP); + orders.setPayMoney(payMoney); BigDecimal artificerPrice = BigDecimal.ZERO; Artificer artificer = artificerService.getById(orders.getArtificerId()); //查询是否计算出租车扣费 @@ -1845,7 +1852,9 @@ public class OrdersServiceImpl extends ServiceImpl implements } } //加上车费 - orders.setPayMoney(payMoney.add(taxiMoney)); + payMoney = payMoney.add(taxiMoney); + payMoney = payMoney.setScale(2,BigDecimal.ROUND_HALF_UP); + orders.setPayMoney(payMoney); //查询是否计算出租车扣费 String taxi = commonInfoService.findOne(394).getValue(); @@ -2023,6 +2032,7 @@ public class OrdersServiceImpl extends ServiceImpl implements BigDecimal massagePrice = price.multiply(orders.getTechnicianRate()).divide(new BigDecimal(100)).add(price);//技师等级加成金额 massagePrice = massagePrice.multiply(orders.getVipRate()).divide(new BigDecimal(100));//会员优惠后金额 + massagePrice = massagePrice.setScale(2,BigDecimal.ROUND_HALF_UP); orders.setMassageMoney(massagePrice); //项目差价 @@ -2035,6 +2045,7 @@ public class OrdersServiceImpl extends ServiceImpl implements } BigDecimal taxiMoney = new BigDecimal(travelPriceVo.getTravelPrice()); + taxiMoney = taxiMoney.setScale(2,BigDecimal.ROUND_HALF_UP); BigDecimal oldTaxiMoney = oldOrders.getTaxiMoney(); if (taxiMoney.compareTo(oldTaxiMoney) < 0) { taxiMoney = oldTaxiMoney; @@ -4930,9 +4941,11 @@ public class OrdersServiceImpl extends ServiceImpl implements if (orders1.getAddMoney() != null) { orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney())); orders1.setAddArtificerMoney(orders1.getAddArtificerMoney().add(orders.getArtificerMoney())); + orders1.setAddProjectBenefits(orders1.getProjectBenefits().add(orders.getProjectBenefits())); } else { orders1.setAddMoney(orders.getPayMoney()); orders1.setAddArtificerMoney(orders.getArtificerMoney()); + orders1.setAddProjectBenefits(orders.getProjectBenefits()); } orders1.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney())); orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney())); @@ -4941,7 +4954,6 @@ public class OrdersServiceImpl extends ServiceImpl implements orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney())); orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); - orders1.setProjectBenefits(orders1.getProjectBenefits().add(orders.getProjectBenefits())); if (orders1.getStatus().equals(6)) { String endTime = orders1.getEndTime(); @@ -5327,9 +5339,11 @@ public class OrdersServiceImpl extends ServiceImpl implements if (orders1.getAddMoney() != null) { orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney())); orders1.setAddArtificerMoney(orders1.getAddArtificerMoney().add(orders.getArtificerMoney())); + orders1.setAddProjectBenefits(orders1.getProjectBenefits().add(orders.getProjectBenefits())); } else { orders1.setAddMoney(orders.getPayMoney()); orders1.setAddArtificerMoney(orders.getArtificerMoney()); + orders1.setAddProjectBenefits(orders.getProjectBenefits()); } orders1.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney())); orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney())); diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml index b8af759..b82d48f 100644 --- a/src/main/resources/mapper/artificer/OrdersDao.xml +++ b/src/main/resources/mapper/artificer/OrdersDao.xml @@ -1255,11 +1255,10 @@ select IFNULL(SUM(project_benefits_total),0) AS projectBenefits from ( select - ifnull(o.project_benefits,0) - ifnull(o.shop_money,0) - ifnull(o.one_artificer_money,0) - + ifnull(o2.project_benefits,0) - ifnull(o2.shop_money,0) - ifnull(o2.one_artificer_money,0) - + ifnull(o3.project_benefits,0) - ifnull(o3.shop_money,0) - ifnull(o3.one_artificer_money,0) + ifnull(o.project_benefits,0) + ifnull(o.add_project_benefits,0) - ifnull(o.shop_money,0) - ifnull(o.one_artificer_money,0) + + ifnull(o2.project_benefits,0) + ifnull(o2.add_project_benefits,0) - ifnull(o2.shop_money,0) - ifnull(o2.one_artificer_money,0) + + ifnull(o3.project_benefits,0) + ifnull(o3.add_project_benefits,0) - ifnull(o3.shop_money,0) - ifnull(o3.one_artificer_money,0) as project_benefits_total - from orders o left join orders o2 on o.old_orders_id = o2.orders_id and o2.status != 4 left join orders o3 on o2.old_orders_id = o3.orders_id and o3.status != 4 @@ -1274,7 +1273,7 @@ and o.status in (3,5) union all - select ifnull(o.project_benefits,0) - ifnull(o.shop_money,0) - ifnull(o.one_artificer_money,0) as project_benefits_total + select ifnull(o.project_benefits,0) + ifnull(o.add_project_benefits,0) - ifnull(o.shop_money,0) - ifnull(o.one_artificer_money,0) as project_benefits_total from orders o where o.artificer_id = #{artificerId} and o.parent_id = 0