From 07f2a8b32d1d120c994bea2cbd05996ca1b2bb31 Mon Sep 17 00:00:00 2001
From: TS-QD1 <tskj_pc1@163.com>
Date: Fri, 30 May 2025 17:57:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=99=BE=E5=BA=A6=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E3=80=81=E6=96=B0=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PackageOrderItemServiceImpl.java              | 10 +++++-----
 src/main/resources/application-dev.yml                 | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/cn/com/tenlion/operator/service/packageorderitem/impl/PackageOrderItemServiceImpl.java b/src/main/java/cn/com/tenlion/operator/service/packageorderitem/impl/PackageOrderItemServiceImpl.java
index 04f9231..9a79665 100644
--- a/src/main/java/cn/com/tenlion/operator/service/packageorderitem/impl/PackageOrderItemServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/operator/service/packageorderitem/impl/PackageOrderItemServiceImpl.java
@@ -191,7 +191,7 @@ public class PackageOrderItemServiceImpl extends DefaultBaseService implements I
          * 增加子账号 2025年3月13日17:02:07
          */
         UserExpandDTO userExpandDTO = userExpandService.get(packageOrderItemAppVO.getUserId());
-        if(!StringUtils.isEmpty(userExpandDTO.getMainUserId())) {
+        if (!StringUtils.isEmpty(userExpandDTO.getMainUserId())) {
             msg = " / 子账号" + userExpandDTO.getUserUsername();
             packageOrderItemAppVO.setUserId(userExpandDTO.getMainUserId());
         }
@@ -209,7 +209,7 @@ public class PackageOrderItemServiceImpl extends DefaultBaseService implements I
             query.put("available", "查找剩余数量大于0的");
             query.put("availableType", type);
             List<PackageOrderDTO> list = iPackageOrderService.list(query);
-            if(list.size() > 0 ) {
+            if (list.size() > 0) {
                 packageOrderItemAppVO.setPackageOrderId(list.get(0).getPackageOrderId());
             }
         }
@@ -221,7 +221,7 @@ public class PackageOrderItemServiceImpl extends DefaultBaseService implements I
             if (orderDTO.getPackageTotalSurplusCount() < packageOrderItemAppVO.getItemUseCount()) {
                 throw new SaveException("该套餐包余额不足");
             }
-        }else{
+        } else {
             if (orderDTO.getPackageTotalCount() < orderDTO.getPackageTotalSurplusCount() + packageOrderItemAppVO.getItemUseCount()) {
                 throw new SaveException("说你想干嘛?");
             }
@@ -233,7 +233,7 @@ public class PackageOrderItemServiceImpl extends DefaultBaseService implements I
         itemVO.setOrderType(packageOrderItemAppVO.getOrderType());
         itemVO.setPackageOrderAvgMoney(orderDTO.getPackageTotalAvgMoney());
         itemVO.setMode(type.equals("plus") ? 1 : 2);
-        itemVO.setItemUseCount( packageOrderItemAppVO.getItemUseCount() );
+        itemVO.setItemUseCount(packageOrderItemAppVO.getItemUseCount());
         itemVO.setOrderTitle(packageOrderItemAppVO.getOrderTitle());
         itemVO.setItemCount(type.equals("plus") ? orderDTO.getPackageTotalSurplusCount() + packageOrderItemAppVO.getItemUseCount() : orderDTO.getPackageTotalSurplusCount() - packageOrderItemAppVO.getItemUseCount());
 
@@ -251,7 +251,7 @@ public class PackageOrderItemServiceImpl extends DefaultBaseService implements I
         packageOrderItemDao.save(params);
 
         Map<String, Object> update = super.getHashMap(2);
-        update.put("packageOrderId", orderDTO.getPackageOrderId()   );
+        update.put("packageOrderId", orderDTO.getPackageOrderId());
         update.put("gmtModified", currentDate);
         update.put("packageTotalSurplusCount", type.equals("plus") ? orderDTO.getPackageTotalSurplusCount() + packageOrderItemAppVO.getItemUseCount() : orderDTO.getPackageTotalSurplusCount() - packageOrderItemAppVO.getItemUseCount());
         iPackageOrderService.updateCount(update);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 634f235..515a588 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
 server:
   port: 8099
-  url: http://192.168.0.15:8099/operator-plugin
-  ip: 192.168.0.15
+  url: http://121.36.71.250:58038/operator-plugin
+  ip: 121.36.71.250
   system-title:  运营平台(扩展)
   system-sub-title: 运营平台(扩展)
   # default-home-page: route/land/page
@@ -115,7 +115,7 @@ spring:
     mongodb:
       uri: mongodb://smartcity:smartcity@10.25.248.193:6011/smartcity
   redis:
-    database: 6
+    database: 1
     host: 192.168.0.156
     port: 6379
     password: 666
@@ -217,7 +217,7 @@ file:
 
 security:
   oauth2:
-    oauth-server: http://192.168.0.15:8091/operator/
+    oauth-server: http://121.36.71.250:58038/operator/
     oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
     client:
       client-id: 0cf040b3344f471f882fb751c15493ff
@@ -236,7 +236,7 @@ security:
 api-path:
   user-center: http://192.168.0.15:8091/operator/
   copyright: http://192.168.0.15:7025/copyright/
-  copyright-external: http://192.168.0.15:7025/copyright/
+  copyright-external: http://121.36.71.250:58038/copyright/
   operator-plugin: http://192.168.0.15:8099/operator-plugin/
 
 # 短信验证码服务