|
|
|
@@ -11,6 +11,7 @@ import com.iformall.domain.po.WxFinanceAdvance; |
|
|
|
import com.iformall.domain.po.WxFinanceAdvanceType; |
|
|
|
import com.iformall.domain.po.WxFinanceReceive; |
|
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
|
import com.iformall.domain.po.base.WxBillBaseEntity; |
|
|
|
import com.iformall.enums.EnumBillAllType; |
|
|
|
import com.iformall.enums.EnumYesOrNo; |
|
|
|
import com.iformall.service.WxEnergyService; |
|
|
|
@@ -20,6 +21,7 @@ import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
@@ -219,8 +221,13 @@ public class WxFinanceController extends BaseController { |
|
|
|
@PostMapping("setoff") |
|
|
|
public ResultData setoff(@RequestBody FinanceSetOffDTO dto) { |
|
|
|
dto.updateTenantInfo(getTenantInfo()); |
|
|
|
wxFinanceService.setOff(dto,this.getUser()); |
|
|
|
return new ResultData(); |
|
|
|
WxBillBaseEntity bill = wxFinanceService.setOff(dto,this.getUser()); |
|
|
|
if (null == bill) { |
|
|
|
return new ResultData(Result.ERROR,"未冲抵"); |
|
|
|
} |
|
|
|
List<WxBillBaseEntity> list = new ArrayList<WxBillBaseEntity>(); |
|
|
|
list.add(bill); |
|
|
|
return new ResultData(wxFinanceService.getBills(dto, list)); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("新增收款单") |
|
|
|
@@ -230,7 +237,8 @@ public class WxFinanceController extends BaseController { |
|
|
|
if (null == record.getBills() || null == record.getPayWays()) { |
|
|
|
return new ResultData(Result.ERROR,"请选择账单和支付方式"); |
|
|
|
} |
|
|
|
return new ResultData(wxFinanceService.createReceive(record,this.getUser())); |
|
|
|
List<WxBillBaseEntity> list = wxFinanceService.createReceive(record,this.getUser()); |
|
|
|
return new ResultData(wxFinanceService.getBills(record, list)); |
|
|
|
} |
|
|
|
|
|
|
|
// @ApiOperation("收款记录列表") |
|
|
|
|