From b59fc5522771bba6b5cae1ff7f7f0a47fd3f8584 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 09 一月 2024 13:46:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java | 11 +++--
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 52 ++++++++++++-------------
2 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
index cf6fa04..5f04ac6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
@@ -102,7 +102,7 @@
@ApiModelProperty(value = "鍗＄被鍨� 1 IC鍗� 2 CPU鍗� 3杩滆窛绂诲崱 4M鍗� -- 鍓嶇鏂板浼犲�煎啓姝�")
@ExcelColumn(name="鍗＄被鍨� 1 IC鍗� 2 CPU鍗� 3杩滆窛绂诲崱 4M鍗�")
- private Integer cardType;
+ private Integer type;
@ApiModelProperty(value = "鍗＄被鍨嬪悕绉�")
@TableField(exist = false)
@@ -110,12 +110,13 @@
@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
@ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
- private Integer type;
+ @TableField(exist = false)
+ private Integer memberType;
@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
@ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
@TableField(exist = false)
- private String typeName;
+ private String memberTypeName;
@ApiModelProperty(value = "鍏抽敭瀛�")
@TableField(exist = false)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index eeaf8a6..c778d4a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -46,6 +46,7 @@
@Override
public Integer create(MemberCard memberCard) {
+ memberCard.setStatus(Constants.ONE);
memberCardMapper.insert(memberCard);
return memberCard.getId();
}
@@ -85,11 +86,7 @@
}
public void updateRefundCard(MemberCard memberCard) {
- int i = memberCardMapper.updateById(memberCard);
- // 璋冪敤service 鍚屾鏇存柊娴峰悍閭ｈ竟鐨勫搴斿崱鐘舵�侊紝涔熸敼涓洪��鍗�
- if(i > 0){
-
- }
+ memberCardMapper.updateById(memberCard);
}
@Override
@@ -178,6 +175,7 @@
queryWrapper.selectAll(MemberCard.class)
.selectAs(Member::getName,MemberCard::getMemberName)
.selectAs(Member::getPhone,MemberCard::getMemberPhone)
+ .selectAs(Member::getType,MemberCard::getMemberType)
.selectAs(Company::getName,MemberCard::getCompanyName);
queryWrapper.like(Objects.nonNull(pageWrap.getModel().getCode()),MemberCard::getCode,pageWrap.getModel().getCode())
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),MemberCard::getStatus,pageWrap.getModel().getStatus())
@@ -200,34 +198,34 @@
private List<MemberCard> getDataPackage(IPage<MemberCard> memberCardIPage) {
List<MemberCard> newDataList = new ArrayList<>();
memberCardIPage.getRecords().stream().forEach(obj->{
- if(null != obj.getType()) {
- if(Constants.equalsInteger(obj.getCardType(),Constants.ZERO)) {
- obj.setTypeName(Constants.Status.LW_FK.getDes());
- }else if(Constants.equalsInteger(obj.getCardType(),Constants.ONE)){
- obj.setTypeName(Constants.Status.PT_FK.getDes());
- }else if(Constants.equalsInteger(obj.getCardType(),Constants.TWO)){
- obj.setTypeName(Constants.Status.NB_FK.getDes());
- }
- }
- if(null != obj.getCardType()) {
- if(Constants.equalsInteger(obj.getCardType(),Constants.ZERO)) {
- obj.setCardTypeName(HKConstants.CardStatus.DISABLE.getName());
- }else if(Constants.equalsInteger(obj.getCardType(),Constants.ONE)) {
- obj.setCardTypeName(HKConstants.CardStatus.ENABLE.getName());
- }else if(Constants.equalsInteger(obj.getCardType(),Constants.TWO)) {
- obj.setCardTypeName(HKConstants.CardStatus.REFUNDCARD.getName());
- }else if(Constants.equalsInteger(obj.getCardType(),Constants.THREE)) {
- obj.setCardTypeName(HKConstants.CardStatus.LOSS.getName());
+ if(null != obj.getMemberType()) {
+ if(Constants.equalsInteger(obj.getMemberType(),Constants.ZERO)) {
+ obj.setMemberTypeName(Constants.Status.LW_FK.getDes());
+ }else if(Constants.equalsInteger(obj.getMemberType(),Constants.ONE)){
+ obj.setMemberTypeName(Constants.Status.PT_FK.getDes());
+ }else if(Constants.equalsInteger(obj.getMemberType(),Constants.TWO)){
+ obj.setMemberTypeName(Constants.Status.NB_FK.getDes());
}
}
if(null != obj.getStatus()) {
- if(Constants.equalsInteger(obj.getCardType(),Constants.ONE)) {
+ if(Constants.equalsInteger(obj.getStatus(),Constants.ZERO)) {
+ obj.setStatusName(HKConstants.CardStatus.DISABLE.getName());
+ }else if(Constants.equalsInteger(obj.getStatus(),Constants.ONE)) {
+ obj.setStatusName(HKConstants.CardStatus.ENABLE.getName());
+ }else if(Constants.equalsInteger(obj.getStatus(),Constants.TWO)) {
+ obj.setStatusName(HKConstants.CardStatus.REFUNDCARD.getName());
+ }else if(Constants.equalsInteger(obj.getStatus(),Constants.THREE)) {
+ obj.setStatusName(HKConstants.CardStatus.LOSS.getName());
+ }
+ }
+ if(null != obj.getMemberType()) {
+ if(Constants.equalsInteger(obj.getMemberType(),Constants.ONE)) {
obj.setCardTypeName(HKConstants.CardStatus.IC.getName());
- }else if(Constants.equalsInteger(obj.getCardType(),Constants.TWO)) {
+ }else if(Constants.equalsInteger(obj.getMemberType(),Constants.TWO)) {
obj.setCardTypeName(HKConstants.CardStatus.CPU.getName());
- }else if(Constants.equalsInteger(obj.getCardType(),Constants.THREE)) {
+ }else if(Constants.equalsInteger(obj.getMemberType(),Constants.THREE)) {
obj.setCardTypeName(HKConstants.CardStatus.YJLCARD.getName());
- }else if(Constants.equalsInteger(obj.getCardType(),Constants.FOUR)) {
+ }else if(Constants.equalsInteger(obj.getMemberType(),Constants.FOUR)) {
obj.setCardTypeName(HKConstants.CardStatus.MCARD.getName());
}
}
--
Gitblit v1.9.3