From 3726375e0ae995404a76838f18bd5f40081a4412 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 06 十一月 2023 18:42:24 +0800
Subject: [PATCH] # 导出字段调整 登陆提示
---
server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java | 14 ++++++++------
server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 2 +-
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 4 ++--
server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java | 14 +++++++-------
server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java | 10 +++++++++-
5 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java b/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java
index 5c8d7c5..77ca66a 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java
@@ -13,7 +13,7 @@
import java.math.BigDecimal;
/**
- *
+ *
* @author 姹熻箘韫�
* @date 2023/09/27 18:08
*/
@@ -29,7 +29,7 @@
private String pid;
@ApiModelProperty(value = "浜ゆ槗鏃堕棿")
- @ExcelColumn(name="浜ゆ槗鏃堕棿",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鏀粯鏃堕棿",index = 4,width = 10,align = HorizontalAlignment.CENTER, dateFormat = "yyyy-MM-dd HH:mm:ss")
//@JsonFormat(pattern = "yyyy-MM-dd")
private Date billDate;
@@ -46,15 +46,15 @@
private String deviceInfo;
@ApiModelProperty(value = "寰俊浜ゆ槗鍙�")
- @ExcelColumn(name="寰俊浜ゆ槗鍙�",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="寰俊浜ゆ槗鍙�",index = 3, width = 10,align = HorizontalAlignment.CENTER)
private String transactionId;
@ApiModelProperty(value = "鍟嗘埛璁㈠崟鍙�")
- @ExcelColumn(name="璁㈠崟缂栧彿",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="璁㈠崟缂栧彿", index = 2,width = 10,align = HorizontalAlignment.CENTER)
private String outTradeNo;
@ApiModelProperty(value = "鐢ㄦ埛鏍囪瘑")
- @ExcelColumn(name="鐢ㄦ埛",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鐢ㄦ埛",index = 1,width = 10,align = HorizontalAlignment.CENTER)
private String openid;
@ApiModelProperty(value = "浜ゆ槗绫诲瀷")
@@ -70,7 +70,7 @@
private String feeType;
@ApiModelProperty(value = "搴旂粨璁㈠崟閲戦", example = "1")
- @ExcelColumn(name="浜ゆ槗閲戦",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鏀粯閲戦",index = 5, width = 10,align = HorizontalAlignment.CENTER)
private BigDecimal settlementTotalFee;
@ApiModelProperty(value = "浠ｉ噾鍒搁噾棰�", example = "1")
@@ -83,6 +83,7 @@
private String outRefundNo;
@ApiModelProperty(value = "閫�娆鹃噾棰�", example = "1")
+ @ExcelColumn(name="閫�娆鹃噾棰�",index = 6, width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
private BigDecimal refundFee;
@ApiModelProperty(value = "鍏呭�煎埜閫�娆鹃噾棰�", example = "1")
@@ -95,6 +96,7 @@
private Date refundApplyDate;
@ApiModelProperty(value = "閫�娆炬垚鍔熸椂闂�")
+ @ExcelColumn(name="閫�娆炬椂闂�",index = 6, width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date refundSuccessDate;
@ApiModelProperty(value = "閫�娆剧姸鎬�")
diff --git a/server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java b/server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java
index 699add8..a994ae9 100644
--- a/server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java
@@ -23,26 +23,26 @@
public class GoodsorderExportVO {
@ApiModelProperty(value = "缂栫爜")
- @ExcelColumn(name="璁㈠崟缂栧彿",index = 1,width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="璁㈠崟缂栧彿",index = 2,width = 10,align = HorizontalAlignment.CENTER)
private String id;
@ApiModelProperty(value = "璁㈠崟缂栫爜")
// @ExcelColumn(name="璁㈠崟缂栫爜")
private String code;
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
- @ExcelColumn(name="鐢ㄦ埛",width = 10,index = 2,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鐢ㄦ埛",width = 10,index = 1,align = HorizontalAlignment.CENTER)
private String openid;
@ApiModelProperty(value = "浜ゆ槗閲戦")
- @ExcelColumn(name="鏀粯閲戦",width = 10,index = 3,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鏀粯閲戦",width = 10,index = 4,align = HorizontalAlignment.CENTER)
private BigDecimal money;
@ApiModelProperty(value = "鏀粯鏃堕棿")
- @ExcelColumn(name="鏀粯鏃堕棿",width = 10,index = 4,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name="鏀粯鏃堕棿",width = 10,index = 3,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date payDate;
@ApiModelProperty(value = "缁撶畻閲戦(鍒嗭級")
- @ExcelColumn(name="缁撶畻閲戦",width = 10,index = 5,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="缁撶畻閲戦",width = 10,index = 7,align = HorizontalAlignment.CENTER)
private BigDecimal closeMoney;
@ApiModelProperty(value = "缁撶畻鏃堕棿")
@@ -50,11 +50,11 @@
private Date closeDate;
@ApiModelProperty(value = "閫�娆鹃噾棰�(鍒嗭級")
- @ExcelColumn(name="閫�娆鹃噾棰�",width = 10,index = 7,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="閫�娆鹃噾棰�",width = 10,index = 6,align = HorizontalAlignment.CENTER)
private BigDecimal refundMoney;
@ApiModelProperty(value = "閫�娆炬椂闂�")
- @ExcelColumn(name="閫�娆炬椂闂�",width = 10,index = 8,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name="閫�娆炬椂闂�",width = 10,index = 5,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date refundDate;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
index 07648d9..60a84d6 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
@@ -2,6 +2,7 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -12,10 +13,12 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -35,8 +38,11 @@
@Override
public String create(Ad ad) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
ad.setIsdeleted(Constants.ZERO);
ad.setStatus(Constants.ZERO);
+ ad.setCreateDate(new Date());
+ ad.setCreator(loginUserInfo.getId());
adMapper.insert(ad);
return ad.getId();
}
@@ -62,10 +68,12 @@
@Override
public void updateById(Ad ad) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
UpdateWrapper<Ad> wrapper = new UpdateWrapper<>();
wrapper.lambda()
.eq(Ad::getId,ad.getId())
- .set(Ad::getEditor,ad.getEditor())
+ .set(Ad::getEditor,loginUserInfo.getId())
.set(Ad::getEditDate,ad.getEditDate())
.set(Objects.nonNull(ad.getName()),Ad::getName,ad.getName())
.set(Objects.nonNull(ad.getImgurl()),Ad::getImgurl,ad.getImgurl())
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 80f821f..9d4b804 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -120,8 +120,8 @@
.eq(Member::getIsdeleted,Constants.ZERO)
.eq(Member::getType,Constants.ONE)
.eq(Member::getCardNo,member.getCardNo());
- Integer integer = memberMapper.selectCount(wrapper);
- if (integer > 0){
+ Member member1 = memberMapper.selectOne(wrapper);
+ if (Objects.nonNull(member1) && member1.getId().equals(member.getId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍗″彿瀛樺湪閲嶅");
}
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index 18b2ecc..d3fd532 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -123,7 +123,7 @@
if (e.getCause() instanceof BusinessException) {
throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(), e.getCause().getMessage());
}
- throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(), "鎻愮ず瀵逛笉璧凤紝璐﹀彿鎴栧瘑鐮侀敊璇紒");
+ throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(), "瀵逛笉璧凤紝璐﹀彿鎴栧瘑鐮侀敊璇紒");
}
}
--
Gitblit v1.9.3