bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
gaowdong 2025-05-16 18:38:47 +08:00
parent 4d3b41ad07 f3dbb61890
commit ca34461e7f
33 changed files with 2437 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuRecipeController.java
View File

@ -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);
}
}

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java
View File

@ -338,7 +338,7 @@ public class MenuDishesServiceImpl extends ServiceImpl<MenuDishesMapper, MenuDis
public int addMenuDishes(MenuDishesDTO menuDishesDTO) {
//检查菜品是否已存在
MenuDishes menuDishesOne = menuDishesMapper.getOneByName(menuDishesDTO);
if (menuDishesOne != null && menuDishesOne.getDishesId() != Long.parseLong(menuDishesDTO.getDishesId())) {
if (menuDishesOne != null ) {
throw new ServiceException("菜品已存在");
}
if (!ObjectUtil.isEmpty(menuDishesDTO.getDishesNum())) {

57
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/constant/DrpOrderGoodsPayAndRefundTypeEnum.java Normal file
View File

@ -0,0 +1,57 @@
package com.bonus.canteen.core.supply.constant;
public enum DrpOrderGoodsPayAndRefundTypeEnum {
APPLY(1, "申请"),
PAY_OR_REFUND(2, "付款/退款");
private final Integer key;
private final String value;
private DrpOrderGoodsPayAndRefundTypeEnum(Integer key, String value) {
this.key = key;
this.value = value;
}
public static Integer getKey(String value) {
DrpOrderGoodsPayAndRefundTypeEnum[] enums = values();
DrpOrderGoodsPayAndRefundTypeEnum[] var2 = enums;
int var3 = enums.length;
for(int var4 = 0; var4 < var3; ++var4) {
DrpOrderGoodsPayAndRefundTypeEnum temp = var2[var4];
if (temp.value().equals(value)) {
return temp.key();
}
}
return null;
}
public static String getValue(Integer key) {
DrpOrderGoodsPayAndRefundTypeEnum[] enums = values();
DrpOrderGoodsPayAndRefundTypeEnum[] var2 = enums;
int var3 = enums.length;
for(int var4 = 0; var4 < var3; ++var4) {
DrpOrderGoodsPayAndRefundTypeEnum temp = var2[var4];
if (temp.key().equals(key)) {
return temp.value();
}
}
return null;
}
public Integer key() {
return this.key;
}
public String value() {
return this.value;
}
// $FF: synthetic method
private static DrpOrderGoodsPayAndRefundTypeEnum[] $values() {
return new DrpOrderGoodsPayAndRefundTypeEnum[]{APPLY, PAY_OR_REFUND};
}
}

47
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/controller/SupplierComeGoController.java
View File

@ -1,20 +1,23 @@
package com.bonus.canteen.core.supply.controller;
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.service.DrpOrderGoodsDetailServiceV2;
import com.bonus.canteen.core.supply.service.DrpSupplierComeGoService;
import com.bonus.canteen.core.supply.vo.DrpOrderGoodsDetailVO;
import com.bonus.canteen.core.supply.vo.DrpSupplierComeAndGoPageVO;
import com.bonus.canteen.core.supply.vo.DrpSupplierMaterialIntoAndOutPageVO;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.web.page.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Param;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
@RestController
@ -26,6 +29,9 @@ public class SupplierComeGoController extends BaseController {
@Resource
private DrpSupplierComeGoService drpSupplierComeGoService;
@Resource
private DrpOrderGoodsDetailServiceV2 drpOrderGoodsDetailService;
@GetMapping({"/supplier-material/into-and-out/page"})
@ApiOperation("供应商货品记录")
public TableDataInfo pageSupplierMaterialIntoAndOut( DrpSupplierMaterialIntoAndOutPageDTO content) {
@ -42,4 +48,39 @@ public class SupplierComeGoController extends BaseController {
return getDataTable(list);
}
@GetMapping({"/supplier/come-and-go/page-detail"})
@ApiOperation("供应商往来订单明细")
public List<DrpOrderGoodsDetailVO> 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();
}
}

189
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/domain/DrpOrderGoodsDetail.java Normal file
View File

@ -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() + ")";
}
}

91
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoApplyPayDTO.java Normal file
View File

@ -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() + ")";
}
}

121
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoCommitPayDTO.java Normal file
View File

@ -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() + ")";
}
}

131
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoCommitRefundApplyDTO.java Normal file
View File

@ -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() + ")";
}
}

132
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpComeAndGoCommitRefundDTO.java Normal file
View File

@ -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() + ")";
}
}

