czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ww' into test

This commit is contained in:
wangw 2024-09-29 17:52:45 +08:00
parent 79e99e78a5 f16f23ab84
commit e838459a1b
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
View File

@ -301,10 +301,8 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
//修改耗材数据 //修改耗材数据
JSONObject jsonObject1 = new JSONObject(); JSONObject jsonObject1 = new JSONObject();
jsonObject1.put("type", "delete"); jsonObject1.put("type", "delete");
TbOrderInfo tbOrderInfo = tbOrderInfoRepository.findById(Integer.valueOf(orderId)).orElse(null);
Optional<TbOrderInfo> byId = tbOrderInfoRepository.findById(Integer.valueOf(orderId)); if (tbOrderInfo != null) {
if (byId != null && byId.isPresent()) {
TbOrderInfo tbOrderInfo = byId.get();
if (tbOrderInfo.getStatus().equals("unpaid")) { if (tbOrderInfo.getStatus().equals("unpaid")) {
upOrderStatus(tbOrderInfo); upOrderStatus(tbOrderInfo);
jsonObject1.put("orderId", tbOrderInfo.getId()); jsonObject1.put("orderId", tbOrderInfo.getId());

22
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
View File

@ -761,16 +761,18 @@ public class TbProductServiceImpl implements TbProductService {
@Override @Override
public void returnStockByPro(Integer productId, Integer productSkuId, Integer num) { public void returnStockByPro(Integer productId, Integer productSkuId, Integer num) {
log.info("开始返还库存，订单超时取消，商品id：{}", productId); if (productId > 0) {
TbProduct product = tbProductRepository.findById(productId).orElse(null); log.info("开始返还库存，订单超时取消，商品id：{}", productId);
if (product == null) { TbProduct product = tbProductRepository.findById(productId).orElse(null);
log.info("返还库存失败，商品不存在： {}", productId); if (product == null) {
return; log.info("返还库存失败，商品不存在： {}", productId);
} return;
if (product.getIsDistribute() == 1) { }
tbProductRepository.incrStock(productId, num); if (product.getIsDistribute() == 1) {
} else { tbProductRepository.incrStock(productId, num);
tbProductSkuRepository.incrStock(productSkuId, Double.valueOf(num)); } else {
tbProductSkuRepository.incrStock(productSkuId, Double.valueOf(num));
}
} }
} }

2
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
View File

@ -258,7 +258,7 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
log.info("查询到订单id: {}的所有库存数据: {}", orderId, stockCountDTOS); log.info("查询到订单id: {}的所有库存数据: {}", orderId, stockCountDTOS);
stockCountDTOS.forEach(s -> { stockCountDTOS.forEach(s -> {
//客座费不统计 //客座费不统计
if (!s.getProId().toString().equals("-999")) { if (s.getProId() > 0) {
if (s.getStockCount() > 0) { if (s.getStockCount() > 0) {
TbProductStockDetail productStockDetail = new TbProductStockDetail(); TbProductStockDetail productStockDetail = new TbProductStockDetail();
productStockDetail.setCreatedAt(System.currentTimeMillis()); productStockDetail.setCreatedAt(System.currentTimeMillis());