From f0ab6bc914c9810baebdfa561c96dccc7342b412 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 24 Aug 2020 13:48:57 +0800 Subject: [PATCH] fix --- .../com/iformall/controller/basic/WxMerchantController.java | 1 + .../controller/contract/WxRentContractController.java | 2 ++ .../db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql | 6 ++++-- .../iformall/service/impl/WxRentContractServiceImpl.java | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 75bfb233c..acfc27e16 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -108,6 +108,7 @@ public class WxMerchantController extends BaseController { wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); wxMerchant.setType(type); + wxMerchant.setCarVendorType(0); return new ResultData(wxMerchantService.queryIdAndNames(wxMerchant)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 1fa173259..59890d707 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -10,6 +10,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseEntity.SortField; import com.iformall.enums.EnumContractOperationType; import com.iformall.enums.EnumContractType; import com.iformall.enums.EnumFlowContractType; @@ -84,6 +85,7 @@ public class WxRentContractController extends WxContractBaseController { wxRentContract = new WxRentContract(); } wxRentContract.updateTenantInfo(getTenantInfo()); + wxRentContract.setSortColumns(SortField.Createtime_DESC); //Map result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); } diff --git a/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql b/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql index 44e751182..6cb6ed509 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql @@ -60,12 +60,14 @@ insert into wx_property_contract_20200826 select * from wx_property_contract; ALTER TABLE wx_property_contract DROP COLUMN shop_id; ALTER TABLE `wx_rent_contract` ADD COLUMN `shop_name` VARCHAR(100) COMMENT '店铺名称'; -//刷shop_name字段 + +//待刷语句 +//刷shop_name字段,合同状态为4(即将到期)更新为计租中,合同状态为8(补录),9(续签)更新为草稿。租金合同rentinfo ALTER TABLE `wx_rent_contract` ADD COLUMN `from_id` BIGINT(20) DEFAULT NULL COMMENT '来源ID,针对续签,从哪个合同续签'; -合同状态为4(即将到期)更新为计租中,合同状态为8(补录),9(续签)更新为草稿。 + ALTER TABLE `wx_c_user_car` ADD COLUMN `vendor_person_id` VARCHAR(100) DEFAULT NULL COMMENT '停车场的会员ID'; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 13536c206..71eda3e25 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -729,6 +729,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { record.setRentalStartDate(oldRentStartDate); record.setShopName(shopName); record.setStatus(wxRentContract.getStatus()); + record.setApplyStatus(wxRentContract.getApplyStatus()); wxRentContractMapper.updateById(record); record.setRentalStartDate(tempDate); } catch (Exception e) {