门店供应链物品管理/记录

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelGoodsOrderServiceImpl.java

@@ -240,7 +240,6 @@ public class ChannelGoodsOrderServiceImpl extends ServiceImpl<ChannelGoodsOrderM
             channelGoods.setSupplierId(item.getSupplierId());
             channelGoods.setQuantity(item.getGoodsNum());
             channelGoods.setRemainQty(item.getGoodsNum());
-            channelGoods.setSettleQty(item.getGoodsNum());
             channelGoods.setPurchasePrice(item.getPurchasePrice());
             channelGoods.setPurchaseCost(item.getPurchaseCost());
             goodsList.add(channelGoods);
@@ -280,7 +279,6 @@ public class ChannelGoodsOrderServiceImpl extends ServiceImpl<ChannelGoodsOrderM
                 channelGoods.setSupplierId(item.getSupplierId());
                 channelGoods.setQuantity(item.getGoodsNum());
                 channelGoods.setRemainQty(item.getGoodsNum());
-                channelGoods.setSettleQty(item.getGoodsNum());
                 channelGoods.setPurchasePrice(item.getPurchasePrice());
                 channelGoods.setPurchaseCost(item.getPurchaseCost());
                 goodsList.add(channelGoods);

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelGoodsSettleOrderServiceImpl.java

@@ -83,7 +83,7 @@ public class ChannelGoodsSettleOrderServiceImpl extends ServiceImpl<ChannelGoods
             settleOrderItem.setPurchaseCost(channelGoods.getPurchaseCost());
             settleOrderItem.setVerifyQty(channelGoods.getVerifyQty());
             settleOrderItem.setRemainQty(channelGoods.getRemainQty());
-            settleOrderItem.setSettleQty(channelGoods.getSettleQty());
+            settleOrderItem.setSettleQty(channelGoods.getRemainQty());
             settleOrderItemService.save(settleOrderItem);
         }
 
@@ -113,8 +113,11 @@ public class ChannelGoodsSettleOrderServiceImpl extends ServiceImpl<ChannelGoods
                     settleOrder.getOrderId());
             throw new ServiceException("渠道采购商品订单结算支付成功时，更新订单状态失败");
         }
+        List<ChannelGoodsSettleOrderItem> items = settleOrderItemService.list(new LambdaQueryWrapper<ChannelGoodsSettleOrderItem>().eq(ChannelGoodsSettleOrderItem::getOrderId, settleOrder.getOrderId()));
+        int settleQty = items.stream().mapToInt(ChannelGoodsSettleOrderItem::getSettleQty).sum();
         boolean updateRst = channelGoodsService.update(new LambdaUpdateWrapper<ChannelGoods>()
                 .set(ChannelGoods::getStatus, ChannelGoodsSettleStatusTypeEnum.FINISHED)
+                .set(ChannelGoods::getSettleQty, settleQty)
                 .set(ChannelGoods::getSettleTime, DateUtils.parseDate(payOrder.getCompleteDate()))
                 .eq(ChannelGoods::getOrderId, settleOrder.getOrderId()));