From 14c429ce25a04ef9c322178f876698e06fb1aefa Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 7 Sep 2024 12:50:51 +0800 Subject: [PATCH] fix --- .../controller/market/WxFinanceController.java | 18 ++++++++++++++++++ .../java/com/iformall/domain/po/WxAllBill.java | 1 + .../enums/EnumFinanceReceiveStatus.java | 3 ++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index 5061feeb0..9244367dc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -16,18 +16,23 @@ import com.iformall.domain.po.WxFinanceFinish; import com.iformall.domain.po.WxFinanceReceive; import com.iformall.domain.po.WxFinanceReceiveBill; import com.iformall.domain.po.WxFinanceReceiveSetoff; +import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.FinanceBillSetoffSum; import com.iformall.domain.vo.WxFinanceReceiveSumVo; import com.iformall.domain.vo.WxFinanceReceiveVo; import com.iformall.enums.EnumBillAllType; +import com.iformall.enums.EnumContractOperationType; import com.iformall.enums.EnumFinanceCashierType; import com.iformall.enums.EnumFinanceFinishStatus; import com.iformall.enums.EnumFinanceReceiveStatus; +import com.iformall.enums.EnumFlowKey; +import com.iformall.enums.EnumRentShopType; import com.iformall.enums.EnumYesOrNo; import com.iformall.service.SysConfigService; import com.iformall.service.WxEnergyService; import com.iformall.service.WxFinanceService; +import com.iformall.service.WxFlowService; import com.iformall.utils.StringContentUtils; import io.swagger.annotations.Api; @@ -66,6 +71,8 @@ public class WxFinanceController extends BaseController { WxEnergyService wxEnergyService; @Autowired private SysConfigService sysConfigService; + @Autowired + WxFlowService wxFlowService; /** * 账单合同类型(可自定义的) @@ -433,6 +440,7 @@ public class WxFinanceController extends BaseController { @ApiOperation("红冲") @PostMapping("receiveRedSet") public ResultData receiveRedSet(@RequestBody WxFinanceReceive record) { + WxFinanceReceive receive = wxFinanceService.getReceiveById(this.getTenantInfo(), record.getId()); if (receive.getIsFinish().intValue() == EnumYesOrNo.NO.getCode().intValue()) { return new ResultData(Result.ERROR,"该状态不允许操作"); @@ -440,6 +448,16 @@ public class WxFinanceController extends BaseController { if (StringUtils.isNotBlank(record.getRemark())) { receive.setRemark(record.getRemark()); } + + WxFlowModel wxFlowModel = new WxFlowModel(); + wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_CONTRACT.getCode()); + wxFlowModel.updateTenantInfo(receive); + List flows = wxFlowService.getModelBybusiness(wxFlowModel); + if (null != flows && flows.size() > 0) { + //return true; + } + + wxFinanceService.redSetoffReceive(receive, getUser()); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java index 67af1136d..05531b1ad 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java @@ -155,6 +155,7 @@ public class WxAllBill extends TenantEntity { @Excel(name = "付款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "6") @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") public Date receiveDate; + @TableField(exist = false) private String receiveDateStr; public String getReceiveDateStr() { if (null != receiveDate) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java index 7cc0d1bee..e0aa92e84 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java @@ -10,7 +10,8 @@ public enum EnumFinanceReceiveStatus { NORMAL(1,"正常"), INVALID(2,"作废"), - RED_SETOFF(3, "红冲") + RED_SETOFF(3, "红冲"), + AUDITING(4,"红冲审核中") ; public static EnumFinanceReceiveStatus getEnum(Integer code) {