From 114460f91550ad2b1c8d8b84d9fde203873f5d16 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 8 Jul 2024 09:20:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81=20?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=8F=AF=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- .../impl/productimpl/TbProductServiceImpl.java | 14 +++++++------- .../TbShopPurveyorTransactServiceImpl.java | 13 +------------ eladmin-system/src/main/resources/logback.xml | 4 ++-- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 9acb04ae..28fb35fc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ */target/* */*.iml /.gradle/ -/application.pid \ No newline at end of file +/application.pid +*.log \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java index 677c0db5..1f5c4dc5 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java @@ -332,13 +332,13 @@ public class TbProductServiceImpl implements TbProductService { if (resources.getCategoryId() == null) { throw new BadRequestException("必填内容未填写"); } - if (resources.getIsShowMall() == 1) { - for (TbProductSku sku : resources.getSkuList()) { - if (sku.getStockNumber() <= 0) { - throw new BadRequestException("上架区域包括小程序时,库存数量必须大于0。"); - } - } - } +// if (resources.getIsShowMall() == 1) { +// for (TbProductSku sku : resources.getSkuList()) { +// if (sku.getStockNumber() <= 0) { +// throw new BadRequestException("上架区域包括小程序时,库存数量必须大于0。"); +// } +// } +// } product.setCategoryId(String.valueOf(resources.getCategoryId())); } if (!CollectionUtils.isEmpty(resources.getImages())) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorTransactServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorTransactServiceImpl.java index 75cce193..b9cb0253 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorTransactServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorTransactServiceImpl.java @@ -112,19 +112,8 @@ public class TbShopPurveyorTransactServiceImpl implements TbShopPurveyorTransact ValidationUtil.isNull(tbShopPurveyorTransact.getId(), "TbShopPurveyorTransact", "id", resources.getId()); tbShopPurveyorTransact.setPaidAmount(tbShopPurveyorTransact.getPaidAmount().add(resources.getPaidAmount())); tbShopPurveyorTransact.setWaitAmount(tbShopPurveyorTransact.getTotalAmount().subtract(tbShopPurveyorTransact.getPaidAmount())); -// if (resources.getPaidAmount().compareTo(BigDecimal.ZERO) == 0) { -// throw new BadRequestException("付款金额不能为 0"); -// } else { -// if (tbShopPurveyorTransact.getWaitAmount().compareTo(BigDecimal.ZERO) > 0 && resources.getPaidAmount().compareTo(BigDecimal.ZERO) > 0) {//待付款金额大于0 -// tbShopPurveyorTransact.setWaitAmount(tbShopPurveyorTransact.getWaitAmount().subtract(resources.getPaidAmount())); -// } else if (tbShopPurveyorTransact.getWaitAmount().compareTo(BigDecimal.ZERO) < 0 && resources.getPaidAmount().compareTo(BigDecimal.ZERO) < 0) { -// tbShopPurveyorTransact.setWaitAmount(tbShopPurveyorTransact.getWaitAmount().subtract(resources.getPaidAmount())); -// } else { -// tbShopPurveyorTransact.setWaitAmount(tbShopPurveyorTransact.getWaitAmount().add(resources.getPaidAmount())); -// } -// } tbShopPurveyorTransact.setPaidAt(System.currentTimeMillis()); - if (tbShopPurveyorTransact.getWaitAmount().compareTo(tbShopPurveyorTransact.getPaidAmount()) <= 0) { + if (tbShopPurveyorTransact.getPaidAmount().compareTo(tbShopPurveyorTransact.getTotalAmount()) >= 0) { tbShopPurveyorTransact.setStatus(1); }else { tbShopPurveyorTransact.setStatus(0); diff --git a/eladmin-system/src/main/resources/logback.xml b/eladmin-system/src/main/resources/logback.xml index c959995d..ddd11093 100644 --- a/eladmin-system/src/main/resources/logback.xml +++ b/eladmin-system/src/main/resources/logback.xml @@ -38,8 +38,8 @@ - - + + From 9ce0db167e65bce08f3f734eae38acb732667f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Mon, 8 Jul 2024 10:26:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ysk/cashier/cons/domain/SuppFlow.java | 40 ++++ .../cons/rest/TbConsInfoController.java | 3 +- .../cons/service/TbConsInfoService.java | 3 +- .../service/impl/TbConsInfoServiceImpl.java | 199 +++++++++--------- 4 files changed, 143 insertions(+), 102 deletions(-) create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java new file mode 100644 index 00000000..e7f333fb --- /dev/null +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java @@ -0,0 +1,40 @@ +package cn.ysk.cashier.cons.domain; + +import lombok.Data; +import org.springframework.security.core.parameters.P; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +@Data +public class SuppFlow implements Serializable { + + private BigDecimal accountsPayable; + + private BigDecimal actualPayment; + + private Date paymentTime; + + private Integer supplierId; + + private String type; + + private Integer shopId; + + private List list; + + + + @Data + public static class ConInfos{ + private Integer conInfold; + + private BigDecimal price; + + private BigDecimal stockNumber; + } + + +} diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoController.java index cab95f24..4a03577c 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoController.java @@ -1,6 +1,7 @@ package cn.ysk.cashier.cons.rest; import cn.ysk.cashier.annotation.Log; +import cn.ysk.cashier.cons.domain.SuppFlow; import cn.ysk.cashier.cons.domain.TbConsInfo; import cn.ysk.cashier.cons.domain.TbConsSuppFlow; import cn.ysk.cashier.cons.service.TbConsInfoService; @@ -68,7 +69,7 @@ public class TbConsInfoController { @PostMapping(value = "stockInOut") @Log("耗材出入库") @ApiOperation("耗材出入库") - public ResponseEntity stockInOut(@Validated @RequestBody List resources) throws Exception { + public ResponseEntity stockInOut(@Validated @RequestBody SuppFlow resources) throws Exception { tbConsInfoService.stockInOut(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsInfoService.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsInfoService.java index 00b50224..3260b05d 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsInfoService.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsInfoService.java @@ -1,5 +1,6 @@ package cn.ysk.cashier.cons.service; +import cn.ysk.cashier.cons.domain.SuppFlow; import cn.ysk.cashier.cons.domain.TbConsInfo; import cn.ysk.cashier.cons.domain.TbConsSuppFlow; import cn.ysk.cashier.cons.service.dto.TbConsInfoDto; @@ -66,5 +67,5 @@ public interface TbConsInfoService { void download(List all, HttpServletResponse response) throws IOException; - void stockInOut(List resources) throws Exception; + void stockInOut(SuppFlow resources) throws Exception; } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java index 2c8315d4..c2f7d634 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java @@ -1,13 +1,14 @@ package cn.ysk.cashier.cons.service.impl; -import cn.ysk.cashier.cons.domain.TbConsInfo; -import cn.ysk.cashier.cons.domain.TbConsInfoFlow; -import cn.ysk.cashier.cons.domain.TbConsSuppFlow; -import cn.ysk.cashier.cons.domain.TbConsType; +import cn.ysk.cashier.cons.domain.*; import cn.ysk.cashier.cons.repository.TbConsInfoFlowRepository; +import cn.ysk.cashier.cons.repository.TbConsInfoRepository; import cn.ysk.cashier.cons.repository.TbConsSuppFlowRepository; import cn.ysk.cashier.cons.repository.TbConsTypeRepository; -import cn.ysk.cashier.cons.service.mapstruct.TbConsSuppFlowMapper; +import cn.ysk.cashier.cons.service.TbConsInfoService; +import cn.ysk.cashier.cons.service.dto.TbConsInfoDto; +import cn.ysk.cashier.cons.service.dto.TbConsInfoQueryCriteria; +import cn.ysk.cashier.cons.service.mapstruct.TbConsInfoMapper; import cn.ysk.cashier.pojo.product.TbProductStockOperate; import cn.ysk.cashier.pojo.shop.TbShopInfo; import cn.ysk.cashier.pojo.shop.TbShopPurveyor; @@ -22,43 +23,34 @@ import cn.ysk.cashier.utils.QueryHelp; import cn.ysk.cashier.utils.ValidationUtil; import com.alibaba.fastjson.JSON; import lombok.RequiredArgsConstructor; -import cn.ysk.cashier.cons.repository.TbConsInfoRepository; -import cn.ysk.cashier.cons.service.TbConsInfoService; -import cn.ysk.cashier.cons.service.dto.TbConsInfoDto; -import cn.ysk.cashier.cons.service.dto.TbConsInfoQueryCriteria; -import cn.ysk.cashier.cons.service.mapstruct.TbConsInfoMapper; import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.math.BigDecimal; import java.sql.Timestamp; import java.util.*; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; /** -* @website https://eladmin.vip -* @description 服务实现 -* @author admin -* @date 2024-06-22 -**/ + * @author admin + * @website https://eladmin.vip + * @description 服务实现 + * @date 2024-06-22 + **/ @Service @RequiredArgsConstructor @Slf4j public class TbConsInfoServiceImpl implements TbConsInfoService { + public final TbConsTypeRepository tbConsTypeRepository; + public final TbConsInfoFlowRepository tbConsInfoFlowRepository; + public final TbConsSuppFlowRepository tbConsSuppFlowRepository; private final TbConsInfoRepository tbConsInfoRepository; private final TbConsInfoMapper tbConsInfoMapper; - - public final TbConsTypeRepository tbConsTypeRepository; - - public final TbConsInfoFlowRepository tbConsInfoFlowRepository; - - public final TbConsSuppFlowRepository tbConsSuppFlowRepository; - private final TbShopPurveyorRepository tbShopPurveyorRepository; private final TbShopInfoRepository tbShopInfoRepository; @@ -71,21 +63,21 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { @Override - public Map queryAll(TbConsInfoQueryCriteria criteria, Pageable pageable){ - Page page = tbConsInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); + public Map queryAll(TbConsInfoQueryCriteria criteria, Pageable pageable) { + Page page = tbConsInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable); return PageUtil.toPage(page.map(tbConsInfoMapper::toDto)); } @Override - public List queryAll(TbConsInfoQueryCriteria criteria){ - return tbConsInfoMapper.toDto(tbConsInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); + public List queryAll(TbConsInfoQueryCriteria criteria) { + return tbConsInfoMapper.toDto(tbConsInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder))); } @Override @Transactional public TbConsInfoDto findById(Integer id) { TbConsInfo tbConsInfo = tbConsInfoRepository.findById(id).orElseGet(TbConsInfo::new); - ValidationUtil.isNull(tbConsInfo.getId(),"TbConsInfo","id",id); + ValidationUtil.isNull(tbConsInfo.getId(), "TbConsInfo", "id", id); return tbConsInfoMapper.toDto(tbConsInfo); } @@ -94,15 +86,14 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { public TbConsInfoDto create(TbConsInfo resources) throws Exception { - TbConsType tbConsType= tbConsTypeRepository.getById(resources.getConTypeId()); - if(Objects.isNull(tbConsType)){ + TbConsType tbConsType = tbConsTypeRepository.getById(resources.getConTypeId()); + if (Objects.isNull(tbConsType)) { throw new Exception("不存在的耗材类型"); } - - int count= tbConsInfoRepository.countByConCode(resources.getConCode()); - if(count>0){ + int count = tbConsInfoRepository.countByConCode(resources.getConCode()); + if (count > 0) { throw new Exception("耗材代码不允许重复"); } @@ -120,7 +111,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { public void update(TbConsInfo resources) throws Exception { TbConsInfo tbConsInfo = tbConsInfoRepository.findById(resources.getId()).orElseGet(TbConsInfo::new); - if(Objects.isNull(tbConsInfo)){ + if (Objects.isNull(tbConsInfo)) { throw new Exception("耗材信息不存在"); } @@ -146,7 +137,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { public void download(List all, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); for (TbConsInfoDto tbConsInfo : all) { - Map map = new LinkedHashMap<>(); + Map map = new LinkedHashMap<>(); map.put("耗材类型id", tbConsInfo.getConTypeId()); map.put("耗材类型名称", tbConsInfo.getConTypeName()); map.put("耗材代码", tbConsInfo.getConCode()); @@ -155,7 +146,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { map.put("单位值", tbConsInfo.getConUnit()); map.put("最近一次入库量", tbConsInfo.getLasterInStock()); map.put("创建时间", tbConsInfo.getCreateTime()); - map.put("耗材预警值",tbConsInfo.getConWarning()); + map.put("耗材预警值", tbConsInfo.getConWarning()); map.put("更新时间", tbConsInfo.getUpdateTime()); map.put("店铺id", tbConsInfo.getShopId()); list.add(map); @@ -165,30 +156,54 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { @Override @Transactional(rollbackFor = Exception.class) - public void stockInOut(List resources) throws Exception { - if(Objects.isNull(resources)&&resources.size()<=0){ + public void stockInOut(SuppFlow resources) throws Exception { + if (Objects.isNull(resources)) { throw new Exception("参数错误"); } - for (TbConsSuppFlow resource : resources) { - TbConsInfo info= tbConsInfoRepository.getById(resource.getConInfoId()); - if(Objects.isNull(info)){ + TbShopInfo tbShopInfo = tbShopInfoRepository.getById(resources.getShopId()); + if (Objects.isNull(tbShopInfo)) { + throw new Exception("店铺信息不存在"); + } + TbShopPurveyor purveyor = tbShopPurveyorRepository.getById(resources.getSupplierId()); + if (Objects.isNull(purveyor)) { + throw new Exception("不存在的供应商"); + } + + + TbProductStockOperate stockOperate = new TbProductStockOperate(); + stockOperate.setShopId(tbShopInfo.getId().toString()); + stockOperate.setStockSnap(""); + stockOperate.setType(resources.getType()); + stockOperate.setSubType(-1); + Map operatorSnapMap = new HashMap<>(); + operatorSnapMap.put("name", tbShopInfo.getShopName()); + operatorSnapMap.put("account", tbShopInfo.getAccount()); + + stockOperate.setOperatorSnap(JSON.toJSONString(operatorSnapMap)); + stockOperate.setBatchNumber(""); + stockOperate.setRemark(""); + stockOperate.setStockTime(System.currentTimeMillis()); + stockOperate.setCreatedAt(System.currentTimeMillis()); + stockOperate.setUpdatedAt(System.currentTimeMillis()); + stockOperate.setStatus("normal"); + stockOperate.setPurveyorId(resources.getSupplierId().toString()); + stockOperate.setPurveyorName(purveyor.getPurveyorName()); + + tbProductStockOperateRepository.save(stockOperate); + + + for (SuppFlow.ConInfos conInfos : resources.getList()) { + + TbConsInfo info = tbConsInfoRepository.getById(conInfos.getConInfold()); + if (Objects.isNull(info)) { log.info("耗材信息不存在"); continue; } - TbShopInfo tbShopInfo= tbShopInfoRepository.getById(resource.getShopId()); - if(Objects.isNull(tbShopInfo)){ - log.info("店铺信息不存在"); - continue; - } - TbShopPurveyor purveyor= tbShopPurveyorRepository.getById(resource.getSupplierId()); - if(Objects.isNull(purveyor)){ - log.info("不存在的供应商"); - continue; - } - TbConsInfoFlow flow=new TbConsInfoFlow(); + TbConsSuppFlow suppFlow = new TbConsSuppFlow(); + TbConsInfoFlow flow = new TbConsInfoFlow(); TbShopPurveyorTransact purveyorTransact = new TbShopPurveyorTransact(); purveyorTransact.setShopId(tbShopInfo.getId().toString()); @@ -198,64 +213,52 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { purveyorTransact.setCreatedAt(System.currentTimeMillis()); purveyorTransact.setUpdatedAt(System.currentTimeMillis()); + suppFlow.setConInfoId(info.getConTypeId()); + suppFlow.setShopId(resources.getShopId()); + suppFlow.setSupplierId(resources.getSupplierId()); + suppFlow.setType(resources.getType()); + if ("in".equals(resources.getType())) { + info.setStockNumber(info.getStockNumber().add(conInfos.getStockNumber())); + info.setLasterInStock(conInfos.getStockNumber()); + suppFlow.setBalance(info.getStockNumber().subtract(info.getStockConsume()).add(conInfos.getStockNumber())); - TbProductStockOperate stockOperate = new TbProductStockOperate(); - stockOperate.setShopId(tbShopInfo.getId().toString()); - stockOperate.setStockSnap(""); - stockOperate.setType(resource.getType()); - stockOperate.setSubType(-1); - Map operatorSnapMap = new HashMap<>(); - operatorSnapMap.put("name", tbShopInfo.getShopName()); - operatorSnapMap.put("account", tbShopInfo.getAccount()); - - stockOperate.setOperatorSnap(JSON.toJSONString(operatorSnapMap)); - stockOperate.setBatchNumber(""); - stockOperate.setRemark(""); - stockOperate.setStockTime(System.currentTimeMillis()); - stockOperate.setCreatedAt(System.currentTimeMillis()); - stockOperate.setUpdatedAt(System.currentTimeMillis()); - stockOperate.setStatus("normal"); - stockOperate.setPurveyorId(resource.getSupplierId().toString()); - stockOperate.setPurveyorName(purveyor.getPurveyorName()); - - tbProductStockOperateRepository.save(stockOperate); - - if("in".equals(resource.getType())){ - info.setStockNumber(info.getStockNumber().add(resource.getStockNumber())); - info.setLasterInStock(resource.getStockNumber()); - resource.setType("in"); - flow.setBizCode("stockIn"); flow.setBizName("耗材入库"); flow.setBizType("+"); - purveyorTransact.setTotalAmount(resource.getAccountsPayable()); - purveyorTransact.setPaidAmount(resource.getActualPayment()); - purveyorTransact.setWaitAmount((resource.getAccountsPayable().subtract(resource.getActualPayment()))); + purveyorTransact.setTotalAmount(resources.getAccountsPayable()); + purveyorTransact.setPaidAmount(resources.getActualPayment()); + purveyorTransact.setWaitAmount((resources.getAccountsPayable().subtract(resources.getActualPayment()))); purveyorTransact.setType("cons_in"); - }else { + } else { + info.setStockNumber(info.getStockNumber().subtract(conInfos.getStockNumber())); + suppFlow.setBalance(info.getStockNumber().subtract(info.getStockConsume()).subtract(conInfos.getStockNumber())); - info.setStockNumber(info.getStockNumber().subtract(resource.getStockNumber())); - resource.setType("out"); flow.setBizCode("stockout"); flow.setBizName("耗材出库"); flow.setBizType("-"); - purveyorTransact.setTotalAmount(resource.getAccountsPayable().negate()); - purveyorTransact.setPaidAmount(resource.getActualPayment()); - purveyorTransact.setWaitAmount((resource.getAccountsPayable().subtract(resource.getActualPayment())).negate()); + purveyorTransact.setTotalAmount(resources.getAccountsPayable().negate()); + purveyorTransact.setPaidAmount(resources.getActualPayment()); + purveyorTransact.setWaitAmount((resources.getAccountsPayable().subtract(resources.getActualPayment())).negate()); purveyorTransact.setType("cons_out"); } + suppFlow.setPrice(conInfos.getPrice()); + suppFlow.setAmount(conInfos.getStockNumber()); + suppFlow.setAccountsPayable(resources.getAccountsPayable()); + suppFlow.setActualPayment(resources.getActualPayment()); + suppFlow.setCreateTime(new Timestamp(System.currentTimeMillis())); - if (resource.getAccountsPayable().compareTo(resource.getActualPayment()) <= 0) { + + if (resources.getAccountsPayable().compareTo(resources.getActualPayment()) <= 0) { purveyorTransact.setStatus(1); } else { purveyorTransact.setStatus(0); @@ -263,31 +266,27 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { purveyorTransact.setPaidAt(System.currentTimeMillis()); purveyorTransactRepository.save(purveyorTransact); - if (resource.getSupplierId() != null) { - tbShopPurveyorRepository.upLastTransactAt(resource.getSupplierId().toString()); + if (resources.getSupplierId() != null) { + tbShopPurveyorRepository.upLastTransactAt(resources.getSupplierId().toString()); } - tbConsInfoRepository.save(info); - resource.setAmount(resource.getStockNumber()); - resource.setBalance(info.getStockNumber()); - resource.setCreateTime(new Timestamp(System.currentTimeMillis())); - tbConsSuppFlowRepository.save(resource); + tbConsSuppFlowRepository.save(suppFlow); flow.setConsId(info.getId()); flow.setShopId(info.getShopId()); flow.setConName(info.getConName()); - flow.setAmount(resource.getStockNumber()); + flow.setAmount(conInfos.getStockNumber()); flow.setBalance(info.getStockNumber()); flow.setCreateTime(new Timestamp(System.currentTimeMillis())); tbConsInfoFlowRepository.save(flow); } - } + } \ No newline at end of file From 6db4ad5e35e221d0126f44dbb1dedb4d532c86fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Mon, 8 Jul 2024 10:52:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java index c2f7d634..bfea6f17 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java @@ -217,6 +217,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { suppFlow.setShopId(resources.getShopId()); suppFlow.setSupplierId(resources.getSupplierId()); suppFlow.setType(resources.getType()); + suppFlow.setStockNumber(conInfos.getStockNumber()); if ("in".equals(resources.getType())) { @@ -263,6 +264,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { } else { purveyorTransact.setStatus(0); } + purveyorTransact.setPaidAt(System.currentTimeMillis()); purveyorTransactRepository.save(purveyorTransact); @@ -272,8 +274,6 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { tbConsInfoRepository.save(info); - - tbConsSuppFlowRepository.save(suppFlow);