70
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpOrderGoodsManagePageDTO.java Normal file
View File

@ -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() + ")";
}
}

25
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/mapper/DrpOrderGoodsDetailMapperV2.java Normal file
View File

@ -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<DrpOrderGoodsDetail> {
List<DrpOrderGoodsDetailVO> getDrpOrderGoodsDetailVOListByOrderGoodsId(@Param("orderGoodsId") String orderGoodsId);
List<OrderIntoNumModel> listOrderIntoNum(@Param("orderGoodsIdList") List<String> orderGoodsIdList);
void plusIntoNum(@Param("orderGoodsDetailId") Long orderGoodsDetailId, @Param("plusNum") BigDecimal plusNum);
void minusIntoNum(@Param("orderGoodsDetailId") Long orderGoodsDetailId, @Param("minusNum") BigDecimal minusNum);
List<DrpOrderGoodsMaterialStallNumModel> listMaterialStallNum(@Param("orderGoodsId") String orderGoodsId);
}

25
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/mapper/DrpOrderGoodsPayMapper.java Normal file
View File

@ -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<DrpOrderGoodsPay> {
List<DrpOrderGoodsPayListVO> listPayRecords(@Param("content") DrpPayAndRefundRecordsListDTO content);
List<DrpOrderGoodsManagePageVO> 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);
}

25
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/mapper/DrpOrderGoodsRefundMapper.java Normal file
View File

@ -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<DrpOrderGoodsRefund> {
List<DrpOrderGoodsRefundListVO> listRefundRecords(@Param("content") DrpPayAndRefundRecordsListDTO content);
List<DrpOrderGoodsManagePageVO> 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);
}

45
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/po/DrpOrderGoodsMaterialStallNumModel.java Normal file
View File

@ -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()) + ")";
}
}

235
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/po/DrpOrderGoodsPay.java Normal file
View File

@ -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()) + ")";
}
}

236
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/po/DrpOrderGoodsRefund.java Normal file
View File

@ -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()) + ")";
}
}

13
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/DrpOrderGoodsDetailServiceV2.java Normal file
View File

@ -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<DrpOrderGoodsDetail> {
void deleteByOrderGoodsId(String orderGoodsId);
List<DrpOrderGoodsDetailVO> getDrpOrderGoodsDetailVOListByOrderGoodsId(String orderGoodsId);
}

11
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/DrpSupplierComeGoService.java
View File

@ -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<DrpSupplierComeAndGoPageVO> pageSupplierComeAndGo(DrpSupplierComeAndGoPageDTO content);
void applyPay(DrpComeAndGoApplyPayDTO content);
void commitPay(DrpComeAndGoCommitPayDTO content);
void applyRefund(DrpComeAndGoCommitRefundApplyDTO content);
void commitRefund(DrpComeAndGoCommitRefundDTO content);
}

23
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/impl/DrpOrderGoodsDetailServiceImplV2.java Normal file
View File

@ -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<DrpOrderGoodsDetailMapperV2, DrpOrderGoodsDetail> implements DrpOrderGoodsDetailServiceV2 {
public void deleteByOrderGoodsId(String orderGoodsId) {
this.baseMapper.delete(Wrappers.lambdaQuery(DrpOrderGoodsDetail.class).eq(DrpOrderGoodsDetail::getOrderGoodsId, orderGoodsId));
}
public List<DrpOrderGoodsDetailVO> getDrpOrderGoodsDetailVOListByOrderGoodsId(String orderGoodsId) {
return this.baseMapper.getDrpOrderGoodsDetailVOListByOrderGoodsId(orderGoodsId);
}
}

57
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/impl/DrpSupplierComeGoServiceImpl.java
View File

@ -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<DrpSupplierMaterialIntoAndOutPageVO> pageSupplierMaterialIntoAndOut(DrpSupplierMaterialIntoAndOutPageDTO content) {
// List<Long> 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);
}
}

136
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManageDetailVO.java Normal file
View File

@ -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()) + ")";
}
}

44
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManagePageVO.java Normal file
View File

@ -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() + ")";
}
}

23
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManagePayVO.java Normal file
View File

@ -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() + ")";
}
}

22
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManageRefundVO.java Normal file
View File

@ -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() + ")";
}
}

38
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsManageTotalVO.java Normal file
View File

@ -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() + ")";
}
}

213
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsPayListVO.java Normal file
View File

@ -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()) + ")";
}
}

214
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/DrpOrderGoodsRefundListVO.java Normal file
View File

@ -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()) + ")";
}
}

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/utils/excel/MenuRecipeImportListener.java
View File

