From d18d39d3a6a8b74b4cf9d41d1b7aac9369dce15e Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Tue, 14 Oct 2025 15:40:19 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=9F=A5=E7=9C=8B=E8=BF=94?= =?UTF-8?q?=E5=8D=95=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B0=83=E4=BC=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/xkt/StoreSaleRefundRecordController.java | 3 +-- .../vo/storeSaleRefundRecord/StoreSaleRefundRecordVO.java | 6 ++++-- .../java/com/ruoyi/xkt/domain/StoreSaleRefundRecord.java | 8 ++++++++ .../storeSaleRefundRecord/StoreSaleRefundRecordDTO.java | 6 ++++-- .../service/impl/StoreSaleRefundRecordServiceImpl.java | 3 ++- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleRefundRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleRefundRecordController.java index 11dfda06f..594955e84 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleRefundRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleRefundRecordController.java @@ -35,8 +35,7 @@ public class StoreSaleRefundRecordController extends XktBaseController { @ApiOperation(value = "查询档口销售出库返单记录", httpMethod = "POST", response = R.class) @GetMapping("/list/{storeId}/{storeSaleId}") public R> selectPage(@PathVariable("storeId") Long storeId, @PathVariable("storeSaleId") Long storeSaleId) { - List refundDTOList = this.storeSaleRefundRecordService.selectList(storeId, storeSaleId); - return R.ok(BeanUtil.copyToList(refundDTOList, StoreSaleRefundRecordVO.class)); + return R.ok(BeanUtil.copyToList(this.storeSaleRefundRecordService.selectList(storeId, storeSaleId), StoreSaleRefundRecordVO.class)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSaleRefundRecord/StoreSaleRefundRecordVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSaleRefundRecord/StoreSaleRefundRecordVO.java index bbd3577f1..9bace61a2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSaleRefundRecord/StoreSaleRefundRecordVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSaleRefundRecord/StoreSaleRefundRecordVO.java @@ -30,8 +30,10 @@ public class StoreSaleRefundRecordVO { private Date createTime; @ApiModelProperty(value = "支付方式（支付宝、微信、现金、欠款）ALIPAY WECHAT_PAY CASH DEBT") private Integer payWay; - @ApiModelProperty(value = "数量") - private Integer quantity; + @ApiModelProperty(value = "销售数量") + private Integer saleQuantity; + @ApiModelProperty(value = "退货数量") + private Integer refundQuantity; @ApiModelProperty(value = "总金额") private BigDecimal amount; diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleRefundRecord.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleRefundRecord.java index c20a163bb..c50bb34be 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleRefundRecord.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleRefundRecord.java @@ -71,6 +71,14 @@ public class StoreSaleRefundRecord extends XktBaseEntity { */ @Excel(name = "数量") private Integer quantity; + /** + * 销售数量 + */ + private Integer saleQuantity; + /** + * 退货数量 + */ + private Integer refundQuantity; /** * 总金额 */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSaleRefundRecord/StoreSaleRefundRecordDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSaleRefundRecord/StoreSaleRefundRecordDTO.java index ba31a40b8..8b3251254 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSaleRefundRecord/StoreSaleRefundRecordDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSaleRefundRecord/StoreSaleRefundRecordDTO.java @@ -28,8 +28,10 @@ public class StoreSaleRefundRecordDTO { private Date createTime; @ApiModelProperty(value = "支付方式（支付宝、微信、现金、欠款）ALIPAY WECHAT_PAY CASH DEBT") private Integer payWay; - @ApiModelProperty(value = "数量") - private Integer quantity; + @ApiModelProperty(value = "销售数量") + private Integer saleQuantity; + @ApiModelProperty(value = "退货数量") + private Integer refundQuantity; @ApiModelProperty(value = "总金额") private BigDecimal amount; diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleRefundRecordServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleRefundRecordServiceImpl.java index 624eb2769..39e5b0fee 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleRefundRecordServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleRefundRecordServiceImpl.java @@ -49,7 +49,8 @@ public class StoreSaleRefundRecordServiceImpl implements IStoreSaleRefundRecordS throw new ServiceException("当前用户非档口管理者或子账号，无权限操作!", HttpStatus.ERROR); } List refundRecordList = this.refundRecordMapper.selectList(new LambdaQueryWrapper() - .eq(StoreSaleRefundRecord::getStoreId, storeId).eq(StoreSaleRefundRecord::getStoreSaleId, storeSaleId).eq(StoreSaleRefundRecord::getDelFlag, Constants.UNDELETED)); + .eq(StoreSaleRefundRecord::getStoreId, storeId).eq(StoreSaleRefundRecord::getStoreSaleId, storeSaleId) + .eq(StoreSaleRefundRecord::getDelFlag, Constants.UNDELETED)); if (CollectionUtils.isEmpty(refundRecordList)) { return new ArrayList<>(); }