From ad92f42691c3f5b1804bbc56040b93877e336995 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 30 十月 2023 14:25:33 +0800
Subject: [PATCH] # log日志
---
server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java | 1
server/services/src/main/java/com/doumee/core/utils/Date.java | 11 +++++
server/services/src/main/java/com/doumee/dao/business/model/RefundPlatExportVO.java | 30 ++++++++++-----
server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 18 ++++----
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java | 2
6 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index 2c0cb31..e8aae6a 100644
--- a/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -178,15 +178,15 @@
}
// 楠岃瘉宸ュ彿
- if (StringUtils.isNotBlank(systemUser.getEmpNo())) {
- queryUserDto = new SystemUser();
- queryUserDto.setEmpNo(systemUser.getEmpNo());
- queryUserDto.setDeleted(Constants.ZERO);
- user = systemUserService.findOne(queryUserDto);
- if (user != null && !user.getId().equals(systemUser.getId())) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿宸插瓨鍦�");
- }
- }
+// if (StringUtils.isNotBlank(systemUser.getEmpNo())) {
+// queryUserDto = new SystemUser();
+// queryUserDto.setEmpNo(systemUser.getEmpNo());
+// queryUserDto.setDeleted(Constants.ZERO);
+// SystemUser user1 = systemUserService.findOne(queryUserDto);
+// if (user1 != null && !user1.getId().equals(systemUser.getId())) {
+// throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿宸插瓨鍦�");
+// }
+// }
if ("admin".equals(user.getUsername()) && Objects.equal(systemUser.getStatus(),1)){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瓒呯骇绠＄悊鍛樿处鍙蜂笉鍏佽绂佺敤");
}
diff --git a/server/services/src/main/java/com/doumee/core/utils/Date.java b/server/services/src/main/java/com/doumee/core/utils/Date.java
index 273ff02..e303364 100644
--- a/server/services/src/main/java/com/doumee/core/utils/Date.java
+++ b/server/services/src/main/java/com/doumee/core/utils/Date.java
@@ -41,4 +41,15 @@
calendar.set(Calendar.MILLISECOND, 0);
return calendar.getTime();
}
+
+ public java.util.Date getDayOfEnd (java.util.Date date) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.set(Calendar.DATE, calendar.get(Calendar.DATE));
+ calendar.set(Calendar.HOUR_OF_DAY, 23);
+ calendar.set(Calendar.MINUTE, 59);
+ calendar.set(Calendar.SECOND, 59);
+ calendar.set(Calendar.MILLISECOND, 0);
+ return calendar.getTime();
+ }
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/vo/RefundPlatExportVO.java b/server/services/src/main/java/com/doumee/dao/business/model/RefundPlatExportVO.java
similarity index 77%
rename from server/services/src/main/java/com/doumee/dao/business/vo/RefundPlatExportVO.java
rename to server/services/src/main/java/com/doumee/dao/business/model/RefundPlatExportVO.java
index 336009e..98e14d1 100644
--- a/server/services/src/main/java/com/doumee/dao/business/vo/RefundPlatExportVO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/RefundPlatExportVO.java
@@ -21,30 +21,40 @@
@ApiModel("鍚庡彴缁撶畻瀵煎嚭淇℃伅")
public class RefundPlatExportVO {
- @ApiModelProperty(value = "缂栫爜")
- @ExcelColumn(name="缂栫爜",width = 10,index = 2,align = HorizontalAlignment.CENTER)
- private String id;
+
+
@ApiModelProperty(value = "鐢ㄦ埛")
- @ExcelColumn(name="閫�娆句氦鏄撳崟鍙�" ,width = 10,index = 2,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鐢ㄦ埛" ,width = 10,index = 1,align = HorizontalAlignment.CENTER)
private String openid;
- @ApiModelProperty(value = "鏀粯鎶奸噾浜ゆ槗鍗曞彿")
+
+ @ApiModelProperty(value = "缂栫爜")
+ @ExcelColumn(name="绯荤粺鍗曞彿",width = 10,index = 2,align = HorizontalAlignment.CENTER)
+ private String id;
+
+ @ApiModelProperty(value = "閫�娆句氦鏄撳崟鍙�")
@ExcelColumn(name="閫�娆句氦鏄撳崟鍙�" ,width = 10,index = 3,align = HorizontalAlignment.CENTER)
+ private String onlineOrderid;
+
+ @ApiModelProperty(value = "鏀粯鎶奸噾浜ゆ槗鍗曞彿")
+// @ExcelColumn(name="浜ゆ槗鍗曞彿" ,width = 10,index = 3,align = HorizontalAlignment.CENTER)
private String payOnlineOrderid;
+
@ApiModelProperty(value = "鍙��閲戦", example = "1")
- @ExcelColumn(name="鍙��鍥炴娂閲戯紙鍏冿級" ,width = 10,index = 4,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="褰撳墠鍙��鍥炴娂閲戯紙鍏冿級" ,width = 10,index = 4,align = HorizontalAlignment.CENTER)
private BigDecimal canBanlance;
+
@ApiModelProperty(value = "浜ゆ槗閲戦", example = "1")
@ExcelColumn(name="閫�鍥炴娂閲�(鍏�)" ,width = 10,index = 5,align = HorizontalAlignment.CENTER)
private BigDecimal money;
- @ApiModelProperty(value = "閫�娆句氦鏄撳崟鍙�")
- @ExcelColumn(name="閫�娆句氦鏄撳崟鍙�" ,width = 10,index = 6,align = HorizontalAlignment.CENTER)
- private String onlineOrderid;
+
@ApiModelProperty(value = "鎿嶄綔鏃堕棿")
@ExcelColumn(name="鎿嶄綔鏃堕棿" ,width = 10,index = 7,align = HorizontalAlignment.CENTER)
private Date doneDate;
+
@ApiModelProperty(value = "鎿嶄綔浜�")
- @ExcelColumn(name="閫�娆句氦鏄撳崟鍙�" ,width = 10,index = 8,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鎿嶄綔浜�" ,width = 10,index = 8,align = HorizontalAlignment.CENTER)
private String creatorName;
+
@ApiModelProperty(value = "閫�娆惧師鍥�")
@ExcelColumn(name="鍘熷洜" ,width = 10,index = 9,align = HorizontalAlignment.CENTER)
private String reason;
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 4f4850e..89289e5 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -554,7 +554,7 @@
if(canBalance.compareTo(money) >= Constants.ZERO){
RefundDTO refundDTO = new RefundDTO();
refundDTO.setOrderId(orderId);
- refundDTO.setCanBalance(canBalance);
+ refundDTO.setCanBalance(canBalance.multiply(new BigDecimal(100)));
refundDTO.setRefundAmount(money.multiply(new BigDecimal(100)));
refundDTO.setTotalAmount(goodsorder.getMoney());
refundDTO.setMemberId(goodsorder.getMemberId());
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
index d7d1f1f..48b43bd 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
@@ -95,7 +95,7 @@
.set(PricingParam::getName,pricingParam.getName())
// .set(PricingParam::getStatus,pricingParam.getStatus())
.set(PricingParam::getStartDate,pricingParam.getStartDate())
- .set(PricingParam::getEndDate,pricingParam.getEndDate())
+ .set(PricingParam::getEndDate,Utils.Date.getDayOfEnd(pricingParam.getEndDate()))
.set(PricingParam::getSortnum,pricingParam.getSortnum());
pricingParamMapper.update(null,wrapper);
}
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 2cbe6d2..643e1a3 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
@@ -113,6 +113,7 @@
if (!CollectionUtils.isEmpty(refundIPage.getRecords())){
refundIPage.getRecords().forEach(s->{
s.setMoney(Constants.translateMoney(s.getMoney()));
+ s.setCanBalance(Constants.translateMoney(s.getCanBalance()));
});
}
return PageData.from(refundIPage);
--
Gitblit v1.9.3