From 7da512973b40df83aa48fa9b57b4f365466e253b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 10 一月 2024 14:38:11 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 39 +++++++
server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 60 ++++++++++++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java | 31 ++++--
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java | 6
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/CardDeletionRequest.java | 10 ++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 77 +++++++++-----
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/CardLossRequest.java | 10 ++
server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java | 4
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 8 +
9 files changed, 197 insertions(+), 48 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
index 9853e51..326d4c9 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -18,8 +18,8 @@
* @date 2021-10-10 14:40:35
* https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
*/
-//@Component
-//@EnableScheduling
+@Component
+@EnableScheduling
public class ScheduleTool {
@Autowired
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java
index 65345d2..4009dcf 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java
@@ -15,9 +15,9 @@
@ApiModel("浜哄憳鍚屾鎺ュ彛璇锋眰淇℃伅")
public class UserListRequest {
@ApiModelProperty(value = "浜哄憳鍞竴鏍囪瘑锛圗RP绔疘D锛�" ,example = "1")
- private Integer id;
- @ApiModelProperty(value = "缁勭粐鍞竴鏍囪瘑(ERP绔疘D锛�" ,example = "1")
- private Integer orgId;
+ private String id;
+ @ApiModelProperty(value = "缁勭粐鍞竴鏍囪瘑(ERP绔疘D锛�" )
+ private String orgId;
@ApiModelProperty(value = "浜哄憳濮撳悕锛屾敮鎸佹ā绯婃煡璇�" )
private String name;
@ApiModelProperty(value = "韬唤璇佸彿" )
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/CardDeletionRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/CardDeletionRequest.java
new file mode 100644
index 0000000..4ca9add
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/CardDeletionRequest.java
@@ -0,0 +1,10 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class CardDeletionRequest {
+
+ private String cardNumber;// string True 鍗″彿锛屾牴鎹幏鍙栧崱鐗囧垪琛ㄦ帴鍙ｈ幏鍙栬繑鍥炲弬鏁癱ardNo
+ private String personId ;//string True 浜哄憳Id锛岃幏鍙栦汉鍛樺垪琛╲2 鎺ュ彛鑾峰彇杩斿洖鍙傛暟personId
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/CardLossRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/CardLossRequest.java
new file mode 100644
index 0000000..35d149a
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/CardLossRequest.java
@@ -0,0 +1,10 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CardLossRequest {
+ private List<CardDeletionRequest> cardList;// object[] True 浜哄崱鍏宠仈缁撳悎鏁扮粍(鎵归噺鎸傚け鏁伴噺涓嶈兘瓒呰繃200涓�)
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 3f877b7..b2b5a1a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -703,6 +703,66 @@
return null;
}
/**
+ *娴峰悍閫�鍗�
+ * @return
+ */
+ public static BaseResponse cardDeletion(CardDeletionRequest param){
+ log.info("銆愭捣搴烽��鍗°��================寮�濮�===="+JSONObject.toJSONString(param));
+ String res = null;
+ try {
+ res = HKTools.cardDeletion(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse >(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍閫�鍗�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴烽��鍗°��================澶辫触====锛歕n"+ e.getMessage());
+ }finally {
+ }
+ return null;
+ }
+ /**
+ *娴峰悍鎵归噺鎸傚け
+ * @return
+ */
+ public static BaseResponse cardLoss(CardLossRequest param){
+ log.info("銆愭捣搴锋壒閲忔寕澶便��================寮�濮�===="+JSONObject.toJSONString(param));
+ String res = null;
+ try {
+ res = HKTools.cardDeletion(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse >(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鎵归噺鎸傚け");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋壒閲忔寕澶便��================澶辫触====锛歕n"+ e.getMessage());
+ }finally {
+ }
+ return null;
+ }
+ /**
+ *娴峰悍鎵归噺瑙ｆ寕
+ * @return
+ */
+ public static BaseResponse cardUnLoss(CardLossRequest param){
+ log.info("銆愭捣搴锋壒閲忚В鎸傘��================寮�濮�===="+JSONObject.toJSONString(param));
+ String res = null;
+ try {
+ res = HKTools.cardUnloss(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse >(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鎵归噺瑙ｆ寕");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋壒閲忚В鎸傘��================澶辫触====锛歕n"+ e.getMessage());
+ }finally {
+ }
+ return null;
+ }
+ /**
*娴峰悍鏌ヨ璁惧閫氶亾鐨勪汉鍛樻潈闄愪笅杞借鎯�
* @return
*/
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 c778d4a..5508be2 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
@@ -3,13 +3,17 @@
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ReUtil;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.CardDeletionRequest;
+import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.response.CarEventDTO;
-import com.doumee.dao.business.MemberCardMapper;
+import com.doumee.dao.business.*;
import com.doumee.dao.business.join.MemberCardJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
@@ -21,9 +25,11 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.service.business.impl.hksync.HkSyncOrgUserServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.*;
@@ -37,9 +43,18 @@
*/
@Service
public class MemberCardServiceImpl implements MemberCardService {
-
+ @Autowired
+ private MemberRoleMapper memberRoleMapper;
+ @Autowired
+ private DeviceRoleMapper deviceRoleMapper;
+ @Autowired
+ private DeviceMapper deviceMapper;
+ @Autowired
+ private EmpowerMapper empowerMapper;
@Autowired
private MemberCardMapper memberCardMapper;
+ @Autowired
+ private MemberMapper memberMapper;
@Autowired
private MemberCardJoinMapper memberCardJoinMapper;
@@ -84,9 +99,17 @@
this.updateById(memberCard);
}
}
-
+ @Override
+ @Transactional(rollbackFor = {Exception.class, BusinessException.class})
public void updateRefundCard(MemberCard memberCard) {
+ MemberCard model = memberCardMapper.selectById(memberCard.getId());
memberCardMapper.updateById(memberCard);
+ dealMemberRoleEmpower(memberMapper.selectById(memberCard.getMemberId()));
+
+ BaseResponse response = HKService.cardDeletion(new CardDeletionRequest());
+ if(){
+
+ }
}
@Override
@@ -111,6 +134,16 @@
return memberCardMapper.selectList(wrapper);
}
+ /**
+ * 鏇寸粏浜哄憳鍏ㄩ儴闂ㄧ鏉冮檺
+ * @param member
+ */
+ private void dealMemberRoleEmpower(Member member ) {
+ //澶勭悊鏂板鐨勪汉鍛樺崱鐗囨暟鎹紙涓庢捣搴峰悓姝ワ級
+ List<MemberCard> cards = HkSyncOrgUserServiceImpl.getNormalCardList(member,memberCardMapper);
+ HkSyncOrgUserServiceImpl.dealMemberRoleEmpowerDo(cards,member,deviceRoleMapper,empowerMapper,deviceMapper);
+ }
+
@Override
public PageData<MemberCard> findPage(PageWrap<MemberCard> pageWrap) {
IPage<MemberCard> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index 3589b9d..2c55df5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -34,6 +34,7 @@
import com.doumee.service.business.ERPSyncService;
import com.doumee.service.business.InterfaceLogService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.Synchronized;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -121,6 +122,7 @@
*/
@Override
@Transactional
+ @Synchronized
public String syncCompany(OrgListRequest param){
if(!StringUtils.equals(Constants.ONE+"", systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORG_USER_ORIGIN).getCode())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佺粍缁囧悓姝ユ搷浣渵");
@@ -271,6 +273,7 @@
*/
@Override
@Transactional
+ @Synchronized
public String syncUsers(UserListRequest param){
if(!StringUtils.equals(Constants.ONE+"", systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORG_USER_ORIGIN).getCode())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佷汉鍛樺悓姝ユ搷浣渵");
@@ -322,7 +325,12 @@
private void dealUserChangeList(List<ErpUserListResponse> list, List<Member> addList, List<Member> updateList, List<Member> delList, List<Member> allList,UserListRequest param) {
Date date = new Date();
+ int num =0;
for(ErpUserListResponse response : list){
+ response.setPhone("1534569100"+num);
+ response.setFaceImg("20223402/DM1005.png");
+ response.setIdNo("34112219880427200"+num);
+ num++;
Company company = new Company();
if(StringUtils.isNotBlank(response.getOrgId())){
company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,response.getOrgId()).last("limit 1"));
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
index 2a30a2e..a326513 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -224,7 +224,28 @@
}
}
+ /**
+ * 鍒嗘璇锋眰涓嬪彂鏉冮檺
+ * @param list
+ */
private void dealDelListTask(List<Empower> list) {
+ int sublistSize = 100;
+ int startIndex = 0;
+ int endIndex = sublistSize;
+
+ while (startIndex < list.size()) {
+ if (endIndex > list.size()) {
+ endIndex = list.size();
+ }
+ List<Empower> sublist = list.subList(startIndex, endIndex);
+ if(sublist.size()>0){
+ dealDelListTaskDo(sublist);
+ }
+ startIndex = endIndex;
+ endIndex += sublistSize;
+ }
+ }
+ private void dealDelListTaskDo(List<Empower> list) {
//鎸夌収鐖剁骇鐢宠鍒嗘壒澶勭悊姣忔鐢宠鏁版嵁
if(list ==null || list.size()==0){
return;
@@ -232,43 +253,41 @@
Date date = new Date();
//鍒涘缓浠诲姟
String taskId = hkTaskAddtion();
- List<Empower> successList = new ArrayList<>();
- List<Empower> errorList = new ArrayList<>();
+ List<Integer> successList = new ArrayList<>();
+ List<Integer> errorList = new ArrayList<>();
for(Empower c : list) {
//鍚戜换鍔℃坊鍔犱汉鍛樸�佽澶囦俊鎭暟鎹�
if(addTaskData(c,taskId,HKConstants.OPERA_TYPE.DEL.getKey())){
- successList.add(c);
+ successList.add(c.getId());
}else{
- errorList.add(c);
+ errorList.add(c.getId());
}
}
if(successList.size()>0){
//寮�濮嬫墽琛屼笅鍙�
boolean status = startTask(taskId);
- for(Empower model : successList){
- Empower update = new Empower();
- update.setId(model.getId());
- update.setSendDate(date);
- update.setEditDate(date);
- update.setHkId(taskId);
- update.setRemark(status?"涓嬪彂浠诲姟鎵ц鎴愬姛":"涓嬪彂浠诲姟鎵ц澶辫触");
- update.setSendInfo(status?"涓嬪彂浠诲姟鎵ц鎴愬姛":"涓嬪彂浠诲姟鎵ц澶辫触");
- //涓嬪彂涓�
- update.setSendStatus(status?Constants.EmpowerStatus.ing:Constants.EmpowerStatus.fail);
- empowerMapper.updateById(update);
- }
+ empowerMapper.update(null,new UpdateWrapper<Empower>()
+ .lambda()
+ .set(Empower::getSendDate,date)
+ .set(Empower::getEditDate,date)
+ .set(Empower::getSendStatus,status?Constants.EmpowerStatus.ing:Constants.EmpowerStatus.fail)
+ .set(Empower::getHkId,taskId)
+ .set(Empower::getSendInfo,status?"涓嬪彂浠诲姟鎵ц鎴愬姛":"涓嬪彂浠诲姟鎵ц澶辫触")
+ .set(Empower::getRemark,status?"涓嬪彂浠诲姟鎵ц鎴愬姛":"涓嬪彂浠诲姟鎵ц澶辫触")
+ .set(Empower::getEditDate,date)
+ .in(Empower::getId,successList));
}
- for(Empower model : errorList){
- Empower update = new Empower();
- update.setId(model.getId());
- update.setSendDate(date);
- update.setEditDate(date);
- update.setHkId(taskId);
- update.setSendStatus(Constants.EmpowerStatus.fail);
- update.setSendInfo( "娣诲姞涓嬪彂浠诲姟鏁版嵁鍒櫎鎺堟潈澶辫触");
- update.setRemark( "娣诲姞涓嬪彂浠诲姟鏁版嵁鍒櫎鎺堟潈澶辫触");
- empowerMapper.updateById(update);
- }
+
+ empowerMapper.update(null,new UpdateWrapper<Empower>()
+ .lambda()
+ .set(Empower::getSendStatus,Constants.EmpowerStatus.fail)
+ .set(Empower::getSendDate,date)
+ .set(Empower::getEditDate,date)
+ .set(Empower::getHkId,taskId)
+ .set(Empower::getSendInfo, "娣诲姞涓嬪彂浠诲姟鏁版嵁鍒櫎鎺堟潈澶辫触")
+ .set(Empower::getRemark, "娣诲姞涓嬪彂浠诲姟鏁版嵁鍒櫎鎺堟潈澶辫触")
+ .set(Empower::getEditDate,date)
+ .in(Empower::getId,errorList));
}
private void dealNewListTask(List<Empower> list) {
@@ -407,13 +426,13 @@
queryWrapper.selectAll(Empower.class);
queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
- queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
queryWrapper.selectAs(Device::getResourceType,Empower::getDeviceType);
+ queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId);
queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.downloaded);
+ queryWrapper.isNotNull(Member::getHkId) ;
queryWrapper.orderByAsc(Empower::getSendDate);
- queryWrapper.isNotNull(Empower::getMemberHkId) ;
List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
return list;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java
index bc74520..916c664 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java
@@ -43,10 +43,13 @@
public class HkSyncOrgUserServiceImpl extends HkSyncBaseServiceImpl {
@Autowired
private CompanyMapper companyMapper;
+
+ @Autowired
+ private MemberRoleMapper memberRoleMapper;
@Autowired
private DeviceRoleMapper deviceRoleMapper;
@Autowired
- private MemberRoleMapper memberRoleMapper;
+ private DeviceMapper deviceMapper;
@Autowired
private EmpowerMapper empowerMapper;
@Autowired
@@ -55,8 +58,6 @@
private MemberJoinMapper memberMapper;
@Autowired
private ERPSyncService erpSyncService;
- @Autowired
- private DeviceMapper deviceMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -284,7 +285,7 @@
Constants.DEALING_HK_USER =false;
}
}
- private List<Integer> getRoleIdByParam( Member member) {
+ public static List<Integer> getRoleIdByParam( Member member,DeviceRoleMapper deviceRoleMapper) {
//鏌ヨ鏁版嵁搴撳瓨鍦ㄧ殑鏉冮檺
List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
.eq(DeviceRole::getType,Constants.TWO)
@@ -332,10 +333,14 @@
private void dealMemberRoleEmpower(Member member ) {
//澶勭悊鏂板鐨勪汉鍛樺崱鐗囨暟鎹紙涓庢捣搴峰悓姝ワ級
List<MemberCard> cards = dealMemberHkCard(member);
+ dealMemberRoleEmpowerDo(cards,member,deviceRoleMapper,empowerMapper,deviceMapper);
+ }
+
+ public static void dealMemberRoleEmpowerDo(List<MemberCard> cards,Member member , DeviceRoleMapper deviceRoleMapper, EmpowerMapper empowerMapper, DeviceMapper deviceMapper) {
if(cards == null || cards.size() == 0){
return;
}
- List<Integer> doorIds = getRoleIdByParam(member);
+ List<Integer> doorIds = getRoleIdByParam(member,deviceRoleMapper);
if(doorIds==null || doorIds.size() == 0){
return;
}
@@ -402,10 +407,7 @@
.eq(MemberCard::getHkStatus,Constants.ZERO) );
if(memberCards==null || memberCards.size()==0){
//娌℃湁甯﹀鐞嗙殑鏁版嵁锛岀洿鎺ヨ烦杩�
- return memberCardMapper.selectList(new QueryWrapper<MemberCard>().lambda()
- .eq(MemberCard::getMemberId,member.getId())
- .eq(MemberCard::getType,Constants.TWO)
- .eq(MemberCard::getHkStatus,Constants.ONE) );
+ return getNormalCardList(member,memberCardMapper);
}
List<Integer> allCodes = new ArrayList<>();
@@ -456,11 +458,18 @@
.notIn(doneCodes.size()>0,MemberCard::getCode,doneCodes)
.in(MemberCard::getId,allCodes));
- return memberCardMapper.selectList(new QueryWrapper<MemberCard>().lambda()
+ return getNormalCardList(member,memberCardMapper);
+ }
+
+ public static List<MemberCard> getNormalCardList(Member member,MemberCardMapper memberCardMapper) {
+ return memberCardMapper.selectList(new QueryWrapper<MemberCard>().lambda()
.eq(MemberCard::getMemberId,member.getId())
.eq(MemberCard::getType,Constants.TWO)
+ .eq(MemberCard::getStatus,Constants.MemberCard.normal)
.eq(MemberCard::getHkStatus,Constants.ONE) );
+
}
+
/**
* 濡傛灉涔嬪墠宸茬粡鍜屾捣搴峰悓姝ワ紝鍒欐洿鏂扮敤鎴锋暟鎹互鍙婁汉鑴告暟鎹紙鍙兘鏂板浜鸿劯 涔熷彲鑳芥洿鏂颁汉鑴革級
@@ -594,7 +603,7 @@
*/
private boolean doHkDeleteUser(Integer id,String delHkIds, Date date ) {
if(StringUtils.isBlank(delHkIds)){
- return false;
+ return true;
}
UserDelRequest request = new UserDelRequest();
request.setPersonIds(new String[]{delHkIds});
--
Gitblit v1.9.3