From 6cf53afc9c31f58231968653a08de1676ef7b2d9 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Thu, 7 Nov 2024 10:41:30 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=A1=A5=E6=AD=A3=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tickets/service/impl/DlRepairTicketsServiceImpl.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
index 440ec04a..4131ee8f 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
@@ -433,13 +433,18 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         RepairOrderInfo repairOrderInfo = new RepairOrderInfo();
         repairOrderInfo.setId(one.getId());
         repairOrderInfo.setPayType(repairTicketsRespVO.getPayType());
-        repairOrderInfoService.updateById(repairOrderInfo);
+
         // 更新工单
         // 在这里把工单的状态更新为已完成---需要判断，如果是线上支付，需要在支付回调更新
         if (!repairTicketsRespVO.getPayType().equals("01")){
             repairTicketsRespVO.setIsFinish("1");
             baseMapper.updateById(repairTicketsRespVO);
+        }else {
+            // 线下结账和签单挂账，直接算已支付
+            repairOrderInfo.setPayTime(LocalDateTime.now());
+            repairOrderInfo.setOrderStatus("1");
         }
+        repairOrderInfoService.updateById(repairOrderInfo);
     }
 
     /**

From cf4cf9e246280aa87e3a10eac3a958f3abe6a8cf Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Thu, 7 Nov 2024 10:49:52 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=9A=84=E7=BB=B4=E4=BF=AE=E7=B1=BB=E5=88=AB=E4=B8=BA=E7=BB=B4?=
 =?UTF-8?q?=E4=BF=AE=E4=BF=9D=E5=85=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/tickets/service/impl/DlRepairTicketsServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
index 4131ee8f..1d3d0b31 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
@@ -270,7 +270,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         if (ObjectUtil.isNotEmpty(repairType)) {
             repairOrderInfo.setGoodsTitle(repairType.getLabel());
         } else {
-            repairOrderInfo.setGoodsTitle("维修费用");
+            repairOrderInfo.setGoodsTitle("维修保养");
         }
         repairOrderInfo.setGoodsType("2");
         CustomerMainRespVO customerById = customerMainService.getCustomerById(ticketsRespVO.getUserId());

From 83fd022dfcbeda1ac8ec5b0899d074a34cf06c36 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Thu, 7 Nov 2024 10:53:08 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=9A=84=E7=BB=B4=E4=BF=AE=E7=B1=BB=E5=88=AB=E4=B8=BA=E7=BB=B4?=
 =?UTF-8?q?=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/tickets/service/impl/DlRepairTicketsServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
index 1d3d0b31..544e21db 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
@@ -270,7 +270,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         if (ObjectUtil.isNotEmpty(repairType)) {
             repairOrderInfo.setGoodsTitle(repairType.getLabel());
         } else {
-            repairOrderInfo.setGoodsTitle("维修保养");
+            repairOrderInfo.setGoodsTitle("维修");
         }
         repairOrderInfo.setGoodsType("2");
         CustomerMainRespVO customerById = customerMainService.getCustomerById(ticketsRespVO.getUserId());

From 1e0df9f82b72a4c15fe3b9a7c144a575f327b5b1 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Thu, 7 Nov 2024 11:07:10 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=AD=90=E9=A1=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/tickets/service/impl/DlRepairTitemServiceImpl.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java
index 451b4a73..14e735d6 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java
@@ -98,6 +98,7 @@ public class DlRepairTitemServiceImpl extends ServiceImpl<DlRepairTitemMapper, D
         titem.setItemCount(dlRepairTitemReqVO.getItemCount());
         titem.setItemPrice(dlRepairTitemReqVO.getItemPrice());
         titem.setItemDiscount(dlRepairTitemReqVO.getItemDiscount());
+        titem.setItemStatus(dlRepairTitemReqVO.getItemStatus());
         // 计算总价
         BigDecimal total = titem.getItemPrice().multiply(BigDecimal.valueOf(titem.getItemCount())).multiply(titem.getItemDiscount());
         titem.setItemMoney(total);

From fae6ae48822d73d1214cf5c25789ede971dfa630 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Thu, 7 Nov 2024 11:53:08 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E4=BA=86=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E9=A1=BE=E9=97=AE=EF=BC=8C=E6=B6=88=E6=81=AF=E5=B8=A6?=
 =?UTF-8?q?=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/booking/service/impl/DlRepairBookingServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/service/impl/DlRepairBookingServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/service/impl/DlRepairBookingServiceImpl.java
index 1ea90272..3e035c72 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/service/impl/DlRepairBookingServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/service/impl/DlRepairBookingServiceImpl.java
@@ -97,7 +97,7 @@ public class DlRepairBookingServiceImpl extends ServiceImpl<DlRepairBookingMappe
         // 选择了服务顾问
         if (ObjectUtil.isNotEmpty(repairBookingRespVO.getAdviserId())){
             // 发送消息通知
-            repairWorkerService.sentMessage(Long.valueOf(repairBookingRespVO.getAdviserId()), message);
+            repairWorkerService.sentMessage(Long.valueOf(repairBookingRespVO.getAdviserId()), message + "，预约的服务顾问为：" + repairBookingRespVO.getAdviserName());
         }else {
         // 没选服务顾问
             // 获取所有的服务顾问

From 79ad252cb59f9f4357806e69bd6ad02d81b167bc Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Thu, 7 Nov 2024 14:18:42 +0800
Subject: [PATCH 6/6] 1

---
 .../booking/controller/admin/DlRepairBookingController.java     | 1 +
 .../module/tickets/service/impl/DlRepairTicketsServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/controller/admin/DlRepairBookingController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/controller/admin/DlRepairBookingController.java
index 2d57cd29..c669f3ac 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/controller/admin/DlRepairBookingController.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/controller/admin/DlRepairBookingController.java
@@ -108,6 +108,7 @@ public class DlRepairBookingController {
         Map<String,String> repairTypeMap = repairTypeList.stream().collect(Collectors.toMap(DictDataRespDTO::getValue,DictDataRespDTO::getLabel));
         List<DlRepairBooking> respVOList = dlRepairBookingService.list(new LambdaQueryWrapper<DlRepairBooking>()
                 .eq(DlRepairBooking::getUserId,userId)
+                .isNull(DlRepairBooking::getTicketsId)
                 .orderByDesc(DlRepairBooking::getBookingTime));
         List<DlRepairBookingRespVO> rtnList = new ArrayList<>();
         for(DlRepairBooking booking:respVOList){
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
index 440ec04a..b03f8d97 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
@@ -1052,7 +1052,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
             施工完成又分四种情况：阶段完成、完成并移交下一班组、完成并移交总检、完成工单，其中部分完成同开始施工、施工中的记录上传一致，只上传，不改变
           */
         // 消息生成
-        String message = createMessage(tickets.getNowRepairName(), tickets.getCarNo(), titem.getItemName(), respVO.getRecordType(), respVO.getFinishType(), respVO.getNextName());
+        String message = createMessage(tickets.getNowRepairName(), tickets.getCarNo(),null==titem?"":titem.getItemName(), respVO.getRecordType(), respVO.getFinishType(), respVO.getNextName());
         // 通知服务顾问
         // 如果员工完成了订单
         if (RecordTypeEnum.SGWCZJ.getCode().equals(respVO.getRecordType()) && "03".equals(respVO.getFinishType())) {