|
@@ -84,6 +84,7 @@ public class BocomVipAccountBasicInfoServiceImpl extends ServiceImpl<BocomVipAcc
|
|
|
|
|
|
QueryWrapper<BocomBasicInfo> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<BocomBasicInfo> queryWrapper = new QueryWrapper<>();
|
|
queryWrapper.eq("user_create", LoginUserHolder.get().getUserName());
|
|
queryWrapper.eq("user_create", LoginUserHolder.get().getUserName());
|
|
|
|
+ queryWrapper.notIn("customer_status", "bocomCustomerStatus_fail", "bocomCustomerStatus_failed");
|
|
queryWrapper.orderByDesc("gmt_modified");
|
|
queryWrapper.orderByDesc("gmt_modified");
|
|
List<BocomBasicInfo> bocomBasicInfos = bocomBasicInfoService.list(queryWrapper);
|
|
List<BocomBasicInfo> bocomBasicInfos = bocomBasicInfoService.list(queryWrapper);
|
|
List<BocomVipAccountListVo> voList = new ArrayList<>();
|
|
List<BocomVipAccountListVo> voList = new ArrayList<>();
|
|
@@ -160,7 +161,13 @@ public class BocomVipAccountBasicInfoServiceImpl extends ServiceImpl<BocomVipAcc
|
|
});
|
|
});
|
|
vo.setVipAccountBasicInfoList(vipList);
|
|
vo.setVipAccountBasicInfoList(vipList);
|
|
}
|
|
}
|
|
- voList.add(vo);
|
|
|
|
|
|
+
|
|
|
|
+ if (CollectionUtil.isNotEmpty(vipList) || "bocomCustomerStatus_success".equals(customerStatusDic.getCode())) {
|
|
|
|
+ //生效:展示;
|
|
|
|
+ //待生效:不展示-整个卡片都不展示;
|
|
|
|
+ //终止:如果存在登记簿,则展示;如果不存在,则该卡片整个不展示
|
|
|
|
+ voList.add(vo);
|
|
|
|
+ }
|
|
});
|
|
});
|
|
}
|
|
}
|
|
return voList;
|
|
return voList;
|
|
@@ -318,7 +325,7 @@ public class BocomVipAccountBasicInfoServiceImpl extends ServiceImpl<BocomVipAcc
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- if (responseJson != null){
|
|
|
|
|
|
+ if (responseJson != null) {
|
|
BocomVipAccountBasicInfo newBasicInfo = JSONObject.parseObject(JSONObject.toJSONString(responseJson.getData()), BocomVipAccountBasicInfo.class);
|
|
BocomVipAccountBasicInfo newBasicInfo = JSONObject.parseObject(JSONObject.toJSONString(responseJson.getData()), BocomVipAccountBasicInfo.class);
|
|
|
|
|
|
updateById(newBasicInfo);
|
|
updateById(newBasicInfo);
|