@ -163,7 +163,7 @@ public class MenuRecipeImportListener extends AnalysisEventListener<Map<Integer,
}
}catch (Exception e){
throw new RuntimeException(e);
throw new ServiceException(e.getMessage());
}
}

3
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
View File

@ -471,7 +471,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="seasonId != null">season_id,</if>
<if test="suitId != null">suit_id,</if>
<if test="mealId != null">meal_id,</if>
<if test="remark != null">remark,</if>
</trim>
@ -503,6 +503,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="seasonId != null">#{seasonId},</if>
<if test="suitId != null">#{suitId},</if>
<if test="mealId != null">#{mealId},</if>
<if test="remark != null">#{remark}</if>
</trim>
</insert>

8
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesTypeMapper.xml
View File

@ -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

56
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOrderGoodsDetailMapperV2.xml Normal file
View File

@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.canteen.core.supply.mapper.DrpOrderGoodsDetailMapperV2">
<update id="plusIntoNum">
UPDATE drp_order_goods_detail set into_num = IFNULL(into_num,0) + #{plusNum} where order_goods_detail_id = #{orderGoodsDetailId}
</update>
<update id="minusIntoNum">
UPDATE drp_order_goods_detail set into_num = into_num - #{minusNum} where order_goods_detail_id = #{orderGoodsDetailId}
</update>
<select id="getDrpOrderGoodsDetailVOListByOrderGoodsId" resultType="com.bonus.canteen.core.supply.vo.DrpOrderGoodsDetailVO">
SELECT t1.order_goods_detail_id,
t1.order_goods_id,
t1.material_id,
t2.material_name,
t2.category_id,
t2.material_code,
t3.category_name,
t2.unit_id,
t4.unit_name,
t1.size,
t1.order_num,
t1.single_price,
t1.total_price,
t2.image_url,
t5.supplier_id,
t6.supplier_name,
t1.into_num,
t1.remark,
t1.stall_id,
ast.stall_name
FROM drp_order_goods_detail t1
LEFT JOIN menu_material t2 ON t1.material_id = t2.material_id
LEFT JOIN menu_material_category t3 ON t3.category_id = t2.category_id
LEFT JOIN drp_unit t4 ON t2.unit_id = t4.unit_id
left join drp_order_goods t5 on t5.order_goods_id = t1.order_goods_id
left join drp_supplier t6 on t6.supplier_id = t5.supplier_id
left join alloc_stall ast on t1.stall_id = ast.stall_id
WHERE t1.order_goods_id = #{orderGoodsId}
</select>
<select id="listOrderIntoNum" resultType="com.bonus.canteen.core.supply.po.OrderIntoNumModel">
SELECT
order_goods_id,
IF(sum( into_num ) is NULL,0,sum( into_num )) totalIntoNum
FROM
drp_order_goods_detail
where order_goods_id in
<foreach collection="orderGoodsIdList" item="orderGoodsId" separator="," open="(" close=")">
#{orderGoodsId}
</foreach>
GROUP BY order_goods_id
</select>
<select id="listMaterialStallNum"
resultType="com.bonus.canteen.core.supply.po.DrpOrderGoodsMaterialStallNumModel">
select material_id,stall_id,order_num-into_num notIntoNum from drp_order_goods_detail where order_goods_id = #{orderGoodsId}
</select>
</mapper>

81
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOrderGoodsPayMapper.xml Normal file
View File

