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

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelGoodsSettleMgrController.java

@@ -114,6 +114,14 @@ public class ChannelGoodsSettleMgrController extends BaseApiController {
             channelGoodsOrderSettleVO.setTotalVerifyQty(channelGoodsList.stream().mapToInt(ChannelGoods::getVerifyQty).sum());
             channelGoodsOrderSettleVO.setTotalPurchaseCost(channelGoodsList.stream().mapToInt(ChannelGoods::getPurchaseCost).sum());
             channelGoodsOrderSettleVO.setStatus(channelGoodsList.get(0).getStatus());
+
+            ChannelGoodsSettleOrderItem settleOrderItem = settleOrderItemService.getOne(new LambdaQueryWrapper<ChannelGoodsSettleOrderItem>().eq(ChannelGoodsSettleOrderItem::getChannelGoodsId, channelGoodsList.get(0).getId()));
+            if (settleOrderItem != null) {
+                ChannelGoodsSettleOrder settleOrder = settleOrderService.getOne(new LambdaQueryWrapper<ChannelGoodsSettleOrder>().eq(ChannelGoodsSettleOrder::getOrderId, settleOrderItem.getOrderId()));
+                channelGoodsOrderSettleVO.setPayAmount(settleOrder.getSettleAmt());
+                channelGoodsOrderSettleVO.setPushTime(settleOrder.getCreatedTime());
+                channelGoodsOrderSettleVO.setSettleTime(settleOrder.getPayTime());
+            }
         }
         channelGoodsOrderSettleVO.setTel(channelGoodsOrderVO.getTel());
         channelGoodsOrderSettleVO.setChannelName(channelGoodsOrderVO.getChannelName());
@@ -125,6 +133,9 @@ public class ChannelGoodsSettleMgrController extends BaseApiController {
     @PreAuthorize("@ss.hasPermi('business:order:push')")
     @ApiOperation(value = "推送结算订单")
     public AjaxResult settleOrder(@RequestBody PushChannelGoodsSettleParam settleVO) {
+        if (settleVO.getSettleAmt() <= 0) {
+
+        }
         String settleOrderId = settleOrderService.pushSettleOrder(settleVO);
         return AjaxResult.success(settleOrderId);
     }

mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelGoodsSettleVO.java

@@ -57,4 +57,13 @@ public class ChannelGoodsSettleVO {
 
     @ApiModelProperty("门店库存管理结算明细")
     List<ChannelGoods> items;
+
+    @ApiModelProperty("支付金额")
+    private Integer payAmount;
+
+    @ApiModelProperty("发起时间")
+    private Date pushTime;
+
+    @ApiModelProperty("结算时间")
+    private Date settleTime;
 }