From a71844875a960f00167ef860922a59dfdd3ee994 Mon Sep 17 00:00:00 2001 From: WCPE <1837019522@qq.com> Date: Sun, 18 May 2025 00:37:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=20-=20=E6=80=BB=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E6=80=BB=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20-=20=E9=85=8D=E9=80=81=E7=AB=AF=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E4=B8=AD=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9C=A8=E6=8A=BC=E6=A1=B6=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- README.md | 26 +++++++++++++++++++ pom.xml | 9 ++----- .../app/controller/UserController.java | 2 ++ .../com/sqx/modules/app/dao/UserMoneyDao.java | 5 ++++ .../app/response/HomeMessageResponse.java | 5 ++++ .../modules/app/service/UserMoneyService.java | 3 ++- .../service/impl/UserMoneyServiceImpl.java | 5 ++++ .../com/sqx/modules/orders/entity/Orders.java | 12 ++++----- .../service/impl/OrdersServiceImpl.java | 3 +++ .../resources/mapper/app/UserMoneyDao.xml | 5 +++- 11 files changed, 61 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 408816b..07ec777 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8u111-jdk +FROM openjdk:8u342-jre #作者 LABEL maintainer="peng" diff --git a/README.md b/README.md index 2288fbe..891af2c 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,32 @@ - Eclipse、IDEA运行sqxApplication.java，则可启动项目 - Swagger文档路径：http://localhost:8964/sqx_fast/swagger/index.html - Swagger注解路径：http://localhost:8964/sqx_fast/swagger-ui.html +使用以下命令安装依赖 +```bash +# 安装 icbc-api-sdk-cop.jar +mvn install:install-file \ + -Dfile=src/main/resources/lib/icbc-api-sdk-cop.jar \ + -DgroupId=com.icbc \ + -DartifactId=icbc-api-sdk-cop \ + -Dversion=1.0.5 \ + -Dpackaging=jar +# 安装 icbc-api-sdk-cop-io.jar +mvn install:install-file \ + -Dfile=src/main/resources/lib/icbc-api-sdk-cop-io.jar \ + -DgroupId=com.icbc \ + -DartifactId=icbc-api-sdk-cop-io \ + -Dversion=1.0.5 \ + -Dpackaging=jar + +# 安装 hsm-software-share-1.0.5.jar +mvn install:install-file \ + -Dfile=src/main/resources/lib/hsm-software-share-1.0.5.jar \ + -DgroupId=com.icbc \ + -DartifactId=icbc-hsm \ + -Dversion=1.0.5 \ + -Dpackaging=jar + +```
diff --git a/pom.xml b/pom.xml index b6de9c6..a9949d6 100644 --- a/pom.xml +++ b/pom.xml @@ -406,11 +406,6 @@ icbc-hsm 1.0.5 - - - - - @@ -489,7 +484,7 @@ public aliyun nexus - http://maven.aliyun.com/nexus/content/groups/public/ + https://maven.aliyun.com/repository/public true @@ -499,7 +494,7 @@ public aliyun nexus - http://maven.aliyun.com/nexus/content/groups/public/ + https://maven.aliyun.com/repository/public true diff --git a/src/main/java/com/sqx/modules/app/controller/UserController.java b/src/main/java/com/sqx/modules/app/controller/UserController.java index 8a47847..1cce1a8 100644 --- a/src/main/java/com/sqx/modules/app/controller/UserController.java +++ b/src/main/java/com/sqx/modules/app/controller/UserController.java @@ -345,6 +345,8 @@ public class UserController { //设置本年收入 homeMessageResponse.setYearRevenue(userService.queryPayMoney(3)); + //设置所有用户总金额 + homeMessageResponse.setTotalMoney(userMoneyService.sumMoney()); return Result.success().put("data", homeMessageResponse); } diff --git a/src/main/java/com/sqx/modules/app/dao/UserMoneyDao.java b/src/main/java/com/sqx/modules/app/dao/UserMoneyDao.java index 2d5831d..1d6c0c6 100644 --- a/src/main/java/com/sqx/modules/app/dao/UserMoneyDao.java +++ b/src/main/java/com/sqx/modules/app/dao/UserMoneyDao.java @@ -19,4 +19,9 @@ public interface UserMoneyDao extends BaseMapper { BigDecimal sumHasSafetyMoney(); + + /** + * 查询总金额 + */ + BigDecimal sumMoney(); } diff --git a/src/main/java/com/sqx/modules/app/response/HomeMessageResponse.java b/src/main/java/com/sqx/modules/app/response/HomeMessageResponse.java index fa1d58c..25b68ec 100644 --- a/src/main/java/com/sqx/modules/app/response/HomeMessageResponse.java +++ b/src/main/java/com/sqx/modules/app/response/HomeMessageResponse.java @@ -49,4 +49,9 @@ public class HomeMessageResponse implements Serializable { */ private Double yearRevenue; + /** + * 所有用户金额 + */ + private BigDecimal totalMoney; + } diff --git a/src/main/java/com/sqx/modules/app/service/UserMoneyService.java b/src/main/java/com/sqx/modules/app/service/UserMoneyService.java index 81626c1..6e87652 100644 --- a/src/main/java/com/sqx/modules/app/service/UserMoneyService.java +++ b/src/main/java/com/sqx/modules/app/service/UserMoneyService.java @@ -10,10 +10,11 @@ import com.sqx.modules.app.entity.UserMoneyDetails; import org.springframework.web.bind.annotation.RequestAttribute; import java.math.BigDecimal; -import java.util.HashMap; public interface UserMoneyService extends IService { + BigDecimal sumMoney(); + UserMoney selectUserMoneyByUserId(Long userId); void updateSafetyMoneyWay(Long id, Integer safetyMoneyWay, String orderNo); diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java index f8cbc1b..9beaa50 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java @@ -67,6 +67,11 @@ public class UserMoneyServiceImpl extends ServiceImpl i baseMapper.updateSafetyMoney(i, userId, money); } + @Override + public BigDecimal sumMoney() { + return baseMapper.sumMoney(); + } + @Override public UserMoney selectUserMoneyByUserId(Long userId) { UserMoney userMoney = baseMapper.selectOne(new QueryWrapper().eq("user_id", userId)); diff --git a/src/main/java/com/sqx/modules/orders/entity/Orders.java b/src/main/java/com/sqx/modules/orders/entity/Orders.java index 91370af..244f74f 100644 --- a/src/main/java/com/sqx/modules/orders/entity/Orders.java +++ b/src/main/java/com/sqx/modules/orders/entity/Orders.java @@ -10,10 +10,7 @@ import com.sqx.modules.taking.entity.OrderTaking; import com.sqx.modules.tbCoupon.entity.TbCouponUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.ToString; import java.io.Serializable; import java.math.BigDecimal; @@ -118,7 +115,7 @@ public class Orders implements Serializable { /** * 无需验证码 完成订单的图片 */ - private String noCodeFinishImg; + private String noCodeFinishImg; /** * 下单用户类型 1用户 2师傅 */ @@ -141,12 +138,15 @@ public class Orders implements Serializable { private String laundryPhone; /** - *是否已修改桶数量 0未修改 1已修改 + * 是否已修改桶数量 0未修改 1已修改 */ private Integer isUpdateBucket; /** - *是否已推送 + * 是否已推送 */ private Integer isPushMeg; + @TableField(exist = false) + private int bucket; + } diff --git a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java index 58208f7..e640a5b 100644 --- a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java @@ -46,6 +46,7 @@ import com.sqx.modules.utils.SenInfoCheckUtil; import com.sqx.modules.utils.excel.ExcelData; import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; +import lombok.val; import org.apache.commons.lang.StringUtils; import org.gavaghan.geodesy.Ellipsoid; import org.gavaghan.geodesy.GlobalCoordinates; @@ -985,6 +986,8 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setLaundryPhone(laundry.getLaundryPhone()); } } + val userBucketCount = getUserBucketCount(orders.getUserId()); + orders.setBucket(userBucketCount); return Result.success().put("data", orders); } diff --git a/src/main/resources/mapper/app/UserMoneyDao.xml b/src/main/resources/mapper/app/UserMoneyDao.xml index 4a202c3..5d966ee 100644 --- a/src/main/resources/mapper/app/UserMoneyDao.xml +++ b/src/main/resources/mapper/app/UserMoneyDao.xml @@ -27,6 +27,9 @@ - + \ No newline at end of file