|
|
|
@@ -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<WxFlowModel> flows = wxFlowService.getModelBybusiness(wxFlowModel); |
|
|
|
if (null != flows && flows.size() > 0) { |
|
|
|
//return true; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
wxFinanceService.redSetoffReceive(receive, getUser()); |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|