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 45d6417d4..bcb7eb698 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -104,6 +104,21 @@ public class WxFinanceController extends BaseController { return new ResultData(list); } + @GetMapping("receiveCashierTypes") + public ResultData receiveCashierTypes() { + List list = new ArrayList(); + 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("费用科目列表") @GetMapping("feesList") @ApiImplicitParams({ diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index 090ce85df..360324e05 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -283,7 +283,9 @@ public class WxAllBillController extends BillBaseController { public ResultData billTypes() { Map tmap = new HashMap(); for (EnumBillAllType t : EnumBillAllType.values()) { - tmap.put(t.getCode(), t.getMessage()); + if (t != EnumBillAllType.ADVANCE) { + tmap.put(t.getCode(), t.getMessage()); + } } return new ResultData(tmap); }