@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.canteen.core.supply.mapper.DrpOrderGoodsPayMapper">
<select id="listPayRecords" resultType="com.bonus.canteen.core.supply.vo.DrpOrderGoodsPayListVO">
SELECT
*
FROM
drp_order_goods_pay
WHERE
order_goods_id = #{content.orderGoodsId}
<if test="content.type != null">
AND type = #{content.type}
</if>
</select>
<select id="getOrderGoodsPayList"
resultType="com.bonus.canteen.core.supply.vo.DrpOrderGoodsManagePayVO">
SELECT
p.pay_id,
p.pay_amount AS amount,
p.pay_time AS time,
s.supplier_name
FROM drp_order_goods_pay p
INNER JOIN drp_order_goods o ON p.order_goods_id = o.order_goods_id
INNER JOIN drp_supplier s ON s.supplier_id = o.supplier_id
WHERE
p.type = #{type}
<if test="content.startTime != null and content.endTime != null">
AND (p.pay_time between #{content.startTime} and #{content.endTime})
</if>
<if test="content.supplierId != null">
and s.supplier_id = #{content.supplierId}
</if>
<if test="content.orderGoodsId != null and content.orderGoodsId != ''">
and p.order_goods_id like #{content.orderGoodsId}
</if>
order by p.crtime desc
</select>
<select id="getOrderGoodsPayDetail"
resultType="com.bonus.canteen.core.supply.vo.DrpOrderGoodsManageDetailVO">
SELECT
p.pay_time,
p.pay_amount AS amount,
p.pay_bank,
p.pay_account,
p.pay_account_name,
p.collect_bank,
p.collect_account,
p.collect_account_name,
p.order_goods_id,
o.crtime AS order_time,
p.crby,
p.crtime
FROM drp_order_goods_pay p
INNER JOIN drp_order_goods o ON p.order_goods_id = o.order_goods_id
WHERE p.pay_id = #{id};
</select>
<select id="getOrderGoodsPayTotal"
resultType="com.bonus.canteen.core.supply.vo.DrpOrderGoodsManageTotalVO">
SELECT
count(*) AS total,
COALESCE(SUM(pay_amount), '0.00') AS amount
FROM drp_order_goods_pay p
INNER JOIN drp_order_goods o ON p.order_goods_id = o.order_goods_id
INNER JOIN drp_supplier s ON s.supplier_id = o.supplier_id
<where>
p.type = #{type}
<if test="content.startTime != null and content.endTime != null">
AND (pay_time between #{content.startTime} and #{content.endTime})
</if>
<if test="content.supplierId != null">
AND o.supplier_id = #{content.supplierId}
</if>
<if test="content.orderGoodsId != null and content.orderGoodsId != ''">
AND p.order_goods_id like #{content.orderGoodsId}
</if>
</where>
</select>
</mapper>

79
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOrderGoodsRefundMapper.xml Normal file
View File

@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.canteen.core.supply.mapper.DrpOrderGoodsRefundMapper">
<select id="listRefundRecords" resultType="com.bonus.canteen.core.supply.vo.DrpOrderGoodsRefundListVO">
SELECT
*
FROM
drp_order_goods_refund
WHERE
order_goods_id = #{content.orderGoodsId}
<if test="content.type != null">
AND type = #{content.type}
</if>
</select>
<select id="getOrderGoodsRefundList"
resultType="com.bonus.canteen.core.supply.vo.DrpOrderGoodsManageRefundVO">
SELECT
r.refund_money_id,
r.refund_amount AS amount,
r.refund_time AS time,
s.supplier_name
FROM drp_order_goods_refund r
INNER JOIN drp_order_goods o ON r.order_goods_id = o.order_goods_id
INNER JOIN drp_supplier s ON s.supplier_id = o.supplier_id
<where>
r.type = #{type}
<if test="content.startTime != null and content.endTime != null">
and (r.refund_time between #{content.startTime} and #{content.endTime})
</if>
<if test="content.supplierId != null">
and s.supplier_id = #{content.supplierId}
</if>
<if test="content.orderGoodsId != null and content.orderGoodsId != ''">
and r.order_goods_id like #{content.orderGoodsId}
</if>
</where>
order by r.crtime desc
</select>
<select id="getOrderGoodsRefundDetail"
resultType="com.bonus.canteen.core.supply.vo.DrpOrderGoodsManageDetailVO">
SELECT
r.refund_time payTime,
r.refund_amount AS amount,
r.pay_bank,
r.pay_account,
r.pay_account_name,
r.collect_bank,
r.collect_account,
r.collect_account_name,
r.order_goods_id,
o.crtime AS order_time,
r.crby,
r.crtime
FROM drp_order_goods_refund r
INNER JOIN drp_order_goods o ON r.order_goods_id = o.order_goods_id
WHERE r.refund_money_id = #{id};
</select>
<select id="getOrderGoodsRefundTotal"
resultType="com.bonus.canteen.core.supply.vo.DrpOrderGoodsManageTotalVO">
SELECT
count(*) AS total,
COALESCE(SUM(r.refund_amount), '0.00') AS amount
FROM drp_order_goods_refund r
INNER JOIN drp_order_goods o ON r.order_goods_id = o.order_goods_id
INNER JOIN drp_supplier s ON s.supplier_id = o.supplier_id
<where>
r.type = #{type}
<if test="content.startTime != null and content.endTime != null">
AND (r.refund_time between #{content.startTime} and #{content.endTime})
</if>
<if test="content.supplierId != null">
AND o.supplier_id = #{content.supplierId}
</if>
<if test="content.orderGoodsId != null and content.orderGoodsId != ''">
AND r.order_goods_id like #{content.orderGoodsId}
</if>
</where>
</select>
</mapper>