diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 7ce577def..15116d8db 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -252,7 +252,6 @@ public class WxPropertyContractController extends WxContractBaseController { wxPropertyContract.updateTenantInfo(user); wxPropertyContract.setAdjustPeriodHandle(); //第一步已经设置过了,无需再设置 - wxPropertyContract.setContractNumber(null); wxPropertyContract.setMerchantName(null); wxPropertyContract.setBrand(null); wxPropertyContract.setShopType(null); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFeesStandardsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFeesStandardsController.java index 0032751d2..eed5071c4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFeesStandardsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFeesStandardsController.java @@ -63,6 +63,7 @@ public class WxFeesStandardsController extends BaseController { record.updateTenantInfo(getTenantInfo()); record.setBillType(EnumBillAllType.PROPERTY.getCode()); record.setIsDel(EnumYesOrNo.NO.getCode()); + record.setIsSystem(EnumYesOrNo.NO.getCode()); PageInfo page = wxEnergyService.feesListAsPage(record, 1, 100,false); if (null != page) { return new ResultData(page.getList()); 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 5c0866c96..4172c48c7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -215,20 +215,26 @@ public class WxFinanceController extends BaseController { @GetMapping("receiveStatus") public ResultData receiveStatus() { - Map tmap = new HashMap(); + List list = new ArrayList(); 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") public ResultData receiveSetoffStatus() { - Map tmap = new HashMap(); + List list = new ArrayList(); 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") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 594e7b4ae..a5d5ca806 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -396,6 +396,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (wxPropertyContract == null) { 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()) { record.calcutePrice(wxPropertyContract.getRentArea());