| @@ -252,7 +252,6 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| wxPropertyContract.updateTenantInfo(user); | wxPropertyContract.updateTenantInfo(user); | ||||
| wxPropertyContract.setAdjustPeriodHandle(); | wxPropertyContract.setAdjustPeriodHandle(); | ||||
| //第一步已经设置过了,无需再设置 | //第一步已经设置过了,无需再设置 | ||||
| wxPropertyContract.setContractNumber(null); | |||||
| wxPropertyContract.setMerchantName(null); | wxPropertyContract.setMerchantName(null); | ||||
| wxPropertyContract.setBrand(null); | wxPropertyContract.setBrand(null); | ||||
| wxPropertyContract.setShopType(null); | wxPropertyContract.setShopType(null); | ||||
| @@ -63,6 +63,7 @@ public class WxFeesStandardsController extends BaseController { | |||||
| record.updateTenantInfo(getTenantInfo()); | record.updateTenantInfo(getTenantInfo()); | ||||
| record.setBillType(EnumBillAllType.PROPERTY.getCode()); | record.setBillType(EnumBillAllType.PROPERTY.getCode()); | ||||
| record.setIsDel(EnumYesOrNo.NO.getCode()); | record.setIsDel(EnumYesOrNo.NO.getCode()); | ||||
| record.setIsSystem(EnumYesOrNo.NO.getCode()); | |||||
| PageInfo<WxEnergyFees> page = wxEnergyService.feesListAsPage(record, 1, 100,false); | PageInfo<WxEnergyFees> page = wxEnergyService.feesListAsPage(record, 1, 100,false); | ||||
| if (null != page) { | if (null != page) { | ||||
| return new ResultData(page.getList()); | return new ResultData(page.getList()); | ||||
| @@ -215,20 +215,26 @@ public class WxFinanceController extends BaseController { | |||||
| @GetMapping("receiveStatus") | @GetMapping("receiveStatus") | ||||
| public ResultData receiveStatus() { | public ResultData receiveStatus() { | ||||
| Map<Integer,EnumFinanceReceiveStatus> tmap = new HashMap<Integer,EnumFinanceReceiveStatus>(); | |||||
| List<Map> list = new ArrayList<Map>(); | |||||
| for (EnumFinanceReceiveStatus t : EnumFinanceReceiveStatus.values()) { | for (EnumFinanceReceiveStatus t : EnumFinanceReceiveStatus.values()) { | ||||
| tmap.put(t.getCode(), t); | |||||
| Map m = new HashMap(); | |||||
| m.put("id", t.getCode()); | |||||
| m.put("name", t.getMessage()); | |||||
| list.add(m); | |||||
| } | } | ||||
| return new ResultData(tmap); | |||||
| return new ResultData(list); | |||||
| } | } | ||||
| @GetMapping("receiveSetoffStatus") | @GetMapping("receiveSetoffStatus") | ||||
| public ResultData receiveSetoffStatus() { | public ResultData receiveSetoffStatus() { | ||||
| Map<Integer,EnumFinanceReceiveStatus> tmap = new HashMap<Integer,EnumFinanceReceiveStatus>(); | |||||
| List<Map> list = new ArrayList<Map>(); | |||||
| for (EnumFinanceReceiveStatus t : EnumFinanceReceiveStatus.getSetoff()) { | for (EnumFinanceReceiveStatus t : EnumFinanceReceiveStatus.getSetoff()) { | ||||
| tmap.put(t.getCode(), t); | |||||
| Map m = new HashMap(); | |||||
| m.put("id", t.getCode()); | |||||
| m.put("name", t.getMessage()); | |||||
| list.add(m); | |||||
| } | } | ||||
| return new ResultData(tmap); | |||||
| return new ResultData(list); | |||||
| } | } | ||||
| @GetMapping("receiveTypes") | @GetMapping("receiveTypes") | ||||
| @@ -396,6 +396,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| if (wxPropertyContract == null) { | if (wxPropertyContract == null) { | ||||
| return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); | return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); | ||||
| } | } | ||||
| if (StringUtils.isNotBlank(wxPropertyContract.getContractNumber())) { | |||||
| record.setContractNumber(null); | |||||
| } | |||||
| if (wxPropertyContract.getCreateType().intValue() == EnumPropertyCreateType.BY_SHOP.getCode().intValue()) { | if (wxPropertyContract.getCreateType().intValue() == EnumPropertyCreateType.BY_SHOP.getCode().intValue()) { | ||||
| record.calcutePrice(wxPropertyContract.getRentArea()); | record.calcutePrice(wxPropertyContract.getRentArea()); | ||||