diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsInfoServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsInfoServiceImpl.java index b810beee7..4b2d8a206 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsInfoServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsInfoServiceImpl.java @@ -87,7 +87,7 @@ public class ConsInfoServiceImpl extends ServiceImpl i @Override public List getConsInfoList(ConsInfoDTO param) { QueryWrapper queryWrapper = buildQueryWrapper(param); - queryWrapper.eq(ConsInfo::getStatus,SystemConstants.OneZero.ONE); + queryWrapper.eq(ConsInfo::getStatus, SystemConstants.OneZero.ONE); List list = super.listAs(queryWrapper, ConsInfoDTO.class); List consGroupList = consGroupMapper.selectListByQuery(QueryWrapper.create().eq(ConsGroup::getShopId, param.getShopId())); Map collect = consGroupList.stream().collect(Collectors.toMap(ConsGroup::getId, ConsGroup::getName)); @@ -126,7 +126,9 @@ public class ConsInfoServiceImpl extends ServiceImpl i entity.setStockNumber(BigDecimal.ZERO); entity.setStatus(SystemConstants.OneZero.ONE); //entity.setConWarning(BigDecimal.ZERO); - entity.setIsStock(SystemConstants.OneZero.ZERO); + if (dto.getIsStock() == null) { + entity.setIsStock(SystemConstants.OneZero.ZERO); + } entity.setShopId(shopId); super.save(entity); dto.setId(entity.getId()); @@ -168,7 +170,7 @@ public class ConsInfoServiceImpl extends ServiceImpl i public void enableConsInfo(Long id) { Long shopId = StpKit.USER.getShopId(0L); UpdateChain.of(ConsInfo.class) - .set(ConsInfo::getStatus,SystemConstants.OneZero.ONE) + .set(ConsInfo::getStatus, SystemConstants.OneZero.ONE) .eq(ConsInfo::getId, id) .eq(ConsInfo::getShopId, shopId) .update();