Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
8f8443a81a
|
@ -285,8 +285,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
|||
}
|
||||
}
|
||||
} else {
|
||||
UserEntity userInfo = new UserEntity();
|
||||
userInfo.setBindingConsortiaId(userInfo1.getBindingConsortiaId());
|
||||
UserEntity userInfo;
|
||||
if(userInfo1.getType()!=null && userInfo1.getType()==2){
|
||||
userInfo1.setArtificerOpenId(userInfo1.getOpenId());
|
||||
userInfo1.setOpenId(null);
|
||||
|
@ -305,6 +304,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
|||
}
|
||||
}
|
||||
userInfo.setUpdateTime(date);
|
||||
userInfo.setBindingConsortiaId(userInfo1.getBindingConsortiaId());
|
||||
baseMapper.updateById(userInfo);
|
||||
if(userInfo1.getType()!=null && userInfo1.getType()==2){
|
||||
Artificer artificer = artificerService.selectArtificerByUserId(userInfo.getUserId());
|
||||
|
|
|
@ -148,6 +148,7 @@ public class MaterialArtificerServiceImpl extends ServiceImpl<MaterialArtificerM
|
|||
}
|
||||
//根据物料包id和技师id查询技师对应物料包
|
||||
MaterialArtificer materialArtificer = baseMapper.selectOne(new QueryWrapper<MaterialArtificer>().eq("artificer_id",artificer.getArtificerId()).eq("material_id",material.getId()));
|
||||
if(materialArtificer != null && materialArtificer.getResidue() !=null){
|
||||
//修改物料包数量
|
||||
materialArtificer.setResidue(materialArtificer.getResidue().add(new BigDecimal(number)));
|
||||
baseMapper.updateById(materialArtificer);
|
||||
|
@ -165,6 +166,8 @@ public class MaterialArtificerServiceImpl extends ServiceImpl<MaterialArtificerM
|
|||
materialRecord.setRecordDescribe(DateUtil.date()+"通过商城购买"+(materialRecord.getType().equals(1)?"新增剩余数量:":"减少剩余数量:")+materialArtificer.getResidue()+"总和:"+materialRecord.getTotal());
|
||||
materialRecordService.addMaterialRecord(materialRecord);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -174,6 +174,9 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
|
|||
IPage<MaterialArtificerResult> page1 = new Page(page, limit);
|
||||
IPage<MaterialArtificerResult> materialIPage = materialMapper.selectMaterialArtificer(page1,materialArtificer);
|
||||
for(MaterialArtificerResult par:materialIPage.getRecords()){
|
||||
if(par.getResidue() == null){
|
||||
par.setResidue(BigDecimal.ZERO);
|
||||
}
|
||||
if(par.getResidue().compareTo(BigDecimal.ZERO)<0){
|
||||
par.setResidue(BigDecimal.ZERO);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue