From 40450a24e7703d432d5d0b6f484b023d4342bdbd Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 13 Aug 2024 15:54:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=9F=8E?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E7=89=A9=E6=96=99=E5=8C=85=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MaterialArtificerServiceImpl.java | 35 ++++++++++--------- .../service/impl/MaterialServiceImpl.java | 3 ++ 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java b/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java index 3a0c619..db2058b 100644 --- a/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java +++ b/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java @@ -148,22 +148,25 @@ public class MaterialArtificerServiceImpl extends ServiceImpl().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); + } + } } diff --git a/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java b/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java index ae42e81..625aace 100644 --- a/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java +++ b/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java @@ -174,6 +174,9 @@ public class MaterialServiceImpl extends ServiceImpl i IPage page1 = new Page(page, limit); IPage 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); } From 14b5fd4a5ad53cbaa33729ea7da5ca8d59fc436a Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Tue, 13 Aug 2024 15:59:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2024=E5=B9=B48=E6=9C=8813=E6=97=A5=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sqx/modules/app/service/impl/UserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index eeacc47..dd936fb 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -286,7 +286,6 @@ public class UserServiceImpl extends ServiceImpl implements } } else { UserEntity userInfo; - userInfo.setBindingConsortiaId(userInfo1.getBindingConsortiaId()); if(userInfo1.getType()!=null && userInfo1.getType()==2){ userInfo1.setArtificerOpenId(userInfo1.getOpenId()); userInfo1.setOpenId(null); @@ -305,6 +304,7 @@ public class UserServiceImpl extends ServiceImpl implements } } userInfo.setUpdateTime(date); + userInfo.setBindingConsortiaId(userInfo1.getBindingConsortiaId()); baseMapper.updateById(userInfo); if(userInfo1.getType()!=null && userInfo1.getType()==2){ Artificer artificer = artificerService.selectArtificerByUserId(userInfo.getUserId());