From 3537032d2b9313c8f108675f19cae079054d872b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 09 二月 2026 10:25:41 +0800
Subject: [PATCH] 代码初始化
---
server/services/src/main/java/com/doumee/dao/vo/IndexOrderCountVO.java | 8 ++++++++
server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java | 9 +++++----
server/services/src/main/java/com/doumee/core/constants/Constants.java | 9 ++++-----
server/services/src/main/java/com/doumee/dao/business/model/Refund.java | 6 ++++++
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 18 +++++++++++++++++-
server/admin/src/main/resources/application.yml | 2 +-
6 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/server/admin/src/main/resources/application.yml b/server/admin/src/main/resources/application.yml
index 058e31c..80562ae 100644
--- a/server/admin/src/main/resources/application.yml
+++ b/server/admin/src/main/resources/application.yml
@@ -8,7 +8,7 @@
spring:
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index 1d48871..a8ef601 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -170,11 +170,10 @@
}
return d.intValue();
}
- public static double getFormatMoney(Long d) {
- BigDecimal r = new BigDecimal(formatLongNum(d));
- r = r.divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP);
-
- return r.doubleValue();
+ public static BigDecimal getFormatMoney(BigDecimal d) {
+ BigDecimal r =formatBigDecimal(d);
+ r = r.divide(new BigDecimal(1),2,BigDecimal.ROUND_HALF_UP);
+ return r;
}
public static long formatLongNum(Long d) {
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Refund.java b/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
index 2318b1b..2a231b4 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
@@ -108,4 +108,10 @@
@ApiModelProperty("浠樻浜嬬敱")
@TableField(exist = false)
private Integer orderType;
+ @ApiModelProperty("缁熻閲�")
+ @TableField(exist = false)
+ private Long num;
+ @ApiModelProperty("缁熻璁㈠崟閲�")
+ @TableField(exist = false)
+ private Long orderNum;
}
diff --git a/server/services/src/main/java/com/doumee/dao/vo/IndexOrderCountVO.java b/server/services/src/main/java/com/doumee/dao/vo/IndexOrderCountVO.java
index e598e29..9874931 100644
--- a/server/services/src/main/java/com/doumee/dao/vo/IndexOrderCountVO.java
+++ b/server/services/src/main/java/com/doumee/dao/vo/IndexOrderCountVO.java
@@ -65,4 +65,12 @@
@ApiModelProperty(value = "寤舵湡娆句氦鏄撴暟閲忥紙鏀粯澶辫触锛�")
private Long todayFailNum1;
+
+ @ApiModelProperty(value = "鎬婚��娆鹃噾棰�")
+ private BigDecimal todayRefundMoney;
+ @ApiModelProperty(value = "鎬婚��娆剧瑪鏁�")
+ private Long todayRefundNum;
+ @ApiModelProperty(value = "鎬婚��娆捐鍗曟暟")
+ private Long todayRefundOrderNum;
+
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
index bdacd23..9bea96e 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
@@ -249,7 +249,7 @@
@Override
public IndexOrderCountVO getIndexData(Orders pageWrap) {
IndexOrderCountVO data = initIndexOrderCountMoel();
- List<Orders> list = ordersMapper.selectList(new QueryWrapper<Orders>()
+ List<Orders> list = ordersMapper.selectList(new QueryWrapper<Orders>()
.select("status,type,count(id) as num,sum(money) as money")
.lambda()
.eq(Orders::getDeleted,Constants.ZERO )
@@ -310,6 +310,18 @@
}
}
+ Refund refund = refundMapper.selectJoinOne(Refund.class,new MPJLambdaWrapper<Refund>()
+ .select("count(distinct(order_id)) as orderNum,count(id) as num,sum(money) as money")
+ .eq(Orders::getDeleted,Constants.ZERO )
+ .eq(Orders::getStatus,Constants.ONE)
+ .apply("to_days(create_time) =to_days(now())")
+ .last("limit 1"));
+
+ if(refund!=null){
+ data.setTodayRefundMoney(Constants.getFormatMoney(refund.getMoney()));
+ data.setTodayRefundOrderNum(Constants.formatLongNum(refund.getOrderNum()));
+ data.setTodayRefundNum(Constants.formatLongNum(refund.getNum()));
+ }
return data;
}
@@ -343,6 +355,10 @@
data.setTodayFailNum0(0l);
data.setTodayFailNum1(0l);
+ data.setTodayRefundMoney(new BigDecimal(0));
+ data.setTodayRefundOrderNum(0l);
+ data.setTodayRefundNum(0l);
+
return data;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
index 8cb9ad7..ad12f3d 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
@@ -60,7 +60,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋寜鐓ц姹傚～鍐欎俊鎭紒");
}
- model.setMoney(model.getMoney().multiply(new BigDecimal(100)));//鍗曚綅鍒�
+ model.setMoney(Constants.getFormatMoney(model.getMoney().multiply(new BigDecimal(100))));//鍗曚綅鍒�
Orders order = ordersMapper.selectById(model.getOrderId());
if(order==null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璁㈠崟淇℃伅涓嶅瓨鍦紒");
@@ -68,8 +68,8 @@
if(!Constants.equalsInteger(order.getStatus(),Constants.ONE)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璁㈠崟鏈氦鏄撴垚鍔燂紝涓嶆敮鎸侀��娆炬搷浣滐紒");
}
- if( Constants.formatBigDecimal(model.getMoney()).compareTo(Constants.formatBigDecimal(order.getMoney())) >=0){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"閫�娆鹃噾棰濅笉鑳借秴杩囪鍗曢噾棰濓紒");
+ if( Constants.getFormatMoney(model.getMoney()).compareTo(Constants.getFormatMoney(order.getMoney())) >0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"閫�娆鹃噾棰濅笉鑳借秴杩囪鍗曢噾棰�"+Constants.getFormatMoney(order.getMoney())+"锛�");
}
Refund sum = refundMapper.selectOne(new QueryWrapper<Refund>().select("sum(money) as money").lambda()
.eq(Refund::getDeleted,Constants.ZERO)
@@ -206,6 +206,7 @@
.selectAs(SystemUser::getRealname,Refund::getUserRealname)
.selectAs(SystemUser::getUsername,Refund::getUsername)
.selectAs(Orders::getName,Refund::getMemberName)
+ .selectAs(Orders::getType,Refund::getOrderType)
.selectAs(Orders::getPhone,Refund::getMemberPhone)
.leftJoin(Orders.class,Orders::getId,Refund::getOrderId)
.leftJoin(SystemUser.class,SystemUser::getId,Refund::getCreateUser);
@@ -230,7 +231,7 @@
queryWrapper.eq(pageWrap.getModel().getPayCode() != null,Refund::getPayCode, pageWrap.getModel().getPayCode());
queryWrapper.eq(pageWrap.getModel().getOrderType() != null,Orders::getType, pageWrap.getModel().getOrderType());
queryWrapper.eq(pageWrap.getModel().getOrderId() != null,Refund::getOrderId, pageWrap.getModel().getOrderId());
- queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getMemberPhone() ) ,Orders::getName, pageWrap.getModel().getMemberPhone());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getMemberPhone() ) ,Orders::getPhone, pageWrap.getModel().getMemberPhone());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getMemberName() ) ,Orders::getName, pageWrap.getModel().getMemberName());
queryWrapper.ge(pageWrap.getModel().getStarttime()!=null,Refund::getCreateTime , pageWrap.getModel().getStarttime());
queryWrapper.le(pageWrap.getModel().getEndtime()!=null,Refund::getCreateTime , pageWrap.getModel().getEndtime());
--
Gitblit v1.9.3