Explorar el Código

fix

release_toaliyun_real
winter hace 1 año
padre
commit
26946902ed
Se han modificado 2 ficheros con 18 adiciones y 1 borrados
  1. +15
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +3
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java

+ 15
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java Ver fichero

@@ -104,6 +104,21 @@ public class WxFinanceController extends BaseController {
return new ResultData(list); return new ResultData(list);
} }
@GetMapping("receiveCashierTypes")
public ResultData receiveCashierTypes() {
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("feesList") @GetMapping("feesList")
@ApiImplicitParams({ @ApiImplicitParams({


+ 3
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java Ver fichero

@@ -283,7 +283,9 @@ public class WxAllBillController extends BillBaseController {
public ResultData billTypes() { public ResultData billTypes() {
Map<Integer,String> tmap = new HashMap<Integer,String>(); Map<Integer,String> tmap = new HashMap<Integer,String>();
for (EnumBillAllType t : EnumBillAllType.values()) { 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); return new ResultData(tmap);
} }


Cargando…
Cancelar
Guardar