From 777992a0962399dfc0fca5d65e3c2b0776ddf31c Mon Sep 17 00:00:00 2001 From: wangqx Date: Fri, 15 Aug 2025 14:23:34 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E4=BF=AE=E6=94=B9=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=82=E5=A2=9E=E5=8A=A0app=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 50 +++++++++++++++++++ .../dromara/app/AppCarouselController.java | 4 ++ .../controller/ArticleCategoryController.java | 2 +- .../content/controller/ArticleController.java | 2 +- .../member/domain/bo/MemberAccountBO.java | 3 +- .../member/domain/po/MemberAccount.java | 3 -- .../service/impl/DivideServiceImpl.java | 6 --- 7 files changed, 57 insertions(+), 13 deletions(-) create mode 100644 ruoyi-admin/src/main/java/org/dromara/app/AppCarouselController.java diff --git a/pom.xml b/pom.xml index a6878fb26..cdf408e0a 100644 --- a/pom.xml +++ b/pom.xml @@ -464,6 +464,56 @@ + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + + + + com.jcraft + jsch + 0.1.55 + + + + + + package + + run + + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins maven-compiler-plugin diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppCarouselController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppCarouselController.java new file mode 100644 index 000000000..5a7fe6158 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/app/AppCarouselController.java @@ -0,0 +1,4 @@ +package org.dromara.app; + +public class AppCarouselController { +} diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/ArticleCategoryController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/ArticleCategoryController.java index 9af4947c5..9d707a5a5 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/ArticleCategoryController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/ArticleCategoryController.java @@ -71,7 +71,7 @@ public class ArticleCategoryController { @Log(title = "修改", businessType = BusinessType.UPDATE) @PostMapping("/update") public R update(@RequestBody ArticleCategoryBO bo) { - service.save(convert.toPo(bo)); + service.saveOrUpdate(convert.toPo(bo)); return R.ok(); } diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/ArticleController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/ArticleController.java index 73e8fb72f..253d9d3b6 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/ArticleController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/ArticleController.java @@ -65,7 +65,7 @@ public class ArticleController { @Log(title = "修改", businessType = BusinessType.UPDATE) @PostMapping("/update") public R update(@RequestBody ArticleBO bo) { - service.save(convert.toPo(bo)); + service.saveOrUpdate(convert.toPo(bo)); return R.ok(); } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAccountBO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAccountBO.java index f6c42710b..16d928427 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAccountBO.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAccountBO.java @@ -44,8 +44,7 @@ public class MemberAccountBO extends BaseBO { private String nickname; private String phone; - @Schema(description ="余额") - private BigDecimal moneyBalance; + public LambdaQueryWrapper toWrapper() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); if (id != null) { diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberAccount.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberAccount.java index 37081705b..64ac7e03b 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberAccount.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberAccount.java @@ -30,9 +30,6 @@ public class MemberAccount extends BaseAudit { private Long memberId; - - private String name; - private Integer type; @Schema(description ="积分") diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java index 49ca82d5f..074c5019d 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java @@ -15,7 +15,6 @@ import com.wzj.soopin.transaction.convert.DivideDetailConvert; import com.wzj.soopin.transaction.domain.bo.DivideBO; import com.wzj.soopin.transaction.domain.po.Divide; import com.wzj.soopin.transaction.domain.po.DivideDetail; -import com.wzj.soopin.transaction.domain.po.DivideRuleDetail; import com.wzj.soopin.transaction.domain.vo.DivideRuleDetailVO; import com.wzj.soopin.transaction.domain.vo.DivideRuleVO; import com.wzj.soopin.transaction.domain.vo.DivideVO; @@ -32,7 +31,6 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.ConfigService; import org.dromara.system.domain.vo.SysTenantVo; import org.dromara.system.service.ISysTenantService; -import org.slf4j.Logger; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,7 +39,6 @@ import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * 分账服务实现类 @@ -359,7 +356,6 @@ public class DivideServiceImpl extends ServiceImpl impleme } return new HashMap<>() {{ put("accountId", account.getId() + ""); - put("accountName", account.getName()); }}; } @@ -380,7 +376,6 @@ public class DivideServiceImpl extends ServiceImpl impleme } return new HashMap<>() {{ put("accountId", account.getId() + ""); - put("accountName", account.getName()); }}; } @@ -404,7 +399,6 @@ public class DivideServiceImpl extends ServiceImpl impleme // } return new HashMap<>() {{ put("accountId", account.getId() + ""); - put("accountName", account.getName()); }}; }