|
|
@@ -1376,10 +1376,10 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
//记录旧数据值,与新数据值 将旧数据与新数据都需要更新
|
|
|
List<User> useList=new ArrayList<>();
|
|
|
List<User> newList=new ArrayList<>();
|
|
|
- //领取
|
|
|
boolean typeFlag = AFTConstants.USER_TRANSFER_TO_OTHER.equals(operatorType)
|
|
|
|| AFTConstants.SIGN_USER_TRANSFER_TO_OTHER.equals(operatorType)
|
|
|
|| AFTConstants.CHANNEL_USER_TRANSFER_TO_OTHER.equals(operatorType);
|
|
|
+ //领取
|
|
|
if (AFTConstants.USER_RECEIVE.equals(operatorType)) {
|
|
|
User use = userMapper.selectByPrimaryKey(uid);
|
|
|
user.setAid(TokenManager.getAdminId());
|
|
|
@@ -1396,7 +1396,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
// organizationContactBookMapper.updateAdmin(uid,aid);
|
|
|
//转交
|
|
|
} else if (typeFlag) {
|
|
|
-
|
|
|
if (!isUs) {
|
|
|
user.setAid(aid);
|
|
|
if (data==1||data==3){
|
|
|
@@ -1586,14 +1585,16 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
|
|
|
@Override
|
|
|
public Integer receiveEveryDay(String uid) {
|
|
|
+ Integer signBills =null;
|
|
|
if (uid !=null ){
|
|
|
User u=userMapper.selectByPrimaryKey(uid);
|
|
|
+ signBills = u.getSignBills();
|
|
|
if (u.getShareType()!=1)return -1;
|
|
|
if (u.getNewChannel()==1)return 0;
|
|
|
}
|
|
|
int privateCount = userMapper.UserReceiveCount(TokenManager.getAdminId());
|
|
|
if (privateCount >= USER_RECEIVE_MAX)return -2;
|
|
|
- if(checkMax(uid,TokenManager.getAdminId()))return -3;
|
|
|
+ if((signBills==null||signBills==0)&&checkMax(uid,TokenManager.getAdminId()))return -3;
|
|
|
if(checkBeforeChannel(uid)) return -4;
|
|
|
return 0;
|
|
|
}
|