From f3dbb618902657e95ef3b9e2727098b0b5950dda Mon Sep 17 00:00:00 2001 From: liux <963924687@qq.com> Date: Fri, 16 May 2025 17:40:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E4=BB=98=E5=BA=94=E6=94=B6=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=8E=A5=E5=8F=A3=E7=BC=96=E5=86=99=EF=BC=8C=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=90=88=E5=B9=B6=E4=BF=AE=E6=94=B9=EF=BC=8Cbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menu/controller/MenuRecipeController.java | 5 +- .../service/impl/MenuDishesServiceImpl.java | 2 +- .../DrpOrderGoodsPayAndRefundTypeEnum.java | 57 +++++ .../controller/SupplierComeGoController.java | 47 +++- .../supply/domain/DrpOrderGoodsDetail.java | 189 ++++++++++++++ .../supply/dto/DrpComeAndGoApplyPayDTO.java | 91 +++++++ .../supply/dto/DrpComeAndGoCommitPayDTO.java | 121 +++++++++ .../dto/DrpComeAndGoCommitRefundApplyDTO.java | 131 ++++++++++ .../dto/DrpComeAndGoCommitRefundDTO.java | 132 ++++++++++ .../dto/DrpOrderGoodsManagePageDTO.java | 70 ++++++ .../mapper/DrpOrderGoodsDetailMapperV2.java | 25 ++ .../supply/mapper/DrpOrderGoodsPayMapper.java | 25 ++ .../mapper/DrpOrderGoodsRefundMapper.java | 25 ++ .../DrpOrderGoodsMaterialStallNumModel.java | 45 ++++ .../core/supply/po/DrpOrderGoodsPay.java | 235 +++++++++++++++++ .../core/supply/po/DrpOrderGoodsRefund.java | 236 ++++++++++++++++++ .../service/DrpOrderGoodsDetailServiceV2.java | 13 + .../service/DrpSupplierComeGoService.java | 11 +- .../DrpOrderGoodsDetailServiceImplV2.java | 23 ++ .../impl/DrpSupplierComeGoServiceImpl.java | 57 ++++- .../vo/DrpOrderGoodsManageDetailVO.java | 136 ++++++++++ .../supply/vo/DrpOrderGoodsManagePageVO.java | 44 ++++ .../supply/vo/DrpOrderGoodsManagePayVO.java | 23 ++ .../vo/DrpOrderGoodsManageRefundVO.java | 22 ++ .../supply/vo/DrpOrderGoodsManageTotalVO.java | 38 +++ .../supply/vo/DrpOrderGoodsPayListVO.java | 213 ++++++++++++++++ .../supply/vo/DrpOrderGoodsRefundListVO.java | 214 ++++++++++++++++ .../utils/excel/MenuRecipeImportListener.java | 2 +- .../mapper/menu/MenuDishesMapper.xml | 3 +- .../mapper/menu/MenuDishesTypeMapper.xml | 8 +- .../supplier/DrpOrderGoodsDetailMapperV2.xml | 56 +++++ .../supplier/DrpOrderGoodsPayMapper.xml | 81 ++++++ .../supplier/DrpOrderGoodsRefundMapper.xml | 79 ++++++ 33 files changed, 2437 insertions(+), 22 deletions(-) create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/constant/DrpOrderGoodsPayAndRefundTypeEnum.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/domain/DrpOrderGoodsDetail.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoApplyPayDTO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoCommitPayDTO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoCommitRefundApplyDTO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoCommitRefundDTO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpOrderGoodsManagePageDTO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/mapper/DrpOrderGoodsDetailMapperV2.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/mapper/DrpOrderGoodsPayMapper.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/mapper/DrpOrderGoodsRefundMapper.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/po/DrpOrderGoodsMaterialStallNumModel.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/po/DrpOrderGoodsPay.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/po/DrpOrderGoodsRefund.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/DrpOrderGoodsDetailServiceV2.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/impl/DrpOrderGoodsDetailServiceImplV2.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManageDetailVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManagePageVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManagePayVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManageRefundVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManageTotalVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsPayListVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsRefundListVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOrderGoodsDetailMapperV2.xml create mode 100644 bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOrderGoodsPayMapper.xml create mode 100644 bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOrderGoodsRefundMapper.xml diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuRecipeController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuRecipeController.java index 2e56a4d..8b4c178 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuRecipeController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuRecipeController.java @@ -195,7 +195,10 @@ public class MenuRecipeController extends BaseController { String message = e.toString(); //取倒数第二个：之后的信息 String finalMessage = message.substring(message.lastIndexOf(":") - 7); - throw new ServiceException(finalMessage.replace("Error：", "")); + String errorMes = finalMessage.replace("Error:", ""); + System.err.println("errorMes="+errorMes); + return error("导入失败："+errorMes); +// throw new ServiceException(errorMes); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java index d5b60bf..09c1b88 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java @@ -338,7 +338,7 @@ public class MenuDishesServiceImpl extends ServiceImpl pageSupplierComeAndGoDetail(@Param("orderGoodsId") String orderGoodsId) { + return this.drpOrderGoodsDetailService.getDrpOrderGoodsDetailVOListByOrderGoodsId(orderGoodsId); + } + + + @PostMapping({"/apply-pay"}) + @ApiOperation("申请付款") + public AjaxResult applyPay(@RequestBody @Valid DrpComeAndGoApplyPayDTO content) { + this.drpSupplierComeGoService.applyPay(content); + return success(); + } + + @PostMapping({"/commit-pay"}) + @ApiOperation("提交付款") + public AjaxResult commitPay(@RequestBody @Valid DrpComeAndGoCommitPayDTO content) { + this.drpSupplierComeGoService.commitPay(content); + return success(); + } + + @PostMapping({"/apply-refund"}) + @ApiOperation("申请退款") + public AjaxResult applyRefund(@RequestBody @Valid DrpComeAndGoCommitRefundApplyDTO content) { + this.drpSupplierComeGoService.applyRefund(content); + return success(); + } + + @PostMapping({"/commit-refund"}) + @ApiOperation("提交退款") + public AjaxResult commitRefund(@RequestBody @Valid DrpComeAndGoCommitRefundDTO content) { + this.drpSupplierComeGoService.commitRefund(content); + return success(); + } + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/domain/DrpOrderGoodsDetail.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/domain/DrpOrderGoodsDetail.java new file mode 100644 index 0000000..4bb4bc5 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/domain/DrpOrderGoodsDetail.java @@ -0,0 +1,189 @@ +package com.bonus.canteen.core.supply.domain; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@ApiModel( + value = "DrpOrderGoodsDetail对象", + description = "采购订单明细表" +) +public class DrpOrderGoodsDetail { + @TableId + @ApiModelProperty("采购订单明细id") + private Long orderGoodsDetailId; + @ApiModelProperty("采购订单号") + private String orderGoodsId; + @ApiModelProperty("原料id") + private Long materialId; + @ApiModelProperty("计量单位id") + private Long unitId; + @ApiModelProperty("规格") + private String size; + @ApiModelProperty("采购订单数量") + private BigDecimal orderNum; + @ApiModelProperty("单价") + private Integer singlePrice; + @ApiModelProperty("总金额") + private Integer totalPrice; + @TableField( + value = "crby", + fill = FieldFill.INSERT + ) + @ApiModelProperty("创建人") + private String crby; + @TableField( + value = "crtime", + fill = FieldFill.INSERT + ) + @ApiModelProperty("创建时间") + private LocalDateTime crtime; + @TableField( + value = "upby", + fill = FieldFill.UPDATE + ) + @ApiModelProperty("更新人") + private String upby; + @TableField( + value = "uptime", + fill = FieldFill.UPDATE + ) + @ApiModelProperty("更新时间") + private LocalDateTime uptime; + @ApiModelProperty("入库数量") + private BigDecimal intoNum; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("档口id") + private Long stallId; + + public Long getOrderGoodsDetailId() { + return this.orderGoodsDetailId; + } + + public String getOrderGoodsId() { + return this.orderGoodsId; + } + + public Long getMaterialId() { + return this.materialId; + } + + public Long getUnitId() { + return this.unitId; + } + + public String getSize() { + return this.size; + } + + public BigDecimal getOrderNum() { + return this.orderNum; + } + + public Integer getSinglePrice() { + return this.singlePrice; + } + + public Integer getTotalPrice() { + return this.totalPrice; + } + + public String getCrby() { + return this.crby; + } + + public LocalDateTime getCrtime() { + return this.crtime; + } + + public String getUpby() { + return this.upby; + } + + public LocalDateTime getUptime() { + return this.uptime; + } + + public BigDecimal getIntoNum() { + return this.intoNum; + } + + public String getRemark() { + return this.remark; + } + + public Long getStallId() { + return this.stallId; + } + + public void setOrderGoodsDetailId(final Long orderGoodsDetailId) { + this.orderGoodsDetailId = orderGoodsDetailId; + } + + public void setOrderGoodsId(final String orderGoodsId) { + this.orderGoodsId = orderGoodsId; + } + + public void setMaterialId(final Long materialId) { + this.materialId = materialId; + } + + public void setUnitId(final Long unitId) { + this.unitId = unitId; + } + + public void setSize(final String size) { + this.size = size; + } + + public void setOrderNum(final BigDecimal orderNum) { + this.orderNum = orderNum; + } + + public void setSinglePrice(final Integer singlePrice) { + this.singlePrice = singlePrice; + } + + public void setTotalPrice(final Integer totalPrice) { + this.totalPrice = totalPrice; + } + + public void setCrby(final String crby) { + this.crby = crby; + } + + public void setCrtime(final LocalDateTime crtime) { + this.crtime = crtime; + } + + public void setUpby(final String upby) { + this.upby = upby; + } + + public void setUptime(final LocalDateTime uptime) { + this.uptime = uptime; + } + + public void setIntoNum(final BigDecimal intoNum) { + this.intoNum = intoNum; + } + + public void setRemark(final String remark) { + this.remark = remark; + } + + public void setStallId(final Long stallId) { + this.stallId = stallId; + } + + public String toString() { + Long var10000 = this.getOrderGoodsDetailId(); + return "DrpOrderGoodsDetail(orderGoodsDetailId=" + var10000 + ", orderGoodsId=" + this.getOrderGoodsId() + ", materialId=" + this.getMaterialId() + ", unitId=" + this.getUnitId() + ", size=" + this.getSize() + ", orderNum=" + String.valueOf(this.getOrderNum()) + ", singlePrice=" + this.getSinglePrice() + ", totalPrice=" + this.getTotalPrice() + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ", upby=" + this.getUpby() + ", uptime=" + String.valueOf(this.getUptime()) + ", intoNum=" + String.valueOf(this.getIntoNum()) + ", remark=" + this.getRemark() + ", stallId=" + this.getStallId() + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoApplyPayDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoApplyPayDTO.java new file mode 100644 index 0000000..81df5aa --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoApplyPayDTO.java @@ -0,0 +1,91 @@ +package com.bonus.canteen.core.supply.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.time.LocalDate; + +@ApiModel +public class DrpComeAndGoApplyPayDTO { + @ApiModelProperty("采购单号") + private @NotBlank( + message = "采购单号不能为空!" +) String orderGoodsId; + @ApiModelProperty("付款金额") + private @NotNull( + message = "付款金额不能为空!" +) Long payAmount; + @ApiModelProperty("要求付款日期") + private LocalDate requirePayDate; + @ApiModelProperty("收款银行") + private String collectBank; + @ApiModelProperty("收款账号名称") + private String collectAccountName; + @ApiModelProperty("收款账号") + private String collectAccount; + @ApiModelProperty("申请备注") + private String applyRemark; + + public String getOrderGoodsId() { + return this.orderGoodsId; + } + + public Long getPayAmount() { + return this.payAmount; + } + + public LocalDate getRequirePayDate() { + return this.requirePayDate; + } + + public String getCollectBank() { + return this.collectBank; + } + + public String getCollectAccountName() { + return this.collectAccountName; + } + + public String getCollectAccount() { + return this.collectAccount; + } + + public String getApplyRemark() { + return this.applyRemark; + } + + public void setOrderGoodsId(final String orderGoodsId) { + this.orderGoodsId = orderGoodsId; + } + + public void setPayAmount(final Long payAmount) { + this.payAmount = payAmount; + } + + public void setRequirePayDate(final LocalDate requirePayDate) { + this.requirePayDate = requirePayDate; + } + + public void setCollectBank(final String collectBank) { + this.collectBank = collectBank; + } + + public void setCollectAccountName(final String collectAccountName) { + this.collectAccountName = collectAccountName; + } + + public void setCollectAccount(final String collectAccount) { + this.collectAccount = collectAccount; + } + + public void setApplyRemark(final String applyRemark) { + this.applyRemark = applyRemark; + } + + public String toString() { + String var10000 = this.getOrderGoodsId(); + return "DrpComeAndGoApplyPayDTO(orderGoodsId=" + var10000 + ", payAmount=" + this.getPayAmount() + ", requirePayDate=" + String.valueOf(this.getRequirePayDate()) + ", collectBank=" + this.getCollectBank() + ", collectAccountName=" + this.getCollectAccountName() + ", collectAccount=" + this.getCollectAccount() + ", applyRemark=" + this.getApplyRemark() + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoCommitPayDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoCommitPayDTO.java new file mode 100644 index 0000000..167a1b0 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoCommitPayDTO.java @@ -0,0 +1,121 @@ +package com.bonus.canteen.core.supply.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; + +@ApiModel +public class DrpComeAndGoCommitPayDTO { + @ApiModelProperty("采购单号") + private @NotBlank( + message = "采购单号不能为空!" +) String orderGoodsId; + @ApiModelProperty("付款金额") + private @NotNull( + message = "付款金额不能为空!" +) Long payAmount; + @ApiModelProperty("付款时间") + private LocalDateTime payTime; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("付款账户名称") + private String payAccountName; + @ApiModelProperty("付款账户") + private String payAccount; + @ApiModelProperty("收款银行") + private String collectBank; + @ApiModelProperty("收款账号名称") + private String collectAccountName; + @ApiModelProperty("收款账号") + private String collectAccount; + @ApiModelProperty("付款备注") + private String payRemark; + + public String getOrderGoodsId() { + return this.orderGoodsId; + } + + public Long getPayAmount() { + return this.payAmount; + } + + public LocalDateTime getPayTime() { + return this.payTime; + } + + public String getPayBank() { + return this.payBank; + } + + public String getPayAccountName() { + return this.payAccountName; + } + + public String getPayAccount() { + return this.payAccount; + } + + public String getCollectBank() { + return this.collectBank; + } + + public String getCollectAccountName() { + return this.collectAccountName; + } + + public String getCollectAccount() { + return this.collectAccount; + } + + public String getPayRemark() { + return this.payRemark; + } + + public void setOrderGoodsId(final String orderGoodsId) { + this.orderGoodsId = orderGoodsId; + } + + public void setPayAmount(final Long payAmount) { + this.payAmount = payAmount; + } + + public void setPayTime(final LocalDateTime payTime) { + this.payTime = payTime; + } + + public void setPayBank(final String payBank) { + this.payBank = payBank; + } + + public void setPayAccountName(final String payAccountName) { + this.payAccountName = payAccountName; + } + + public void setPayAccount(final String payAccount) { + this.payAccount = payAccount; + } + + public void setCollectBank(final String collectBank) { + this.collectBank = collectBank; + } + + public void setCollectAccountName(final String collectAccountName) { + this.collectAccountName = collectAccountName; + } + + public void setCollectAccount(final String collectAccount) { + this.collectAccount = collectAccount; + } + + public void setPayRemark(final String payRemark) { + this.payRemark = payRemark; + } + + public String toString() { + String var10000 = this.getOrderGoodsId(); + return "DrpComeAndGoCommitPayDTO(orderGoodsId=" + var10000 + ", payAmount=" + this.getPayAmount() + ", payTime=" + String.valueOf(this.getPayTime()) + ", payBank=" + this.getPayBank() + ", payAccountName=" + this.getPayAccountName() + ", payAccount=" + this.getPayAccount() + ", collectBank=" + this.getCollectBank() + ", collectAccountName=" + this.getCollectAccountName() + ", collectAccount=" + this.getCollectAccount() + ", payRemark=" + this.getPayRemark() + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoCommitRefundApplyDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoCommitRefundApplyDTO.java new file mode 100644 index 0000000..3f284d4 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoCommitRefundApplyDTO.java @@ -0,0 +1,131 @@ +package com.bonus.canteen.core.supply.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.time.LocalDate; + +@ApiModel +public class DrpComeAndGoCommitRefundApplyDTO { + @ApiModelProperty("采购单号") + private @NotBlank( + message = "采购单号不能为空!" +) String orderGoodsId; + @ApiModelProperty("退款金额") + private @NotNull( + message = "退款金额不能为空!" +) Long refundAmount; + @ApiModelProperty("要求退款日期") + private LocalDate requireRefundDate; + @ApiModelProperty("收款银行") + private String collectBank; + @ApiModelProperty("收款账号名称") + private String collectAccountName; + @ApiModelProperty("收款账号") + private String collectAccount; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("付款账户名称") + private String payAccountName; + @ApiModelProperty("付款账户") + private String payAccount; + @ApiModelProperty("申请备注") + private String applyRemark; + + public String getOrderGoodsId() { + return this.orderGoodsId; + } + + public Long getRefundAmount() { + return this.refundAmount; + } + + public LocalDate getRequireRefundDate() { + return this.requireRefundDate; + } + + public String getCollectBank() { + return this.collectBank; + } + + public String getCollectAccountName() { + return this.collectAccountName; + } + + public String getCollectAccount() { + return this.collectAccount; + } + + public String getPayBank() { + return this.payBank; + } + + public String getPayAccountName() { + return this.payAccountName; + } + + public String getPayAccount() { + return this.payAccount; + } + + public String getApplyRemark() { + return this.applyRemark; + } + + public DrpComeAndGoCommitRefundApplyDTO setOrderGoodsId(final String orderGoodsId) { + this.orderGoodsId = orderGoodsId; + return this; + } + + public DrpComeAndGoCommitRefundApplyDTO setRefundAmount(final Long refundAmount) { + this.refundAmount = refundAmount; + return this; + } + + public DrpComeAndGoCommitRefundApplyDTO setRequireRefundDate(final LocalDate requireRefundDate) { + this.requireRefundDate = requireRefundDate; + return this; + } + + public DrpComeAndGoCommitRefundApplyDTO setCollectBank(final String collectBank) { + this.collectBank = collectBank; + return this; + } + + public DrpComeAndGoCommitRefundApplyDTO setCollectAccountName(final String collectAccountName) { + this.collectAccountName = collectAccountName; + return this; + } + + public DrpComeAndGoCommitRefundApplyDTO setCollectAccount(final String collectAccount) { + this.collectAccount = collectAccount; + return this; + } + + public DrpComeAndGoCommitRefundApplyDTO setPayBank(final String payBank) { + this.payBank = payBank; + return this; + } + + public DrpComeAndGoCommitRefundApplyDTO setPayAccountName(final String payAccountName) { + this.payAccountName = payAccountName; + return this; + } + + public DrpComeAndGoCommitRefundApplyDTO setPayAccount(final String payAccount) { + this.payAccount = payAccount; + return this; + } + + public DrpComeAndGoCommitRefundApplyDTO setApplyRemark(final String applyRemark) { + this.applyRemark = applyRemark; + return this; + } + + public String toString() { + String var10000 = this.getOrderGoodsId(); + return "DrpComeAndGoCommitRefundApplyDTO(orderGoodsId=" + var10000 + ", refundAmount=" + this.getRefundAmount() + ", requireRefundDate=" + String.valueOf(this.getRequireRefundDate()) + ", collectBank=" + this.getCollectBank() + ", collectAccountName=" + this.getCollectAccountName() + ", collectAccount=" + this.getCollectAccount() + ", payBank=" + this.getPayBank() + ", payAccountName=" + this.getPayAccountName() + ", payAccount=" + this.getPayAccount() + ", applyRemark=" + this.getApplyRemark() + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoCommitRefundDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoCommitRefundDTO.java new file mode 100644 index 0000000..a36457d --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoCommitRefundDTO.java @@ -0,0 +1,132 @@ +package com.bonus.canteen.core.supply.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; + +@ApiModel +public class DrpComeAndGoCommitRefundDTO { + @ApiModelProperty("采购单号") + private @NotBlank( + message = "采购单号不能为空!" +) String orderGoodsId; + @ApiModelProperty("退款金额") + private @NotNull( + message = "退款金额不能为空!" +) Long refundAmount; + @ApiModelProperty("收款银行") + private String collectBank; + @ApiModelProperty("收款账号名称") + private String collectAccountName; + @ApiModelProperty("收款账号") + private String collectAccount; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("付款账户名称") + private String payAccountName; + @ApiModelProperty("付款账户") + private String payAccount; + @ApiModelProperty("退款时间") + private LocalDateTime refundTime; + @ApiModelProperty("退款备注") + private String refundRemark; + + public String getOrderGoodsId() { + return this.orderGoodsId; + } + + public Long getRefundAmount() { + return this.refundAmount; + } + + public String getCollectBank() { + return this.collectBank; + } + + public String getCollectAccountName() { + return this.collectAccountName; + } + + public String getCollectAccount() { + return this.collectAccount; + } + + public String getPayBank() { + return this.payBank; + } + + public String getPayAccountName() { + return this.payAccountName; + } + + public String getPayAccount() { + return this.payAccount; + } + + public LocalDateTime getRefundTime() { + return this.refundTime; + } + + public String getRefundRemark() { + return this.refundRemark; + } + + public DrpComeAndGoCommitRefundDTO setOrderGoodsId(final String orderGoodsId) { + this.orderGoodsId = orderGoodsId; + return this; + } + + public DrpComeAndGoCommitRefundDTO setRefundAmount(final Long refundAmount) { + this.refundAmount = refundAmount; + return this; + } + + public DrpComeAndGoCommitRefundDTO setCollectBank(final String collectBank) { + this.collectBank = collectBank; + return this; + } + + public DrpComeAndGoCommitRefundDTO setCollectAccountName(final String collectAccountName) { + this.collectAccountName = collectAccountName; + return this; + } + + public DrpComeAndGoCommitRefundDTO setCollectAccount(final String collectAccount) { + this.collectAccount = collectAccount; + return this; + } + + public DrpComeAndGoCommitRefundDTO setPayBank(final String payBank) { + this.payBank = payBank; + return this; + } + + public DrpComeAndGoCommitRefundDTO setPayAccountName(final String payAccountName) { + this.payAccountName = payAccountName; + return this; + } + + public DrpComeAndGoCommitRefundDTO setPayAccount(final String payAccount) { + this.payAccount = payAccount; + return this; + } + + public DrpComeAndGoCommitRefundDTO setRefundTime(final LocalDateTime refundTime) { + this.refundTime = refundTime; + return this; + } + + public DrpComeAndGoCommitRefundDTO setRefundRemark(final String refundRemark) { + this.refundRemark = refundRemark; + return this; + } + + + public String toString() { + String var10000 = this.getOrderGoodsId(); + return "DrpComeAndGoCommitRefundDTO(orderGoodsId=" + var10000 + ", refundAmount=" + this.getRefundAmount() + ", collectBank=" + this.getCollectBank() + ", collectAccountName=" + this.getCollectAccountName() + ", collectAccount=" + this.getCollectAccount() + ", payBank=" + this.getPayBank() + ", payAccountName=" + this.getPayAccountName() + ", payAccount=" + this.getPayAccount() + ", refundTime=" + String.valueOf(this.getRefundTime()) + ", refundRemark=" + this.getRefundRemark() + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpOrderGoodsManagePageDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpOrderGoodsManagePageDTO.java new file mode 100644 index 0000000..05d2574 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpOrderGoodsManagePageDTO.java @@ -0,0 +1,70 @@ +package com.bonus.canteen.core.supply.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.time.LocalDateTime; + +@ApiModel +public class DrpOrderGoodsManagePageDTO { + @ApiModelProperty("是否是支付") + private Integer ifPay; + @ApiModelProperty("供应商id") + private Long supplierId; + @ApiModelProperty("开始时间") + private LocalDateTime startTime; + @ApiModelProperty("结束时间") + private LocalDateTime endTime; + @ApiModelProperty("采购订单号") + private String orderGoodsId; + + public Integer getIfPay() { + return this.ifPay; + } + + public Long getSupplierId() { + return this.supplierId; + } + + public LocalDateTime getStartTime() { + return this.startTime; + } + + public LocalDateTime getEndTime() { + return this.endTime; + } + + public String getOrderGoodsId() { + return this.orderGoodsId; + } + + public DrpOrderGoodsManagePageDTO setIfPay(final Integer ifPay) { + this.ifPay = ifPay; + return this; + } + + public DrpOrderGoodsManagePageDTO setSupplierId(final Long supplierId) { + this.supplierId = supplierId; + return this; + } + + public DrpOrderGoodsManagePageDTO setStartTime(final LocalDateTime startTime) { + this.startTime = startTime; + return this; + } + + public DrpOrderGoodsManagePageDTO setEndTime(final LocalDateTime endTime) { + this.endTime = endTime; + return this; + } + + public DrpOrderGoodsManagePageDTO setOrderGoodsId(final String orderGoodsId) { + this.orderGoodsId = orderGoodsId; + return this; + } + + public String toString() { + Integer var10000 = this.getIfPay(); + return "DrpOrderGoodsManagePageDTO(ifPay=" + var10000 + ", supplierId=" + this.getSupplierId() + ", startTime=" + String.valueOf(this.getStartTime()) + ", endTime=" + String.valueOf(this.getEndTime()) + ", orderGoodsId=" + this.getOrderGoodsId() + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/mapper/DrpOrderGoodsDetailMapperV2.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/mapper/DrpOrderGoodsDetailMapperV2.java new file mode 100644 index 0000000..2ae1f37 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/mapper/DrpOrderGoodsDetailMapperV2.java @@ -0,0 +1,25 @@ +package com.bonus.canteen.core.supply.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bonus.canteen.core.supply.domain.DrpOrderGoodsDetail; +import com.bonus.canteen.core.supply.po.DrpOrderGoodsMaterialStallNumModel; +import com.bonus.canteen.core.supply.po.OrderIntoNumModel; +import com.bonus.canteen.core.supply.vo.DrpOrderGoodsDetailVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.math.BigDecimal; +import java.util.List; + +@Mapper +public interface DrpOrderGoodsDetailMapperV2 extends BaseMapper { + List getDrpOrderGoodsDetailVOListByOrderGoodsId(@Param("orderGoodsId") String orderGoodsId); + + List listOrderIntoNum(@Param("orderGoodsIdList") List orderGoodsIdList); + + void plusIntoNum(@Param("orderGoodsDetailId") Long orderGoodsDetailId, @Param("plusNum") BigDecimal plusNum); + + void minusIntoNum(@Param("orderGoodsDetailId") Long orderGoodsDetailId, @Param("minusNum") BigDecimal minusNum); + + List listMaterialStallNum(@Param("orderGoodsId") String orderGoodsId); +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/mapper/DrpOrderGoodsPayMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/mapper/DrpOrderGoodsPayMapper.java new file mode 100644 index 0000000..09344ce --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/mapper/DrpOrderGoodsPayMapper.java @@ -0,0 +1,25 @@ +package com.bonus.canteen.core.supply.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bonus.canteen.core.supply.dto.DrpOrderGoodsManagePageDTO; +import com.bonus.canteen.core.supply.dto.DrpPayAndRefundRecordsListDTO; +import com.bonus.canteen.core.supply.po.DrpOrderGoodsPay; +import com.bonus.canteen.core.supply.vo.DrpOrderGoodsManageDetailVO; +import com.bonus.canteen.core.supply.vo.DrpOrderGoodsManagePageVO; +import com.bonus.canteen.core.supply.vo.DrpOrderGoodsManageTotalVO; +import com.bonus.canteen.core.supply.vo.DrpOrderGoodsPayListVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface DrpOrderGoodsPayMapper extends BaseMapper { + List listPayRecords(@Param("content") DrpPayAndRefundRecordsListDTO content); + + List getOrderGoodsPayList(@Param("content") DrpOrderGoodsManagePageDTO content, @Param("type") Integer type); + + DrpOrderGoodsManageDetailVO getOrderGoodsPayDetail(@Param("id") long id); + + DrpOrderGoodsManageTotalVO getOrderGoodsPayTotal(@Param("content") DrpOrderGoodsManagePageDTO content, @Param("type") Integer type); +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/mapper/DrpOrderGoodsRefundMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/mapper/DrpOrderGoodsRefundMapper.java new file mode 100644 index 0000000..606df76 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/mapper/DrpOrderGoodsRefundMapper.java @@ -0,0 +1,25 @@ +package com.bonus.canteen.core.supply.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bonus.canteen.core.supply.dto.DrpOrderGoodsManagePageDTO; +import com.bonus.canteen.core.supply.dto.DrpPayAndRefundRecordsListDTO; +import com.bonus.canteen.core.supply.po.DrpOrderGoodsRefund; +import com.bonus.canteen.core.supply.vo.DrpOrderGoodsManageDetailVO; +import com.bonus.canteen.core.supply.vo.DrpOrderGoodsManagePageVO; +import com.bonus.canteen.core.supply.vo.DrpOrderGoodsManageTotalVO; +import com.bonus.canteen.core.supply.vo.DrpOrderGoodsRefundListVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface DrpOrderGoodsRefundMapper extends BaseMapper { + List listRefundRecords(@Param("content") DrpPayAndRefundRecordsListDTO content); + + List getOrderGoodsRefundList(@Param("content") DrpOrderGoodsManagePageDTO content, @Param("type") Integer type); + + DrpOrderGoodsManageDetailVO getOrderGoodsRefundDetail(@Param("id") long id); + + DrpOrderGoodsManageTotalVO getOrderGoodsRefundTotal(@Param("content") DrpOrderGoodsManagePageDTO content, @Param("type") Integer type); +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/po/DrpOrderGoodsMaterialStallNumModel.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/po/DrpOrderGoodsMaterialStallNumModel.java new file mode 100644 index 0000000..ec4cb2e --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/po/DrpOrderGoodsMaterialStallNumModel.java @@ -0,0 +1,45 @@ +package com.bonus.canteen.core.supply.po; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.math.BigDecimal; + +@ApiModel +public class DrpOrderGoodsMaterialStallNumModel { + @ApiModelProperty("货品id") + private Long materialId; + @ApiModelProperty("档口id") + private Long stallId; + @ApiModelProperty("数量") + private BigDecimal notIntoNum; + + public Long getMaterialId() { + return this.materialId; + } + + public Long getStallId() { + return this.stallId; + } + + public BigDecimal getNotIntoNum() { + return this.notIntoNum; + } + + public void setMaterialId(final Long materialId) { + this.materialId = materialId; + } + + public void setStallId(final Long stallId) { + this.stallId = stallId; + } + + public void setNotIntoNum(final BigDecimal notIntoNum) { + this.notIntoNum = notIntoNum; + } + + public String toString() { + Long var10000 = this.getMaterialId(); + return "DrpOrderGoodsMaterialStallNumModel(materialId=" + var10000 + ", stallId=" + this.getStallId() + ", notIntoNum=" + String.valueOf(this.getNotIntoNum()) + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/po/DrpOrderGoodsPay.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/po/DrpOrderGoodsPay.java new file mode 100644 index 0000000..87d9168 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/po/DrpOrderGoodsPay.java @@ -0,0 +1,235 @@ +package com.bonus.canteen.core.supply.po; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +@ApiModel( + value = "采购订单付款表", + description = "采购订单付款表" +) +public class DrpOrderGoodsPay { + @ApiModelProperty("付款id") + private Long payId; + @ApiModelProperty("采购单号") + private String orderGoodsId; + @ApiModelProperty("付款金额") + private Long payAmount; + @ApiModelProperty("要求付款日期") + private LocalDate requirePayDate; + @ApiModelProperty("收款银行") + private String collectBank; + @ApiModelProperty("收款账号名称") + private String collectAccountName; + @ApiModelProperty("收款账号") + private String collectAccount; + @ApiModelProperty("申请备注") + private String applyRemark; + @ApiModelProperty("付款时间") + private LocalDateTime payTime; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("付款账户名称") + private String payAccountName; + @ApiModelProperty("付款账户") + private String payAccount; + @ApiModelProperty("付款备注") + private String payRemark; + @ApiModelProperty("类型(1申请，2付款)") + private Integer type; + @TableField( + value = "crby", + fill = FieldFill.INSERT + ) + @ApiModelProperty("创建人") + private String crby; + @TableField( + value = "crtime", + fill = FieldFill.INSERT + ) + @ApiModelProperty("创建时间") + private LocalDateTime crtime; + @TableField( + value = "upby", + fill = FieldFill.UPDATE + ) + @ApiModelProperty("更新人") + private String upby; + @TableField( + value = "uptime", + fill = FieldFill.UPDATE + ) + @ApiModelProperty("更新时间") + private LocalDateTime uptime; + + public Long getPayId() { + return this.payId; + } + + public String getOrderGoodsId() { + return this.orderGoodsId; + } + + public Long getPayAmount() { + return this.payAmount; + } + + public LocalDate getRequirePayDate() { + return this.requirePayDate; + } + + public String getCollectBank() { + return this.collectBank; + } + + public String getCollectAccountName() { + return this.collectAccountName; + } + + public String getCollectAccount() { + return this.collectAccount; + } + + public String getApplyRemark() { + return this.applyRemark; + } + + public LocalDateTime getPayTime() { + return this.payTime; + } + + public String getPayBank() { + return this.payBank; + } + + public String getPayAccountName() { + return this.payAccountName; + } + + public String getPayAccount() { + return this.payAccount; + } + + public String getPayRemark() { + return this.payRemark; + } + + public Integer getType() { + return this.type; + } + + public String getCrby() { + return this.crby; + } + + public LocalDateTime getCrtime() { + return this.crtime; + } + + public String getUpby() { + return this.upby; + } + + public LocalDateTime getUptime() { + return this.uptime; + } + + public DrpOrderGoodsPay setPayId(final Long payId) { + this.payId = payId; + return this; + } + + public DrpOrderGoodsPay setOrderGoodsId(final String orderGoodsId) { + this.orderGoodsId = orderGoodsId; + return this; + } + + public DrpOrderGoodsPay setPayAmount(final Long payAmount) { + this.payAmount = payAmount; + return this; + } + + public DrpOrderGoodsPay setRequirePayDate(final LocalDate requirePayDate) { + this.requirePayDate = requirePayDate; + return this; + } + + public DrpOrderGoodsPay setCollectBank(final String collectBank) { + this.collectBank = collectBank; + return this; + } + + public DrpOrderGoodsPay setCollectAccountName(final String collectAccountName) { + this.collectAccountName = collectAccountName; + return this; + } + + public DrpOrderGoodsPay setCollectAccount(final String collectAccount) { + this.collectAccount = collectAccount; + return this; + } + + public DrpOrderGoodsPay setApplyRemark(final String applyRemark) { + this.applyRemark = applyRemark; + return this; + } + + public DrpOrderGoodsPay setPayTime(final LocalDateTime payTime) { + this.payTime = payTime; + return this; + } + + public DrpOrderGoodsPay setPayBank(final String payBank) { + this.payBank = payBank; + return this; + } + + public DrpOrderGoodsPay setPayAccountName(final String payAccountName) { + this.payAccountName = payAccountName; + return this; + } + + public DrpOrderGoodsPay setPayAccount(final String payAccount) { + this.payAccount = payAccount; + return this; + } + + public DrpOrderGoodsPay setPayRemark(final String payRemark) { + this.payRemark = payRemark; + return this; + } + + public DrpOrderGoodsPay setType(final Integer type) { + this.type = type; + return this; + } + + public DrpOrderGoodsPay setCrby(final String crby) { + this.crby = crby; + return this; + } + + public DrpOrderGoodsPay setCrtime(final LocalDateTime crtime) { + this.crtime = crtime; + return this; + } + + public DrpOrderGoodsPay setUpby(final String upby) { + this.upby = upby; + return this; + } + + public DrpOrderGoodsPay setUptime(final LocalDateTime uptime) { + this.uptime = uptime; + return this; + } + + public String toString() { + Long var10000 = this.getPayId(); + return "DrpOrderGoodsPay(payId=" + var10000 + ", orderGoodsId=" + this.getOrderGoodsId() + ", payAmount=" + this.getPayAmount() + ", requirePayDate=" + String.valueOf(this.getRequirePayDate()) + ", collectBank=" + this.getCollectBank() + ", collectAccountName=" + this.getCollectAccountName() + ", collectAccount=" + this.getCollectAccount() + ", applyRemark=" + this.getApplyRemark() + ", payTime=" + String.valueOf(this.getPayTime()) + ", payBank=" + this.getPayBank() + ", payAccountName=" + this.getPayAccountName() + ", payAccount=" + this.getPayAccount() + ", payRemark=" + this.getPayRemark() + ", type=" + this.getType() + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ", upby=" + this.getUpby() + ", uptime=" + String.valueOf(this.getUptime()) + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/po/DrpOrderGoodsRefund.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/po/DrpOrderGoodsRefund.java new file mode 100644 index 0000000..5659357 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/po/DrpOrderGoodsRefund.java @@ -0,0 +1,236 @@ +package com.bonus.canteen.core.supply.po; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +@ApiModel( + value = "采购订单退款表", + description = "采购订单退款表" +) +public class DrpOrderGoodsRefund { + @ApiModelProperty("退款id") + private Long refundMoneyId; + @ApiModelProperty("采购单号") + private String orderGoodsId; + @ApiModelProperty("退款金额") + private Long refundAmount; + @ApiModelProperty("要求退款日期") + private LocalDate requireRefundDate; + @ApiModelProperty("收款银行") + private String collectBank; + @ApiModelProperty("收款账号名称") + private String collectAccountName; + @ApiModelProperty("收款账号") + private String collectAccount; + @ApiModelProperty("申请备注") + private String applyRemark; + @ApiModelProperty("退款时间") + private LocalDateTime refundTime; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("付款账户名称") + private String payAccountName; + @ApiModelProperty("付款账户") + private String payAccount; + @ApiModelProperty("退款备注") + private String refundRemark; + @ApiModelProperty("类型(1申请，2付款)") + private Integer type; + @TableField( + value = "crby", + fill = FieldFill.INSERT + ) + @ApiModelProperty("创建人") + private String crby; + @TableField( + value = "crtime", + fill = FieldFill.INSERT + ) + @ApiModelProperty("创建时间") + private LocalDateTime crtime; + @TableField( + value = "upby", + fill = FieldFill.UPDATE + ) + @ApiModelProperty("更新人") + private String upby; + @TableField( + value = "uptime", + fill = FieldFill.UPDATE + ) + @ApiModelProperty("更新时间") + private LocalDateTime uptime; + + public Long getRefundMoneyId() { + return this.refundMoneyId; + } + + public String getOrderGoodsId() { + return this.orderGoodsId; + } + + public Long getRefundAmount() { + return this.refundAmount; + } + + public LocalDate getRequireRefundDate() { + return this.requireRefundDate; + } + + public String getCollectBank() { + return this.collectBank; + } + + public String getCollectAccountName() { + return this.collectAccountName; + } + + public String getCollectAccount() { + return this.collectAccount; + } + + public String getApplyRemark() { + return this.applyRemark; + } + + public LocalDateTime getRefundTime() { + return this.refundTime; + } + + public String getPayBank() { + return this.payBank; + } + + public String getPayAccountName() { + return this.payAccountName; + } + + public String getPayAccount() { + return this.payAccount; + } + + public String getRefundRemark() { + return this.refundRemark; + } + + public Integer getType() { + return this.type; + } + + public String getCrby() { + return this.crby; + } + + public LocalDateTime getCrtime() { + return this.crtime; + } + + public String getUpby() { + return this.upby; + } + + public LocalDateTime getUptime() { + return this.uptime; + } + + public DrpOrderGoodsRefund setRefundMoneyId(final Long refundMoneyId) { + this.refundMoneyId = refundMoneyId; + return this; + } + + public DrpOrderGoodsRefund setOrderGoodsId(final String orderGoodsId) { + this.orderGoodsId = orderGoodsId; + return this; + } + + public DrpOrderGoodsRefund setRefundAmount(final Long refundAmount) { + this.refundAmount = refundAmount; + return this; + } + + public DrpOrderGoodsRefund setRequireRefundDate(final LocalDate requireRefundDate) { + this.requireRefundDate = requireRefundDate; + return this; + } + + public DrpOrderGoodsRefund setCollectBank(final String collectBank) { + this.collectBank = collectBank; + return this; + } + + public DrpOrderGoodsRefund setCollectAccountName(final String collectAccountName) { + this.collectAccountName = collectAccountName; + return this; + } + + public DrpOrderGoodsRefund setCollectAccount(final String collectAccount) { + this.collectAccount = collectAccount; + return this; + } + + public DrpOrderGoodsRefund setApplyRemark(final String applyRemark) { + this.applyRemark = applyRemark; + return this; + } + + public DrpOrderGoodsRefund setRefundTime(final LocalDateTime refundTime) { + this.refundTime = refundTime; + return this; + } + + public DrpOrderGoodsRefund setPayBank(final String payBank) { + this.payBank = payBank; + return this; + } + + public DrpOrderGoodsRefund setPayAccountName(final String payAccountName) { + this.payAccountName = payAccountName; + return this; + } + + public DrpOrderGoodsRefund setPayAccount(final String payAccount) { + this.payAccount = payAccount; + return this; + } + + public DrpOrderGoodsRefund setRefundRemark(final String refundRemark) { + this.refundRemark = refundRemark; + return this; + } + + public DrpOrderGoodsRefund setType(final Integer type) { + this.type = type; + return this; + } + + public DrpOrderGoodsRefund setCrby(final String crby) { + this.crby = crby; + return this; + } + + public DrpOrderGoodsRefund setCrtime(final LocalDateTime crtime) { + this.crtime = crtime; + return this; + } + + public DrpOrderGoodsRefund setUpby(final String upby) { + this.upby = upby; + return this; + } + + public DrpOrderGoodsRefund setUptime(final LocalDateTime uptime) { + this.uptime = uptime; + return this; + } + + + public String toString() { + Long var10000 = this.getRefundMoneyId(); + return "DrpOrderGoodsRefund(refundMoneyId=" + var10000 + ", orderGoodsId=" + this.getOrderGoodsId() + ", refundAmount=" + this.getRefundAmount() + ", requireRefundDate=" + String.valueOf(this.getRequireRefundDate()) + ", collectBank=" + this.getCollectBank() + ", collectAccountName=" + this.getCollectAccountName() + ", collectAccount=" + this.getCollectAccount() + ", applyRemark=" + this.getApplyRemark() + ", refundTime=" + String.valueOf(this.getRefundTime()) + ", payBank=" + this.getPayBank() + ", payAccountName=" + this.getPayAccountName() + ", payAccount=" + this.getPayAccount() + ", refundRemark=" + this.getRefundRemark() + ", type=" + this.getType() + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ", upby=" + this.getUpby() + ", uptime=" + String.valueOf(this.getUptime()) + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/DrpOrderGoodsDetailServiceV2.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/DrpOrderGoodsDetailServiceV2.java new file mode 100644 index 0000000..2b8c7c7 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/DrpOrderGoodsDetailServiceV2.java @@ -0,0 +1,13 @@ +package com.bonus.canteen.core.supply.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bonus.canteen.core.supply.domain.DrpOrderGoodsDetail; +import com.bonus.canteen.core.supply.vo.DrpOrderGoodsDetailVO; + +import java.util.List; + +public interface DrpOrderGoodsDetailServiceV2 extends IService { + void deleteByOrderGoodsId(String orderGoodsId); + + List getDrpOrderGoodsDetailVOListByOrderGoodsId(String orderGoodsId); +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/DrpSupplierComeGoService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/DrpSupplierComeGoService.java index 1b60a30..9845487 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/DrpSupplierComeGoService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/DrpSupplierComeGoService.java @@ -1,7 +1,6 @@ package com.bonus.canteen.core.supply.service; -import com.bonus.canteen.core.supply.dto.DrpSupplierComeAndGoPageDTO; -import com.bonus.canteen.core.supply.dto.DrpSupplierMaterialIntoAndOutPageDTO; +import com.bonus.canteen.core.supply.dto.*; import com.bonus.canteen.core.supply.vo.DrpSupplierComeAndGoPageVO; import com.bonus.canteen.core.supply.vo.DrpSupplierMaterialIntoAndOutPageVO; @@ -12,4 +11,12 @@ public interface DrpSupplierComeGoService { List pageSupplierComeAndGo(DrpSupplierComeAndGoPageDTO content); + void applyPay(DrpComeAndGoApplyPayDTO content); + + void commitPay(DrpComeAndGoCommitPayDTO content); + + void applyRefund(DrpComeAndGoCommitRefundApplyDTO content); + + void commitRefund(DrpComeAndGoCommitRefundDTO content); + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/impl/DrpOrderGoodsDetailServiceImplV2.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/impl/DrpOrderGoodsDetailServiceImplV2.java new file mode 100644 index 0000000..a634f64 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/impl/DrpOrderGoodsDetailServiceImplV2.java @@ -0,0 +1,23 @@ +package com.bonus.canteen.core.supply.service.impl; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bonus.canteen.core.supply.domain.DrpOrderGoodsDetail; +import com.bonus.canteen.core.supply.mapper.DrpOrderGoodsDetailMapperV2; +import com.bonus.canteen.core.supply.service.DrpOrderGoodsDetailServiceV2; +import com.bonus.canteen.core.supply.vo.DrpOrderGoodsDetailVO; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class DrpOrderGoodsDetailServiceImplV2 extends ServiceImpl implements DrpOrderGoodsDetailServiceV2 { + public void deleteByOrderGoodsId(String orderGoodsId) { + this.baseMapper.delete(Wrappers.lambdaQuery(DrpOrderGoodsDetail.class).eq(DrpOrderGoodsDetail::getOrderGoodsId, orderGoodsId)); + } + + public List getDrpOrderGoodsDetailVOListByOrderGoodsId(String orderGoodsId) { + return this.baseMapper.getDrpOrderGoodsDetailVOListByOrderGoodsId(orderGoodsId); + } + +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/impl/DrpSupplierComeGoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/impl/DrpSupplierComeGoServiceImpl.java index eb87d63..1e056a9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/impl/DrpSupplierComeGoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/impl/DrpSupplierComeGoServiceImpl.java @@ -1,27 +1,26 @@ package com.bonus.canteen.core.supply.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; import com.bonus.canteen.core.menu.enums.LeLevelEnum; import com.bonus.canteen.core.supply.api.DrpAllocStallApi; import com.bonus.canteen.core.supply.constant.DrpIntoInventoryStatusEnum; +import com.bonus.canteen.core.supply.constant.DrpOrderGoodsPayAndRefundTypeEnum; import com.bonus.canteen.core.supply.constant.DrpOrderGoodsStatusEnum; import com.bonus.canteen.core.supply.constant.DrpPayRefundTypeEnum; -import com.bonus.canteen.core.supply.dto.DrpSupplierComeAndGoPageDTO; -import com.bonus.canteen.core.supply.dto.DrpSupplierMaterialIntoAndOutPageDTO; -import com.bonus.canteen.core.supply.mapper.DrpIntoInventoryMapper; -import com.bonus.canteen.core.supply.mapper.DrpOrderGoodsPayStyleMapper; -import com.bonus.canteen.core.supply.mapper.DrpRefundGoodsMapper; -import com.bonus.canteen.core.supply.mapper.DrpSupplierComeGoMapper; -import com.bonus.canteen.core.supply.po.OrderGoodsPayRefundAmountModel; -import com.bonus.canteen.core.supply.po.OrderIntoNumModel; -import com.bonus.canteen.core.supply.po.OrderRefundNumModel; +import com.bonus.canteen.core.supply.dto.*; +import com.bonus.canteen.core.supply.mapper.*; +import com.bonus.canteen.core.supply.po.*; import com.bonus.canteen.core.supply.service.DrpSupplierComeGoService; import com.bonus.canteen.core.supply.vo.DrpOrderGoodsPayStyleVO; import com.bonus.canteen.core.supply.vo.DrpSupplierComeAndGoPageVO; import com.bonus.canteen.core.supply.vo.DrpSupplierMaterialIntoAndOutPageVO; import com.bonus.common.houqin.utils.LeBeanUtil; +import com.bonus.common.houqin.utils.id.Id; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -51,6 +50,12 @@ public class DrpSupplierComeGoServiceImpl implements DrpSupplierComeGoService { @Resource private DrpRefundGoodsMapper drpRefundGoodsMapper; + @Resource + private DrpOrderGoodsPayMapper drpOrderGoodsPayMapper; + + @Resource + private DrpOrderGoodsRefundMapper drpOrderGoodsRefundMapper; + @Override public List pageSupplierMaterialIntoAndOut(DrpSupplierMaterialIntoAndOutPageDTO content) { // List warehouseAuthority = this.drpAuthorityApi.listWarehouseAuthority(); @@ -154,4 +159,38 @@ public class DrpSupplierComeGoServiceImpl implements DrpSupplierComeGoService { } } + public void applyPay(DrpComeAndGoApplyPayDTO content) { + DrpOrderGoodsPay drpOrderGoodsPay = new DrpOrderGoodsPay(); + BeanUtil.copyProperties(content, drpOrderGoodsPay, new String[0]); + drpOrderGoodsPay.setPayId(Id.next()); + drpOrderGoodsPay.setType(DrpOrderGoodsPayAndRefundTypeEnum.APPLY.key()); + this.drpOrderGoodsPayMapper.insert(drpOrderGoodsPay); + } + + + public void commitPay(DrpComeAndGoCommitPayDTO content) { + DrpOrderGoodsPay drpOrderGoodsPay = new DrpOrderGoodsPay(); + BeanUtil.copyProperties(content, drpOrderGoodsPay, new String[0]); + drpOrderGoodsPay.setPayId(Id.next()); + drpOrderGoodsPay.setType(DrpOrderGoodsPayAndRefundTypeEnum.PAY_OR_REFUND.key()); + this.drpOrderGoodsPayMapper.insert(drpOrderGoodsPay); + } + + public void applyRefund(DrpComeAndGoCommitRefundApplyDTO content) { + DrpOrderGoodsRefund drpOrderGoodsRefund = new DrpOrderGoodsRefund(); + BeanUtil.copyProperties(content, drpOrderGoodsRefund, new String[0]); + drpOrderGoodsRefund.setRefundMoneyId(Id.next()); + drpOrderGoodsRefund.setType(DrpOrderGoodsPayAndRefundTypeEnum.APPLY.key()); + this.drpOrderGoodsRefundMapper.insert(drpOrderGoodsRefund); + } + + public void commitRefund(DrpComeAndGoCommitRefundDTO content) { + DrpOrderGoodsRefund drpOrderGoodsRefund = new DrpOrderGoodsRefund(); + BeanUtil.copyProperties(content, drpOrderGoodsRefund, new String[0]); + drpOrderGoodsRefund.setRefundMoneyId(Id.next()); + drpOrderGoodsRefund.setType(DrpOrderGoodsPayAndRefundTypeEnum.PAY_OR_REFUND.key()); + this.drpOrderGoodsRefundMapper.insert(drpOrderGoodsRefund); + } + + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManageDetailVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManageDetailVO.java new file mode 100644 index 0000000..fe87855 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManageDetailVO.java @@ -0,0 +1,136 @@ +package com.bonus.canteen.core.supply.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.time.LocalDateTime; + +@ApiModel +public class DrpOrderGoodsManageDetailVO { + @ApiModelProperty("金额") + private Long amount; + @ApiModelProperty("付款时间") + private LocalDateTime payTime; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("付款账号") + private String payAccount; + @ApiModelProperty("付款开户名") + private String payAccountName; + @ApiModelProperty("收款银行") + private String collectBank; + @ApiModelProperty("收款账号") + private String collectAccount; + @ApiModelProperty("收款开户名") + private String collectAccountName; + @ApiModelProperty("订单号") + private String orderGoodsId; + @ApiModelProperty("订单时间") + private LocalDateTime orderTime; + @ApiModelProperty("操作人") + private String crby; + @ApiModelProperty("操作时间") + private LocalDateTime crTime; + + public Long getAmount() { + return this.amount; + } + + public LocalDateTime getPayTime() { + return this.payTime; + } + + public String getPayBank() { + return this.payBank; + } + + public String getPayAccount() { + return this.payAccount; + } + + public String getPayAccountName() { + return this.payAccountName; + } + + public String getCollectBank() { + return this.collectBank; + } + + public String getCollectAccount() { + return this.collectAccount; + } + + public String getCollectAccountName() { + return this.collectAccountName; + } + + public String getOrderGoodsId() { + return this.orderGoodsId; + } + + public LocalDateTime getOrderTime() { + return this.orderTime; + } + + public String getCrby() { + return this.crby; + } + + public LocalDateTime getCrTime() { + return this.crTime; + } + + public void setAmount(final Long amount) { + this.amount = amount; + } + + public void setPayTime(final LocalDateTime payTime) { + this.payTime = payTime; + } + + public void setPayBank(final String payBank) { + this.payBank = payBank; + } + + public void setPayAccount(final String payAccount) { + this.payAccount = payAccount; + } + + public void setPayAccountName(final String payAccountName) { + this.payAccountName = payAccountName; + } + + public void setCollectBank(final String collectBank) { + this.collectBank = collectBank; + } + + public void setCollectAccount(final String collectAccount) { + this.collectAccount = collectAccount; + } + + public void setCollectAccountName(final String collectAccountName) { + this.collectAccountName = collectAccountName; + } + + public void setOrderGoodsId(final String orderGoodsId) { + this.orderGoodsId = orderGoodsId; + } + + public void setOrderTime(final LocalDateTime orderTime) { + this.orderTime = orderTime; + } + + public void setCrby(final String crby) { + this.crby = crby; + } + + public void setCrTime(final LocalDateTime crTime) { + this.crTime = crTime; + } + + + public String toString() { + Long var10000 = this.getAmount(); + return "DrpOrderGoodsManageDetailVO(amount=" + var10000 + ", payTime=" + String.valueOf(this.getPayTime()) + ", payBank=" + this.getPayBank() + ", payAccount=" + this.getPayAccount() + ", payAccountName=" + this.getPayAccountName() + ", collectBank=" + this.getCollectBank() + ", collectAccount=" + this.getCollectAccount() + ", collectAccountName=" + this.getCollectAccountName() + ", orderGoodsId=" + this.getOrderGoodsId() + ", orderTime=" + String.valueOf(this.getOrderTime()) + ", crby=" + this.getCrby() + ", crTime=" + String.valueOf(this.getCrTime()) + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManagePageVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManagePageVO.java new file mode 100644 index 0000000..d99a722 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManagePageVO.java @@ -0,0 +1,44 @@ +package com.bonus.canteen.core.supply.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +@ApiModel +public class DrpOrderGoodsManagePageVO { + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("时间") + private String time; + @ApiModelProperty("总额") + private String amount; + + public String getSupplierName() { + return this.supplierName; + } + + public String getTime() { + return this.time; + } + + public String getAmount() { + return this.amount; + } + + public void setSupplierName(final String supplierName) { + this.supplierName = supplierName; + } + + public void setTime(final String time) { + this.time = time; + } + + public void setAmount(final String amount) { + this.amount = amount; + } + + + public String toString() { + String var10000 = this.getSupplierName(); + return "DrpOrderGoodsManagePageVO(supplierName=" + var10000 + ", time=" + this.getTime() + ", amount=" + this.getAmount() + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManagePayVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManagePayVO.java new file mode 100644 index 0000000..7bfc834 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManagePayVO.java @@ -0,0 +1,23 @@ +package com.bonus.canteen.core.supply.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +@ApiModel +public class DrpOrderGoodsManagePayVO extends DrpOrderGoodsManagePageVO { + @ApiModelProperty("付款编号") + private long payId; + + + public long getPayId() { + return this.payId; + } + + public void setPayId(final long payId) { + this.payId = payId; + } + + public String toString() { + return "DrpOrderGoodsManagePayVO(payId=" + this.getPayId() + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManageRefundVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManageRefundVO.java new file mode 100644 index 0000000..9291ef6 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManageRefundVO.java @@ -0,0 +1,22 @@ +package com.bonus.canteen.core.supply.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +@ApiModel +public class DrpOrderGoodsManageRefundVO extends DrpOrderGoodsManagePageVO { + @ApiModelProperty("退款编号") + private long refundMoneyId; + + public long getRefundMoneyId() { + return this.refundMoneyId; + } + + public void setRefundMoneyId(final long refundMoneyId) { + this.refundMoneyId = refundMoneyId; + } + + public String toString() { + return "DrpOrderGoodsManageRefundVO(refundMoneyId=" + this.getRefundMoneyId() + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManageTotalVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManageTotalVO.java new file mode 100644 index 0000000..da840dc --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManageTotalVO.java @@ -0,0 +1,38 @@ +package com.bonus.canteen.core.supply.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +@ApiModel +public class DrpOrderGoodsManageTotalVO { + @ApiModelProperty("总共笔数") + private int total; + @ApiModelProperty("总金额") + private String amount; + + public int getTotal() { + return this.total; + } + + public String getAmount() { + return this.amount; + } + + public void setTotal(final int total) { + this.total = total; + } + + public void setAmount(final String amount) { + this.amount = amount; + } + + + protected boolean canEqual(final Object other) { + return other instanceof DrpOrderGoodsManageTotalVO; + } + + public String toString() { + int var10000 = this.getTotal(); + return "DrpOrderGoodsManageTotalVO(total=" + var10000 + ", amount=" + this.getAmount() + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsPayListVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsPayListVO.java new file mode 100644 index 0000000..aece76a --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsPayListVO.java @@ -0,0 +1,213 @@ +package com.bonus.canteen.core.supply.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +@ApiModel +public class DrpOrderGoodsPayListVO { + @ApiModelProperty("付款id") + private Long payId; + @ApiModelProperty("采购单号") + private String orderGoodsId; + @ApiModelProperty("付款金额") + private Long payAmount; + @ApiModelProperty("要求付款日期") + private LocalDate requirePayDate; + @ApiModelProperty("收款银行") + private String collectBank; + @ApiModelProperty("收款账号名称") + private String collectAccountName; + @ApiModelProperty("收款账号") + private String collectAccount; + @ApiModelProperty("申请备注") + private String applyRemark; + @ApiModelProperty("付款时间") + private LocalDateTime payTime; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("付款账户名称") + private String payAccountName; + @ApiModelProperty("付款账户") + private String payAccount; + @ApiModelProperty("付款备注") + private String payRemark; + @ApiModelProperty("类型(1申请，2付款)") + private Integer type; + @ApiModelProperty("创建人") + private String crby; + @ApiModelProperty("创建时间") + private LocalDateTime crtime; + @ApiModelProperty("更新人") + private String upby; + @ApiModelProperty("更新时间") + private LocalDateTime uptime; + + public Long getPayId() { + return this.payId; + } + + public String getOrderGoodsId() { + return this.orderGoodsId; + } + + public Long getPayAmount() { + return this.payAmount; + } + + public LocalDate getRequirePayDate() { + return this.requirePayDate; + } + + public String getCollectBank() { + return this.collectBank; + } + + public String getCollectAccountName() { + return this.collectAccountName; + } + + public String getCollectAccount() { + return this.collectAccount; + } + + public String getApplyRemark() { + return this.applyRemark; + } + + public LocalDateTime getPayTime() { + return this.payTime; + } + + public String getPayBank() { + return this.payBank; + } + + public String getPayAccountName() { + return this.payAccountName; + } + + public String getPayAccount() { + return this.payAccount; + } + + public String getPayRemark() { + return this.payRemark; + } + + public Integer getType() { + return this.type; + } + + public String getCrby() { + return this.crby; + } + + public LocalDateTime getCrtime() { + return this.crtime; + } + + public String getUpby() { + return this.upby; + } + + public LocalDateTime getUptime() { + return this.uptime; + } + + public DrpOrderGoodsPayListVO setPayId(final Long payId) { + this.payId = payId; + return this; + } + + public DrpOrderGoodsPayListVO setOrderGoodsId(final String orderGoodsId) { + this.orderGoodsId = orderGoodsId; + return this; + } + + public DrpOrderGoodsPayListVO setPayAmount(final Long payAmount) { + this.payAmount = payAmount; + return this; + } + + public DrpOrderGoodsPayListVO setRequirePayDate(final LocalDate requirePayDate) { + this.requirePayDate = requirePayDate; + return this; + } + + public DrpOrderGoodsPayListVO setCollectBank(final String collectBank) { + this.collectBank = collectBank; + return this; + } + + public DrpOrderGoodsPayListVO setCollectAccountName(final String collectAccountName) { + this.collectAccountName = collectAccountName; + return this; + } + + public DrpOrderGoodsPayListVO setCollectAccount(final String collectAccount) { + this.collectAccount = collectAccount; + return this; + } + + public DrpOrderGoodsPayListVO setApplyRemark(final String applyRemark) { + this.applyRemark = applyRemark; + return this; + } + + public DrpOrderGoodsPayListVO setPayTime(final LocalDateTime payTime) { + this.payTime = payTime; + return this; + } + + public DrpOrderGoodsPayListVO setPayBank(final String payBank) { + this.payBank = payBank; + return this; + } + + public DrpOrderGoodsPayListVO setPayAccountName(final String payAccountName) { + this.payAccountName = payAccountName; + return this; + } + + public DrpOrderGoodsPayListVO setPayAccount(final String payAccount) { + this.payAccount = payAccount; + return this; + } + + public DrpOrderGoodsPayListVO setPayRemark(final String payRemark) { + this.payRemark = payRemark; + return this; + } + + public DrpOrderGoodsPayListVO setType(final Integer type) { + this.type = type; + return this; + } + + public DrpOrderGoodsPayListVO setCrby(final String crby) { + this.crby = crby; + return this; + } + + public DrpOrderGoodsPayListVO setCrtime(final LocalDateTime crtime) { + this.crtime = crtime; + return this; + } + + public DrpOrderGoodsPayListVO setUpby(final String upby) { + this.upby = upby; + return this; + } + + public DrpOrderGoodsPayListVO setUptime(final LocalDateTime uptime) { + this.uptime = uptime; + return this; + } + public String toString() { + Long var10000 = this.getPayId(); + return "DrpOrderGoodsPayListVO(payId=" + var10000 + ", orderGoodsId=" + this.getOrderGoodsId() + ", payAmount=" + this.getPayAmount() + ", requirePayDate=" + String.valueOf(this.getRequirePayDate()) + ", collectBank=" + this.getCollectBank() + ", collectAccountName=" + this.getCollectAccountName() + ", collectAccount=" + this.getCollectAccount() + ", applyRemark=" + this.getApplyRemark() + ", payTime=" + String.valueOf(this.getPayTime()) + ", payBank=" + this.getPayBank() + ", payAccountName=" + this.getPayAccountName() + ", payAccount=" + this.getPayAccount() + ", payRemark=" + this.getPayRemark() + ", type=" + this.getType() + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ", upby=" + this.getUpby() + ", uptime=" + String.valueOf(this.getUptime()) + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsRefundListVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsRefundListVO.java new file mode 100644 index 0000000..d7081aa --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsRefundListVO.java @@ -0,0 +1,214 @@ +package com.bonus.canteen.core.supply.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +@ApiModel +public class DrpOrderGoodsRefundListVO { + @ApiModelProperty("退款id") + private Long refundMoneyId; + @ApiModelProperty("采购单号") + private String orderGoodsId; + @ApiModelProperty("退款金额") + private Long refundAmount; + @ApiModelProperty("要求退款日期") + private LocalDate requireRefundDate; + @ApiModelProperty("收款银行") + private String collectBank; + @ApiModelProperty("收款账号名称") + private String collectAccountName; + @ApiModelProperty("收款账号") + private String collectAccount; + @ApiModelProperty("申请备注") + private String applyRemark; + @ApiModelProperty("退款时间") + private LocalDateTime refundTime; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("付款账户名称") + private String payAccountName; + @ApiModelProperty("付款账户") + private String payAccount; + @ApiModelProperty("退款备注") + private String refundRemark; + @ApiModelProperty("类型(1申请，2付款)") + private Integer type; + @ApiModelProperty("创建人") + private String crby; + @ApiModelProperty("创建时间") + private LocalDateTime crtime; + @ApiModelProperty("更新人") + private String upby; + @ApiModelProperty("更新时间") + private LocalDateTime uptime; + + public Long getRefundMoneyId() { + return this.refundMoneyId; + } + + public String getOrderGoodsId() { + return this.orderGoodsId; + } + + public Long getRefundAmount() { + return this.refundAmount; + } + + public LocalDate getRequireRefundDate() { + return this.requireRefundDate; + } + + public String getCollectBank() { + return this.collectBank; + } + + public String getCollectAccountName() { + return this.collectAccountName; + } + + public String getCollectAccount() { + return this.collectAccount; + } + + public String getApplyRemark() { + return this.applyRemark; + } + + public LocalDateTime getRefundTime() { + return this.refundTime; + } + + public String getPayBank() { + return this.payBank; + } + + public String getPayAccountName() { + return this.payAccountName; + } + + public String getPayAccount() { + return this.payAccount; + } + + public String getRefundRemark() { + return this.refundRemark; + } + + public Integer getType() { + return this.type; + } + + public String getCrby() { + return this.crby; + } + + public LocalDateTime getCrtime() { + return this.crtime; + } + + public String getUpby() { + return this.upby; + } + + public LocalDateTime getUptime() { + return this.uptime; + } + + public DrpOrderGoodsRefundListVO setRefundMoneyId(final Long refundMoneyId) { + this.refundMoneyId = refundMoneyId; + return this; + } + + public DrpOrderGoodsRefundListVO setOrderGoodsId(final String orderGoodsId) { + this.orderGoodsId = orderGoodsId; + return this; + } + + public DrpOrderGoodsRefundListVO setRefundAmount(final Long refundAmount) { + this.refundAmount = refundAmount; + return this; + } + + public DrpOrderGoodsRefundListVO setRequireRefundDate(final LocalDate requireRefundDate) { + this.requireRefundDate = requireRefundDate; + return this; + } + + public DrpOrderGoodsRefundListVO setCollectBank(final String collectBank) { + this.collectBank = collectBank; + return this; + } + + public DrpOrderGoodsRefundListVO setCollectAccountName(final String collectAccountName) { + this.collectAccountName = collectAccountName; + return this; + } + + public DrpOrderGoodsRefundListVO setCollectAccount(final String collectAccount) { + this.collectAccount = collectAccount; + return this; + } + + public DrpOrderGoodsRefundListVO setApplyRemark(final String applyRemark) { + this.applyRemark = applyRemark; + return this; + } + + public DrpOrderGoodsRefundListVO setRefundTime(final LocalDateTime refundTime) { + this.refundTime = refundTime; + return this; + } + + public DrpOrderGoodsRefundListVO setPayBank(final String payBank) { + this.payBank = payBank; + return this; + } + + public DrpOrderGoodsRefundListVO setPayAccountName(final String payAccountName) { + this.payAccountName = payAccountName; + return this; + } + + public DrpOrderGoodsRefundListVO setPayAccount(final String payAccount) { + this.payAccount = payAccount; + return this; + } + + public DrpOrderGoodsRefundListVO setRefundRemark(final String refundRemark) { + this.refundRemark = refundRemark; + return this; + } + + public DrpOrderGoodsRefundListVO setType(final Integer type) { + this.type = type; + return this; + } + + public DrpOrderGoodsRefundListVO setCrby(final String crby) { + this.crby = crby; + return this; + } + + public DrpOrderGoodsRefundListVO setCrtime(final LocalDateTime crtime) { + this.crtime = crtime; + return this; + } + + public DrpOrderGoodsRefundListVO setUpby(final String upby) { + this.upby = upby; + return this; + } + + public DrpOrderGoodsRefundListVO setUptime(final LocalDateTime uptime) { + this.uptime = uptime; + return this; + } + + public String toString() { + Long var10000 = this.getRefundMoneyId(); + return "DrpOrderGoodsRefundListVO(refundMoneyId=" + var10000 + ", orderGoodsId=" + this.getOrderGoodsId() + ", refundAmount=" + this.getRefundAmount() + ", requireRefundDate=" + String.valueOf(this.getRequireRefundDate()) + ", collectBank=" + this.getCollectBank() + ", collectAccountName=" + this.getCollectAccountName() + ", collectAccount=" + this.getCollectAccount() + ", applyRemark=" + this.getApplyRemark() + ", refundTime=" + String.valueOf(this.getRefundTime()) + ", payBank=" + this.getPayBank() + ", payAccountName=" + this.getPayAccountName() + ", payAccount=" + this.getPayAccount() + ", refundRemark=" + this.getRefundRemark() + ", type=" + this.getType() + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ", upby=" + this.getUpby() + ", uptime=" + String.valueOf(this.getUptime()) + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/utils/excel/MenuRecipeImportListener.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/utils/excel/MenuRecipeImportListener.java index 227e723..ae6fc83 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/utils/excel/MenuRecipeImportListener.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/utils/excel/MenuRecipeImportListener.java @@ -163,7 +163,7 @@ public class MenuRecipeImportListener extends AnalysisEventListenerseason_id, suit_id, meal_id, - + remark, @@ -503,6 +503,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{seasonId}, #{suitId}, #{mealId}, + #{remark} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesTypeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesTypeMapper.xml index a383dcf..79f0253 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesTypeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesTypeMapper.xml @@ -14,10 +14,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" du.unit_name unitName, du.rate, du.weigh_type weighType, - du.crby, - du.crtime, - du.upby, - du.uptime, + du.create_by as crby, + du.create_time as crtime, + du.update_by as upby, + du.update_time as uptime, du.area_id, aa.area_name from drp_unit du diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOrderGoodsDetailMapperV2.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOrderGoodsDetailMapperV2.xml new file mode 100644 index 0000000..d0779d0 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOrderGoodsDetailMapperV2.xml @@ -0,0 +1,56 @@ + + + + + UPDATE drp_order_goods_detail set into_num = IFNULL(into_num,0) + #{plusNum} where order_goods_detail_id = #{orderGoodsDetailId} + + + UPDATE drp_order_goods_detail set into_num = into_num - #{minusNum} where order_goods_detail_id = #{orderGoodsDetailId} + + + + + diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOrderGoodsPayMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOrderGoodsPayMapper.xml new file mode 100644 index 0000000..4216061 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOrderGoodsPayMapper.xml @@ -0,0 +1,81 @@ + + + + + + + + + + diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOrderGoodsRefundMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOrderGoodsRefundMapper.xml new file mode 100644 index 0000000..0b05740 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOrderGoodsRefundMapper.xml @@ -0,0 +1,79 @@ + + + + + + + +