From 259526b31beddacc3bb2e1dc0ba2e5710e4f5207 Mon Sep 17 00:00:00 2001 From: huacracker <39215559+huacracker@users.noreply.github.com> Date: Tue, 10 Mar 2026 11:23:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(work):=20=E5=AE=9E=E7=8E=B0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=8C=87=E6=B4=BE=E6=97=B6=E8=87=AA=E5=8A=A8=E6=94=B9?= =?UTF-8?q?=E4=BB=B7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在订单指派给设计师时，自动计算改价金额。使用jsPrice或price作为基准价，按10%比例计算改价，结果四舍五入到最接近的10的倍数。同时更新多个配置文件以适配新环境。 --- .DS_Store | Bin 0 -> 8196 bytes ruoyi-admin/.DS_Store | Bin 0 -> 6148 bytes ruoyi-admin/pom.xml | 42 ++++++++------ .../src/main/resources/application-dev.yml | 54 ++++++++---------- .../src/main/resources/application-prod.yml | 16 +++--- .../src/main/resources/application.yml | 10 ++-- ruoyi-admin/src/main/resources/banner.txt | 2 +- ruoyi-common/.DS_Store | Bin 0 -> 14340 bytes ruoyi-extend/.DS_Store | Bin 0 -> 6148 bytes .../src/main/resources/application.yml | 6 +- ruoyi-modules/.DS_Store | Bin 0 -> 8196 bytes .../work/service/impl/TpOrderServiceImpl.java | 42 ++++++++++++++ 12 files changed, 107 insertions(+), 65 deletions(-) create mode 100644 .DS_Store create mode 100644 ruoyi-admin/.DS_Store create mode 100644 ruoyi-common/.DS_Store create mode 100644 ruoyi-extend/.DS_Store create mode 100644 ruoyi-modules/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6156e2c2b4a145e67d856a3cd38ef0bf5a920569 GIT binary patch literal 8196 zcmeHLO=}ZT6uqxWNT4lt*+Lhi3vr=^g5s($mUQ7p3Zwg`oft!BI-zNc-OZvXg3GSz z#*HH4$1f0y2#PpJ(I;M9)Ou#8gLQFoZ5e)TP3-7($oh zyk~H}iK&jdoP=pUgkct@LlKG{>w5}L!q?Hw&H?8@-T~RWS80Jd)TJHXzfT;;7kDmC zn$7hnS;x6XFt`8W#{18=?0h&h-+M54H&A(uN}?KgyA)EJTAZ1@<0U)Gxsf?Id84>l zeVh!~ixHfkF8&0F>fn!{U<=srwSDb)bwp7tG}S+EXOs}o?JPty)*m5)N(h9@;2`pmd4rlN{Hh@dG;uiP~;{t{a;U4GpehUJ>SJ_`P5E?t}ZItrfa zrd4&_*=x7yA?@HEutgzvy52wek<-nvTzA--e`$XI(zUtnQSe-Meb0v!nzsCwPKVep z5wzP^$WicpIGSs}egABq3|XJ6AFYDx7gMR!Usv~*ZS3hD9Je*o+^0N(>->0W{@ERU zjb+y1+R9N}kNMwFYI0+I4pcPttnB|+%HRKwPoQIV4mbz?xdWow44TWJF}-z;Q1;p$ yjx`)|NL;F;D#4`MaYWUQBbs(xVLd=)jc;PABhFxq;YC2hJ^$VFUv0i~JpBetS5T0#=M5@rE$Gv&+QlB7}c=A%{3us%3U_y$mc+F9~`xF{PFFu0cNqhvs zn-AePyGz|Q)}xBd!0fk~pPl4Oo7p8I)jyr|h`K}+Lm6AE7`_npvo@sVENei;YvfsP zI4+B6BT@{1l>vTt5#>};Mzi4kbshs>QKsoAFGq-v_s-sqH*X$x{M@3PeCwYcdB2VI z0rSzO8J*BLsCxCh{o(Oz!g~I4ZECtazhcuH)T^HmKr1w-160iDkmf-df z`FcC3P3>R}{|=VL1ov^r|1%L`Ko}4Pew_jIY?ioVQAS}v7!U>)4Dk0sLm3l?l|}RE zz+jF5zzAj|n43KgP_qG;IIJwf0#P; zETv62sl=j;!hkRkGSIe{UGD$8%g_H|l3WP`!oa^`Kt<^=?c7 mWpR;$iD|`% - - - com.mysql - mysql-connector-j - 8.4.0 - + + + com.mysql + mysql-connector-j + 8.4.0 + @@ -92,19 +92,19 @@ spring-boot-admin-starter-client - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.springframework.boot - spring-boot-devtools - runtime - true - + + org.springframework.boot + spring-boot-starter-test + test + + + + + org.springframework.boot + spring-boot-devtools + runtime + true + @@ -127,6 +127,10 @@ org.springframework.boot spring-boot-maven-plugin ${spring-boot.version} + + true + true + diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index e566b53..5d32716 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -8,25 +8,25 @@ spring.boot.admin.client: metadata: username: ${spring.boot.admin.client.username} userpassword: ${spring.boot.admin.client.password} - username: @monitor.username@ - password: @monitor.password@ + username: admin + password: admin ---- # snail-job 配置 -snail-job: - enabled: false - # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 - group: "ruoyi_group" - # SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表 - token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" - server: - host: 127.0.0.1 - port: 17888 - # 详见 script/sql/snail_job.sql `sj_namespace` 表 - namespace: ${spring.profiles.active} - # 随主应用端口飘逸 - port: 2${server.port} - # 客户端ip指定 - host: 127.0.0.1 +#--- # snail-job 配置 +#snail-job: +# enabled: false +# # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 +# group: "ruoyi_group" +# # SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表 +# token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" +# server: +# host: 127.0.0.1 +# port: 17888 +# # 详见 script/sql/snail_job.sql `sj_namespace` 表 +# namespace: ${spring.profiles.active} +# # 随主应用端口飘逸 +# port: 2${server.port} +# # 客户端ip指定 +# host: 127.0.0.1 --- # 数据源配置 spring: @@ -47,22 +47,18 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://192.168.1.203:3306/oademo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true - username: oademo - password: 68i5XDFNXwWX2Fxd - -# url: jdbc:mysql://localhost:13306/new_xgt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true -# username: root -# password: root + url: jdbc:mysql://220.205.16.51:23306/oademo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: oademo + password: djj7z3dY6YkSEzeS # 从库数据源 slave: lazy: false type: ${spring.datasource.type} driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://jcs-mysql.52o.site:13306/erpdemo20260109?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: erpdemo20260109 - password: s5y46y76P2S5753T + url: jdbc:mysql://220.205.16.51:23306/oademo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: oademo + password: djj7z3dY6YkSEzeS hikari: # 最大连接池数量 @@ -107,7 +103,7 @@ redisson: # 单节点配置 singleServerConfig: # 客户端名称 - clientName: ${ruoyi.name} + clientName: XGT-ADMIN # 最小空闲连接数 connectionMinimumIdleSize: 8 # 连接池大小 diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 9c44683..f9234cc 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -11,8 +11,8 @@ spring.boot.admin.client: metadata: username: ${spring.boot.admin.client.username} userpassword: ${spring.boot.admin.client.password} - username: @monitor.username@ - password: @monitor.password@ + username: admin + password: admin --- # snail-job 配置 snail-job: @@ -50,9 +50,9 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://123.60.57.176:3306/sjzxerp20250618?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: sjzx0618 - password: 2b1%Hk3#1Uolol + url: jdbc:mysql://220.205.16.51:23306/oademo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: oademo + password: djj7z3dY6YkSEzeS # url: jdbc:mysql://localhost:13306/new_xgt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # username: root @@ -63,9 +63,9 @@ spring: lazy: false type: ${spring.datasource.type} driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://jcs-mysql.52o.site:13306/erpdemo20260109?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: erpdemo20260109 - password: s5y46y76P2S5753T + url: jdbc:mysql://220.205.16.51:23306/oademo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: oademo + password: djj7z3dY6YkSEzeS # url: jdbc:mysql://localhost:3306/new_xgt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # username: root diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index af84d68..0e8c580 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -3,7 +3,7 @@ ruoyi: # 名称 name: XGT-ADMIN # 版本 - version: ${revision} + version: 5.2.3 # 版权年份 copyrightYear: 2024 @@ -44,7 +44,7 @@ server: # 日志配置 logging: level: - org.dromara: @logging.level@ + org.dromara: info org.springframework: warn org.mybatis.spring.mapper: error org.apache.fury: warn @@ -71,7 +71,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: @profiles.active@ + active: dev # 文件上传 servlet: multipart: @@ -200,11 +200,11 @@ springdoc: # persistAuthorization: true info: # 标题 - title: '标题：${ruoyi.name}效果图业务系统_接口文档' + title: '标题：若依效果图业务系统_接口文档' # 描述 description: '描述：效果图业务系统接口文档' # 版本 - version: '版本号: ${ruoyi.version}' + version: '版本号: 5.2.3' # 作者信息 contact: name: Maosw diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt index e4ba765..e1ee4da 100644 --- a/ruoyi-admin/src/main/resources/banner.txt +++ b/ruoyi-admin/src/main/resources/banner.txt @@ -1,4 +1,4 @@ -Application Version: ${revision} +Application Version: 5.2.3 Spring Boot Version: ${spring-boot.version} __________ _____.___.__ ____ ____ __________.__ \______ \__ __ ____\__ | |__| \ \ / /_ __ ____ \______ \ | __ __ ______ diff --git a/ruoyi-common/.DS_Store b/ruoyi-common/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c818777c720a9b63a5197f783f1fb177fe98790e GIT binary patch literal 14340 zcmeI3O^91n6vxlY%xFLKnK1gQN(S@mB zwGM?Y90bv=-Ke+_Y?XpAcHFqAA_#WjC{CB6;zDra|9-sWoTRd zd>Ve_aEsE9UN|>n|4fU zhKnm0*d=SSeV*T0vW^6^tE!8kF8z&bsN;t#4S?0DX@*i(YU~ ze64)eTeTSEZcw|AH~H#e9}VaH8aMXW;cdYaY@Lk1IR4`r0;nJvoliqqq2IIPbnsw;#2SaJX%Y7A@=WKPP=OoblJa zwCv?al*Q>nbb>2a#3MTWsK(W4uS-G4vTrGLm6|ZX! zuz)(PXxo^Pm{}&?P6=|_cqL07+y-BsUrXnk!Oz02aXI;1#4fJ-{UYi?S=b@B??>2S zsD^WIJ^evCHhJiJBT|S?a7|1qf4jy2%>{3(-b&3u`fB-e--YTq@5Z?!?|6(u1JA&H zoHY+&2Qv>>wur|lT3{QXT`f+(OBb!1w*2j*;k6z2559jNjAZS5`(En~(TQ4Z77tyk z6KaP-t8ZM+->qUO50zj$f8k}@lD(9SE=Vc(rtq9@zs;(COZY8$aNS44+1B6t?^Tak zhc1ivOd&eKmD96gS7fH<95e9T5;gmJhG4xeH*G3oD2~W>>~j=41Si-WIzE@z3l*G;x4lwGbAI@qdi}(>|08Le z2pugjDi%n_OZ!W^L2LKc4REWM)&-mgaHa?D)wkoKepY|zt$6rDZNS5T1=WM7&f)=rJ$QLmxnhB|d-@?`@3KNYa%42;TA*UaJQ^`2xOx51zw`9)7xg% zb>3&s?MLC=VEv+8bN}89b^iX_fcdMb0;+&2fHRvd*mI~+6;K6Kft3RMeF))N0J+}D#Kl%LrzgeVDs(>o+uM{wT+>d*pBxmauIX-Jc_yEqv o<0^-%5;W{ljIn$ax8c^154i!11S^Ng!1RxRl|h3l@T&^E1Coz=#Q*>R literal 0 HcmV?d00001 diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml index b48c9d9..b09d313 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml +++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml @@ -4,7 +4,7 @@ spring: application: name: ruoyi-monitor-admin profiles: - active: @profiles.active@ + active: dev logging: config: classpath:logback-plus.xml @@ -13,8 +13,8 @@ logging: spring: security: user: - name: @monitor.username@ - password: @monitor.password@ + name: admin + password: admin boot: admin: ui: diff --git a/ruoyi-modules/.DS_Store b/ruoyi-modules/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..173b06f47fd8fe4db6d23ca1b51d114614e47f91 GIT binary patch literal 8196 zcmeHMO-oxr6ur}ikZ5UK2HM5Ll?WE{11e8R7VZk6t5VPyKU$N%d?;z5i??$jZUk4& zBJHNS5d0B^ZVN8l`V;&Ko;x$>40$h!o6^ubFmoO=_s*PqGQ4?rLPToypk5*>5>XD7 zac&k(Lg8_)L*VP^$@q7Sr0b=smPMMKuoAqt2BqJStM3Wx&#f&w_Rx#UvLeKRVp zC?E>_mkRLvAwXpeEyf1*s{@Tr0e~5F>w;(G0oo_97+Q=CYFEr@vIk{dl}#~}amRST z=D^TmY|yxqGVY}8%F1RaO0N#TK%0{a4N5Bthyue3aPB@s9Xde9{>9DT8#|@yX4GtH zmt1{0&8``h%e6*S!+37+_1DkW7r$51ZR-=;wsxKM3pbdO3LeiL+%tSa?a&78gMG(i zoPGOdyobyE2e)s>+$?NV4lxCeeImIO${*ad3;~A`{V3g-p3d3&Mohe zYqrbvOOhHH`Y|4RD({}e?eR7C+%;IRs*Ou1TKg%=L; z#KO6DfVz&#h3#U4+69eH$AS7o0C@k0A)W)6vQKC+Hi#Y+xd_lQNFxgTRR!( orderList = new ArrayList<>(); for (Long orderId : orderIds){ TpOrder order = baseMapper.selectById(orderId); @@ -784,6 +787,35 @@ public class TpOrderServiceImpl extends MPJBaseServiceImpl 0) { + BigDecimal zGjPrice = basePrice.multiply(discountRate); + System.out.println("[自动改价调试] 计算改价: " + basePrice + " * 10% = " + zGjPrice); + + // 10取整处理（四舍五入到最接近的10的倍数） + zGjPrice = roundToNearestTen(zGjPrice); + System.out.println("[自动改价调试] 取整后改价: " + zGjPrice); + + order.setZGjPrice(zGjPrice); + order.setGjPrice(zGjPrice); + System.out.println("[自动改价调试] 设置成功: zGjPrice=" + zGjPrice + ", gjPrice=" + zGjPrice); + } else { + System.out.println("[自动改价调试] 未设置改价: basePrice=" + basePrice); + } + // ===== 自动改价逻辑结束 ===== + boolean res = saveOrderRecord(order.getId(),"订单分图","订单:"+order.getOrderId()+" 指派给"+user.getNickName()+" 成功",1,null); if(!res){ throw new ServiceException("订单指派失败"); @@ -793,6 +825,16 @@ public class TpOrderServiceImpl extends MPJBaseServiceImpl