winter 1 год назад
Родитель
Сommit
14c429ce25
3 измененных файлов: 21 добавлений и 1 удалений
  1. +18
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java
  3. +2
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java

+ 18
- 0
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.WxFinanceReceive;
import com.iformall.domain.po.WxFinanceReceiveBill; import com.iformall.domain.po.WxFinanceReceiveBill;
import com.iformall.domain.po.WxFinanceReceiveSetoff; import com.iformall.domain.po.WxFinanceReceiveSetoff;
import com.iformall.domain.po.WxFlowModel;
import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.vo.FinanceBillSetoffSum; import com.iformall.domain.vo.FinanceBillSetoffSum;
import com.iformall.domain.vo.WxFinanceReceiveSumVo; import com.iformall.domain.vo.WxFinanceReceiveSumVo;
import com.iformall.domain.vo.WxFinanceReceiveVo; import com.iformall.domain.vo.WxFinanceReceiveVo;
import com.iformall.enums.EnumBillAllType; import com.iformall.enums.EnumBillAllType;
import com.iformall.enums.EnumContractOperationType;
import com.iformall.enums.EnumFinanceCashierType; import com.iformall.enums.EnumFinanceCashierType;
import com.iformall.enums.EnumFinanceFinishStatus; import com.iformall.enums.EnumFinanceFinishStatus;
import com.iformall.enums.EnumFinanceReceiveStatus; import com.iformall.enums.EnumFinanceReceiveStatus;
import com.iformall.enums.EnumFlowKey;
import com.iformall.enums.EnumRentShopType;
import com.iformall.enums.EnumYesOrNo; import com.iformall.enums.EnumYesOrNo;
import com.iformall.service.SysConfigService; import com.iformall.service.SysConfigService;
import com.iformall.service.WxEnergyService; import com.iformall.service.WxEnergyService;
import com.iformall.service.WxFinanceService; import com.iformall.service.WxFinanceService;
import com.iformall.service.WxFlowService;
import com.iformall.utils.StringContentUtils; import com.iformall.utils.StringContentUtils;


import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -66,6 +71,8 @@ public class WxFinanceController extends BaseController {
WxEnergyService wxEnergyService; WxEnergyService wxEnergyService;
@Autowired @Autowired
private SysConfigService sysConfigService; private SysConfigService sysConfigService;
@Autowired
WxFlowService wxFlowService;
/** /**
* 账单合同类型(可自定义的) * 账单合同类型(可自定义的)
@@ -433,6 +440,7 @@ public class WxFinanceController extends BaseController {
@ApiOperation("红冲") @ApiOperation("红冲")
@PostMapping("receiveRedSet") @PostMapping("receiveRedSet")
public ResultData receiveRedSet(@RequestBody WxFinanceReceive record) { public ResultData receiveRedSet(@RequestBody WxFinanceReceive record) {
WxFinanceReceive receive = wxFinanceService.getReceiveById(this.getTenantInfo(), record.getId()); WxFinanceReceive receive = wxFinanceService.getReceiveById(this.getTenantInfo(), record.getId());
if (receive.getIsFinish().intValue() == EnumYesOrNo.NO.getCode().intValue()) { if (receive.getIsFinish().intValue() == EnumYesOrNo.NO.getCode().intValue()) {
return new ResultData(Result.ERROR,"该状态不允许操作"); return new ResultData(Result.ERROR,"该状态不允许操作");
@@ -440,6 +448,16 @@ public class WxFinanceController extends BaseController {
if (StringUtils.isNotBlank(record.getRemark())) { if (StringUtils.isNotBlank(record.getRemark())) {
receive.setRemark(record.getRemark()); receive.setRemark(record.getRemark());
} }
WxFlowModel wxFlowModel = new WxFlowModel();
wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_CONTRACT.getCode());
wxFlowModel.updateTenantInfo(receive);
List<WxFlowModel> flows = wxFlowService.getModelBybusiness(wxFlowModel);
if (null != flows && flows.size() > 0) {
//return true;
}
wxFinanceService.redSetoffReceive(receive, getUser()); wxFinanceService.redSetoffReceive(receive, getUser());
return new ResultData(); return new ResultData();
} }


+ 1
- 0
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") @Excel(name = "付款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "6")
@io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime")
public Date receiveDate; public Date receiveDate;
@TableField(exist = false)
private String receiveDateStr; private String receiveDateStr;
public String getReceiveDateStr() { public String getReceiveDateStr() {
if (null != receiveDate) { if (null != receiveDate) {


+ 2
- 1
mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java Просмотреть файл

@@ -10,7 +10,8 @@ public enum EnumFinanceReceiveStatus {


NORMAL(1,"正常"), NORMAL(1,"正常"),
INVALID(2,"作废"), INVALID(2,"作废"),
RED_SETOFF(3, "红冲")
RED_SETOFF(3, "红冲"),
AUDITING(4,"红冲审核中")
; ;


public static EnumFinanceReceiveStatus getEnum(Integer code) { public static EnumFinanceReceiveStatus getEnum(Integer code) {


Загрузка…
Отмена
Сохранить