From 1617e713fb0a1f7ed8fb879fcb268da89c219eec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Fri, 12 Dec 2025 16:59:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-=E8=AF=B7?=
 =?UTF-8?q?=E9=A2=86=E6=B5=81=E7=A8=8BBUG=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nu/entity/InvoicingOrdersEntity.java  |  6 +++
 .../order/entity/InvoicingOrders.java         |  6 +++
 .../order/mapper/InvoicingOrdersMapper.java   |  1 +
 .../mapper/xml/InvoicingOrdersMapper.xml      | 11 ++++--
 .../service/impl/EmpOrdersServiceImpl.java    |  4 +-
 .../impl/InvoicingOrdersServiceImpl.java      |  6 +++
 .../service/impl/QlOrdersServiceImpl.java     | 39 ++++++++++---------
 7 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingOrdersEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingOrdersEntity.java
index af8940a7..d310ae85 100644
--- a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingOrdersEntity.java
+++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingOrdersEntity.java
@@ -71,6 +71,12 @@ public class InvoicingOrdersEntity implements Serializable {
     private String serviceDuration;
     /**服务描述*/
     private String serviceContent;
+    /**收费价格*/
+    private BigDecimal tollPrice;
+    /**提成价格*/
+    private BigDecimal comPrice;
+    /**实际提成价格*/
+    private BigDecimal realComPrice;
     /**开始时间*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/entity/InvoicingOrders.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/entity/InvoicingOrders.java
index ccb9d873..6f308ac6 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/entity/InvoicingOrders.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/entity/InvoicingOrders.java
@@ -79,6 +79,12 @@ public class InvoicingOrders implements Serializable {
     private String serviceDuration;
     /**服务描述*/
     private String serviceContent;
+    /**收费价格*/
+    private BigDecimal tollPrice;
+    /**提成价格*/
+    private BigDecimal comPrice;
+    /**实际提成价格*/
+    private BigDecimal realComPrice;
     /**开始时间*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/InvoicingOrdersMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/InvoicingOrdersMapper.java
index 36dd255d..603cef31 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/InvoicingOrdersMapper.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/InvoicingOrdersMapper.java
@@ -16,6 +16,7 @@ import java.util.List;
  */
 public interface InvoicingOrdersMapper extends BaseMapper<InvoicingOrders> {
     InvoicingOrders getOnLineEmployeeById(@Param("employeeId") String employeeId);
+    InvoicingOrders getDirectivePrice(@Param("directiveId") String directiveId);
     List<InvoicingOrders> queryDataPoolList(InvoicingOrders orders);
     List<InvoicingOrders> getEmpPermissionAndOnline(@Param("directiveId") String directiveId, @Param("startTime") Date startTime);
     InvoicingOrders getEmpOrderly(@Param("customerId") String customerId);
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml
index 23e5767f..fc119ff7 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml
@@ -13,6 +13,14 @@
           and a.id = #{employeeId}
     </select>
 
+    <select id="getDirectivePrice" resultType="com.nu.modules.biz.invoicing.order.entity.InvoicingOrders">
+        select
+            toll_price as tollPrice,
+            com_price as comPrice
+        from nu_config_service_directive a
+        where b.id = #{directiveId}
+    </select>
+
     <select id="queryDataPoolList" resultType="com.nu.modules.biz.invoicing.order.entity.InvoicingOrders">
         select
             a.id as poolId,
@@ -36,9 +44,6 @@
             a.net_mp4_file as netMp4File,
             a.service_duration as serviceDuration,
             a.service_content as serviceContent,
-            a.package_id as packageId,
-            a.package_name as packageName,
-            a.iz_package as izPackage,
             a.start_time as startTime,
             a.end_time as endTime,
             (case when b.orderly is null then 2 else 1 end) as orderEmp
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/EmpOrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/EmpOrdersServiceImpl.java
index 629b1729..19671412 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/EmpOrdersServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/EmpOrdersServiceImpl.java
@@ -106,11 +106,11 @@ public class EmpOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMapper, Inv
     @Override
     public InvoicingOrders employeeScreening(String directiveId, String customerId, Date startTime) {
         getSendOrderRule();
-        if (sendOrderRule.getRuleCode().equals("1")) {
+        if (sendOrderRule.getRuleCode().equals(1)) {
             //按优先级
             return getByPriority(directiveId, customerId, startTime);
         }
-        if (sendOrderRule.getRuleCode().equals("2")) {
+        if (sendOrderRule.getRuleCode().equals(2)) {
             //按人头
             return getByHeadCount(directiveId, customerId, startTime);
         }
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java
index 45263e39..b49e0765 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java
@@ -106,6 +106,10 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
     public Result<String> finishOrder(InvoicingOrdersEntity invoicingOrdersEntity){
         try {
             Calendar c = Calendar.getInstance();
+            QueryWrapper<InvoicingOrders> ioQw = new QueryWrapper<>();
+            ioQw.eq("id", invoicingOrdersEntity.getId());
+            InvoicingOrders order = this.getOne(ioQw);
+            InvoicingOrders DirectivePrice = baseMapper.getDirectivePrice(order.getDirectiveId());//获取服务指令价格
             InvoicingOrders entity = new InvoicingOrders();
             entity.setId(invoicingOrdersEntity.getId());
             entity.setFinishTime(c.getTime());
@@ -113,6 +117,8 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
             entity.setUpdateBy(invoicingOrdersEntity.getInitiatorId());
             entity.setUpdateTime(c.getTime());
             entity.setBizType(invoicingOrdersEntity.getFlowCode());
+            entity.setTollPrice(DirectivePrice.getTollPrice());
+            entity.setComPrice(DirectivePrice.getComPrice());
             baseMapper.updateOrder(entity);
         }catch (Exception e){
             return Result.error("完成失败："+e.getMessage());
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java
index 5c8cae1d..948feca7 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java
@@ -39,22 +39,6 @@ public class QlOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMapper, Invo
     private ISysConfigApi sysConfigApi;
     private String serverNetUrl;
 
-    private InvoicingOrders getOrderInfo(InvoicingOrdersEntity invoicingOrdersEntity,InvoicingOrders flow){
-        QueryWrapper<InvoicingOrders> ioQw = new QueryWrapper<>();
-        ioQw.eq("directive_id", flow.getDirectiveId());
-        ioQw.eq("nu_id", invoicingOrdersEntity.getNuId());
-        ioQw.eq("customer_id", invoicingOrdersEntity.getCustomerId());
-        ioQw.eq("iz_finish", "N");
-        ioQw.eq("iz_rollback", "N");
-        ioQw.eq("del_flag", "0");
-        ioQw.eq("biz_type", invoicingOrdersEntity.getFlowCode());
-        if(invoicingOrdersEntity.getBizId()!=null&&!invoicingOrdersEntity.getBizId().equals("")){
-            ioQw.eq("biz_id", invoicingOrdersEntity.getBizId());
-        }
-        InvoicingOrders order = this.getOne(ioQw);
-        return order;
-    }
-
     /**
      * 请领申请
      * 护理员点击提交按钮，修改请领指令工单bizId
@@ -68,7 +52,15 @@ public class QlOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMapper, Invo
         if(flowList!=null){
             Calendar c = Calendar.getInstance();
             InvoicingOrders flow = flowList.get(0);
-            InvoicingOrders order = getOrderInfo(invoicingOrdersEntity,flow);
+            QueryWrapper<InvoicingOrders> ioQw = new QueryWrapper<>();
+            ioQw.eq("directive_id", flow.getDirectiveId());
+            ioQw.eq("nu_id", invoicingOrdersEntity.getNuId());
+            ioQw.eq("customer_id", invoicingOrdersEntity.getCustomerId());
+            ioQw.eq("iz_finish", "N");
+            ioQw.eq("iz_rollback", "N");
+            ioQw.eq("del_flag", "0");
+            ioQw.eq("biz_type", invoicingOrdersEntity.getFlowCode());
+            InvoicingOrders order = this.getOne(ioQw);
             if(order!=null){
                 //修改请领单的bizId
                 InvoicingOrders entity = new InvoicingOrders();
@@ -126,7 +118,16 @@ public class QlOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMapper, Invo
         if(flowList!=null){
             Calendar c = Calendar.getInstance();
             InvoicingOrders flow = flowList.get(0);
-            InvoicingOrders order = getOrderInfo(invoicingOrdersEntity,flow);
+            QueryWrapper<InvoicingOrders> ioQw = new QueryWrapper<>();
+            ioQw.eq("directive_id", flow.getDirectiveId());
+            ioQw.eq("nu_id", invoicingOrdersEntity.getNuId());
+            ioQw.eq("customer_id", invoicingOrdersEntity.getCustomerId());
+            ioQw.eq("iz_finish", "N");
+            ioQw.eq("iz_rollback", "N");
+            ioQw.eq("del_flag", "0");
+            ioQw.eq("biz_type", invoicingOrdersEntity.getFlowCode());
+            ioQw.eq("biz_id", invoicingOrdersEntity.getBizId());
+            InvoicingOrders order = this.getOne(ioQw);
             String initiatorId = "";
             String initiatorName = "";
             if(order!=null){
@@ -304,7 +305,7 @@ public class QlOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMapper, Invo
         nextEntity.setDelFlag("0");
         nextEntity.setInitiatorId(initiatorId);
         nextEntity.setInitiatorName(initiatorName);
-        nextEntity.setBeginTime(c.getTime());
+        nextEntity.setStartTime(c.getTime());
         c.add(Calendar.MINUTE,Integer.valueOf(flowSub.getServiceDuration()));
         nextEntity.setEndTime(c.getTime());
         nextEntity.setEmployeeId(employeeId);