yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
曹磊 2024-08-13 17:47:53 +08:00
parent f79357111e ccd4831453
commit 8f8443a81a
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
View File

@ -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());

35
src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java
View File

@ -148,22 +148,25 @@ 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()));
//修改物料包数量
materialArtificer.setResidue(materialArtificer.getResidue().add(new BigDecimal(number)));
baseMapper.updateById(materialArtificer);
//修改剩余量，执行新增历史记录
MaterialRecord materialRecord = new MaterialRecord();
materialRecord.setMaterialId(materialArtificer.getMaterialId());
materialRecord.setType(1);
materialRecord.setTotal(materialArtificer.getResidue());
materialRecord.setNumber(BigDecimal.valueOf(number));
materialRecord.setUpdateTime(new Date());
materialRecord.setCreateTime(new Date());
materialRecord.setCreateUser(Long.valueOf(materialArtificer.getArtificerId()));
materialRecord.setArtificerId(materialArtificer.getArtificerId());
materialRecord.setUpdateUser(Long.valueOf(materialArtificer.getArtificerId()));
materialRecord.setRecordDescribe(DateUtil.date()+"通过商城购买"+(materialRecord.getType().equals(1)?"新增剩余数量：":"减少剩余数量：")+materialArtificer.getResidue()+"总和："+materialRecord.getTotal());
materialRecordService.addMaterialRecord(materialRecord);
if(materialArtificer != null && materialArtificer.getResidue() !=null){
//修改物料包数量
materialArtificer.setResidue(materialArtificer.getResidue().add(new BigDecimal(number)));
baseMapper.updateById(materialArtificer);
//修改剩余量，执行新增历史记录
MaterialRecord materialRecord = new MaterialRecord();
materialRecord.setMaterialId(materialArtificer.getMaterialId());
materialRecord.setType(1);
materialRecord.setTotal(materialArtificer.getResidue());
materialRecord.setNumber(BigDecimal.valueOf(number));
materialRecord.setUpdateTime(new Date());
materialRecord.setCreateTime(new Date());
materialRecord.setCreateUser(Long.valueOf(materialArtificer.getArtificerId()));
materialRecord.setArtificerId(materialArtificer.getArtificerId());
materialRecord.setUpdateUser(Long.valueOf(materialArtificer.getArtificerId()));
materialRecord.setRecordDescribe(DateUtil.date()+"通过商城购买"+(materialRecord.getType().equals(1)?"新增剩余数量：":"减少剩余数量：")+materialArtificer.getResidue()+"总和："+materialRecord.getTotal());
materialRecordService.addMaterialRecord(materialRecord);
}
}
}

3
src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java
View File

@ -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);
}