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 { } else {
UserEntity userInfo = new UserEntity(); UserEntity userInfo;
userInfo.setBindingConsortiaId(userInfo1.getBindingConsortiaId());
if(userInfo1.getType()!=null && userInfo1.getType()==2){ if(userInfo1.getType()!=null && userInfo1.getType()==2){
userInfo1.setArtificerOpenId(userInfo1.getOpenId()); userInfo1.setArtificerOpenId(userInfo1.getOpenId());
userInfo1.setOpenId(null); userInfo1.setOpenId(null);
@ -305,6 +304,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
} }
} }
userInfo.setUpdateTime(date); userInfo.setUpdateTime(date);
userInfo.setBindingConsortiaId(userInfo1.getBindingConsortiaId());
baseMapper.updateById(userInfo); baseMapper.updateById(userInfo);
if(userInfo1.getType()!=null && userInfo1.getType()==2){ if(userInfo1.getType()!=null && userInfo1.getType()==2){
Artificer artificer = artificerService.selectArtificerByUserId(userInfo.getUserId()); Artificer artificer = artificerService.selectArtificerByUserId(userInfo.getUserId());

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

@ -148,6 +148,7 @@ public class MaterialArtificerServiceImpl extends ServiceImpl<MaterialArtificerM
} }
//根据物料包id和技师id查询技师对应物料包 //根据物料包id和技师id查询技师对应物料包
MaterialArtificer materialArtificer = baseMapper.selectOne(new QueryWrapper<MaterialArtificer>().eq("artificer_id",artificer.getArtificerId()).eq("material_id",material.getId())); 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))); materialArtificer.setResidue(materialArtificer.getResidue().add(new BigDecimal(number)));
baseMapper.updateById(materialArtificer); 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()); materialRecord.setRecordDescribe(DateUtil.date()+"通过商城购买"+(materialRecord.getType().equals(1)?"新增剩余数量：":"减少剩余数量：")+materialArtificer.getResidue()+"总和："+materialRecord.getTotal());
materialRecordService.addMaterialRecord(materialRecord); 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> page1 = new Page(page, limit);
IPage<MaterialArtificerResult> materialIPage = materialMapper.selectMaterialArtificer(page1,materialArtificer); IPage<MaterialArtificerResult> materialIPage = materialMapper.selectMaterialArtificer(page1,materialArtificer);
for(MaterialArtificerResult par:materialIPage.getRecords()){ for(MaterialArtificerResult par:materialIPage.getRecords()){
if(par.getResidue() == null){
par.setResidue(BigDecimal.ZERO);
}
if(par.getResidue().compareTo(BigDecimal.ZERO)<0){ if(par.getResidue().compareTo(BigDecimal.ZERO)<0){
par.setResidue(BigDecimal.ZERO); par.setResidue(BigDecimal.ZERO);
} }