From a20fdf90e44414fe3f6d0d73137f4d536fd5e294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Wed, 3 Jul 2024 21:37:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E8=A1=A5=E5=8D=95=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artificer/service/impl/OrdersServiceImpl.java    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 6b5b945..0a22186 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
@@ -789,7 +789,12 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
 
         Artificer artificer = artificerService.getById(orders.getArtificerId());
         orders.setTechnicianType(artificer.getTechnicianType());
-        orders.setTechnicianRate(BigDecimal.ZERO);
+        BigDecimal artificerVipRate = BigDecimal.ZERO;
+        VipDetails artificerVipDetails = vipDetailsDao.selectOne(new QueryWrapper<VipDetails>().eq("vip_name_type", artificer.getTechnicianType()));
+        if (artificerVipDetails != null) {
+            artificerVipRate = artificerVipDetails.getRate();
+        }
+        orders.setTechnicianRate(artificerVipRate);
         //查询是否计算出租车扣费
         String taxi = commonInfoService.findOne(394).getValue();
         //计算技师出租车收益（按照技师表收益计算）
@@ -953,6 +958,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 if (artificer.getTechnicianType() != oldArtificer.getTechnicianType()) {
                     return Result.error("当前订单技师等级与原订单技师等级不一致！");
                 }
+
                 MassageType massageType = massageTypeService.getById(massageTypeId);
                 orders.setMassageTypeId(massageTypeId);
                 orders.setEntryName(massageType.getTitle());
@@ -1043,14 +1049,14 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 orders.setArtificerRate(artificer.getRate());
                 orders.setSumMoney(orders.getPayMoney().setScale(2, BigDecimal.ROUND_HALF_UP));
                 orders.setIsSupplement(1);
-
-                orders.setTechnicianType(artificer.getTechnicianType());
+                orders.setProjectBenefits(BigDecimal.ZERO);
                 orders.setVipRate(oldOrders.getVipRate());
                 orders.setMassagePrice(oldOrders.getMassagePrice());
                 orders.setMassageNum(oldOrders.getMassageNum());
                 orders.setOrdersNo(getGeneralOrder());
                 orders.setPrice(oldOrders.getPrice());
                 orders.setCouponMoney(oldOrders.getCouponMoney());
+                orders.setTechnicianType(artificer.getTechnicianType());
                 orders.setTechnicianRate(oldOrders.getTechnicianRate());
                 orders.setDuration(oldOrders.getDuration());