From 7d0572cc6d66e0b7911278535bcd3ed8cab1312b Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 3 Apr 2025 17:24:11 +0800
Subject: [PATCH] scripts

---
 .../app/service/impl/CleaningServicesOrderServiceImpl.java  | 6 ++++--
 .../app/service/impl/TherapyAppointmentsServiceImpl.java    | 6 +++---
 .../app/service/impl/WashClothingOrderServiceImpl.java      | 2 +-
 .../src/main/resources/bootstrap-jyy_canteen_local.yml      | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/bonus-modules/bonus-shared-station/src/main/java/com/bonus/sharedstation/app/service/impl/CleaningServicesOrderServiceImpl.java b/bonus-modules/bonus-shared-station/src/main/java/com/bonus/sharedstation/app/service/impl/CleaningServicesOrderServiceImpl.java
index be6a7c8..b7247bf 100644
--- a/bonus-modules/bonus-shared-station/src/main/java/com/bonus/sharedstation/app/service/impl/CleaningServicesOrderServiceImpl.java
+++ b/bonus-modules/bonus-shared-station/src/main/java/com/bonus/sharedstation/app/service/impl/CleaningServicesOrderServiceImpl.java
@@ -56,7 +56,7 @@ public class CleaningServicesOrderServiceImpl extends ServiceImpl<CleaningServic
     private AjaxResult payment(CleaningServicesOrder dto) {
         PaymentDto bean = new PaymentDto();
         bean.setMoney(dto.getUsePrice());
-        bean.setCustId(SecurityUtils.getLoginUser().getCustId());
+        bean.setCustId(SecurityUtils.getUserId());
         try {
             if (ObjectUtil.isEmpty(dto.getUsePrice())) {
                 throw new IllegalArgumentException("价格不能为空");
@@ -80,7 +80,9 @@ public class CleaningServicesOrderServiceImpl extends ServiceImpl<CleaningServic
         } catch (Exception e) {
             //调用食堂卡退款
             AjaxResult refundResultVo = refundOperation(bean);
-            if (refundResultVo != null) return refundResultVo;
+            if (refundResultVo != null) {
+                return refundResultVo;
+            }
             //删除当前订单
             int delCode = dao.deleteById(dto.getId());
             if (delCode == 0) {
diff --git a/bonus-modules/bonus-shared-station/src/main/java/com/bonus/sharedstation/app/service/impl/TherapyAppointmentsServiceImpl.java b/bonus-modules/bonus-shared-station/src/main/java/com/bonus/sharedstation/app/service/impl/TherapyAppointmentsServiceImpl.java
index 0665aee..a355cbf 100644
--- a/bonus-modules/bonus-shared-station/src/main/java/com/bonus/sharedstation/app/service/impl/TherapyAppointmentsServiceImpl.java
+++ b/bonus-modules/bonus-shared-station/src/main/java/com/bonus/sharedstation/app/service/impl/TherapyAppointmentsServiceImpl.java
@@ -97,7 +97,7 @@ public class TherapyAppointmentsServiceImpl extends ServiceImpl<TherapyAppointme
             dto.setCreatedBy(SecurityUtils.getUsername());
             dto.setCreatedTime(new Date());
             dto.setUserId(String.valueOf(SecurityUtils.getUserId()));
-            dto.setCustId(String.valueOf(SecurityUtils.getLoginUser().getCustId()));
+            dto.setCustId(String.valueOf(SecurityUtils.getUserId()));
             dto.setIsDeleted("0");
             List<DictDataInfoDO> equipmentTypeList = dictDataApi.getDictionaryInfo("time_slot");
             //拿到数据字典
@@ -124,7 +124,7 @@ public class TherapyAppointmentsServiceImpl extends ServiceImpl<TherapyAppointme
 
         PaymentDto bean = new PaymentDto();
         bean.setMoney(dto.getProjectPrice());
-        bean.setCustId(SecurityUtils.getLoginUser().getCustId());
+        bean.setCustId(SecurityUtils.getUserId());
 
         //调用食堂卡支付
         AjaxResult result = otherServiceClient.payMoneyForStage(bean);
@@ -135,7 +135,7 @@ public class TherapyAppointmentsServiceImpl extends ServiceImpl<TherapyAppointme
 
         //新增订单信息 -- 出错调用退款
         dto.setOrderPayInfo(ajaxResultVo.getMsg());
-        dto.setCustId(String.valueOf(SecurityUtils.getLoginUser().getCustId()));
+        dto.setCustId(String.valueOf(SecurityUtils.getUserId()));
 
         AjaxResult insertOrderInfoResult = insertOrderInfo(dto, bean, ajaxResultVo);
         AjaxResultVo insertOrderInfoErrorVo = JSON.parseObject(JSON.toJSONString(insertOrderInfoResult), AjaxResultVo.class);
diff --git a/bonus-modules/bonus-shared-station/src/main/java/com/bonus/sharedstation/app/service/impl/WashClothingOrderServiceImpl.java b/bonus-modules/bonus-shared-station/src/main/java/com/bonus/sharedstation/app/service/impl/WashClothingOrderServiceImpl.java
index 3458507..9c4713c 100644
--- a/bonus-modules/bonus-shared-station/src/main/java/com/bonus/sharedstation/app/service/impl/WashClothingOrderServiceImpl.java
+++ b/bonus-modules/bonus-shared-station/src/main/java/com/bonus/sharedstation/app/service/impl/WashClothingOrderServiceImpl.java
@@ -181,7 +181,7 @@ public class WashClothingOrderServiceImpl extends ServiceImpl<WashClothingOrderM
         greenOrder.setCreatedBy(userInfo.getLoginName());
         greenOrder.setCreatedTime(new Date());
         greenOrder.setUserId(userInfo.getUserId());
-        greenOrder.setCustId(String.valueOf(SecurityUtils.getLoginUser().getCustId()));
+        greenOrder.setCustId(String.valueOf(SecurityUtils.getUserId()));
         greenOrder.setIsDeleted("0");
         greenOrder.setOrderTime(new Date());
         //流水号
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/bootstrap-jyy_canteen_local.yml b/bonus-modules/bonus-smart-canteen/src/main/resources/bootstrap-jyy_canteen_local.yml
index 282eabf..f3e1be1 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/bootstrap-jyy_canteen_local.yml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/bootstrap-jyy_canteen_local.yml
@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 51189
+  port: 48388
 
 # Spring
 spring: