|
|
@@ -19,6 +19,7 @@ import com.iformall.domain.po.base.BaseEntity; |
|
|
import com.iformall.domain.vo.FinanceBillSetoffSum; |
|
|
import com.iformall.domain.vo.FinanceBillSetoffSum; |
|
|
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.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.EnumFinanceReceiveType; |
|
|
import com.iformall.enums.EnumFinanceReceiveType; |
|
|
@@ -258,6 +259,18 @@ public class WxFinanceController extends BaseController { |
|
|
return new ResultData(list); |
|
|
return new ResultData(list); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("cashierTypes") |
|
|
|
|
|
public ResultData cashierTypes() { |
|
|
|
|
|
List<Map> list = new ArrayList<Map>(); |
|
|
|
|
|
for (EnumFinanceCashierType t : EnumFinanceCashierType.values()) { |
|
|
|
|
|
Map m = new HashMap(); |
|
|
|
|
|
m.put("id", t.getCode()); |
|
|
|
|
|
m.put("name", t.getMessage()); |
|
|
|
|
|
list.add(m); |
|
|
|
|
|
} |
|
|
|
|
|
return new ResultData(list); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ApiOperation("收款记录列表") |
|
|
@ApiOperation("收款记录列表") |
|
|
@GetMapping("receiveList") |
|
|
@GetMapping("receiveList") |
|
|
@ApiImplicitParams({ |
|
|
@ApiImplicitParams({ |
|
|
@@ -331,6 +344,18 @@ public class WxFinanceController extends BaseController { |
|
|
return new ResultData(list); |
|
|
return new ResultData(list); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("finishReceiveStatus") |
|
|
|
|
|
public ResultData finishReceiveStatus() { |
|
|
|
|
|
List<Map> list = new ArrayList<Map>(); |
|
|
|
|
|
for (EnumFinanceReceiveStatus t : EnumFinanceReceiveStatus.getFinishStatus()) { |
|
|
|
|
|
Map m = new HashMap(); |
|
|
|
|
|
m.put("id", t.getCode()); |
|
|
|
|
|
m.put("name", t.getMessage()); |
|
|
|
|
|
list.add(m); |
|
|
|
|
|
} |
|
|
|
|
|
return new ResultData(list); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ApiOperation("过账列表") |
|
|
@ApiOperation("过账列表") |
|
|
@GetMapping("finishList") |
|
|
@GetMapping("finishList") |
|
|
@ApiImplicitParams({ |
|
|
@ApiImplicitParams({ |
|
|
|