diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractExtensionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractExtensionController.java new file mode 100644 index 000000000..b256ac08d --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractExtensionController.java @@ -0,0 +1,45 @@ +package com.iformall.controller.contract; + +import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.WxPropertyContract; +import com.iformall.domain.po.WxRentContract; +import com.iformall.service.WxPropertyContractService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +/** + * @author: furunxin + * @Date: 2020/7/20 18:11 + * @Description: + */ + +@Slf4j +@RestController +@Api(description = "物业合同续签") +@RequestMapping("wxPropertyContractExtension") +public class WxPropertyContractExtensionController extends BaseController { + + @Autowired + private WxPropertyContractService wxPropertyContractService; + + + @GetMapping("getMerchantList") + @SystemControllerLog(description = "获取可续签商户列表") + public ResultData getMerchantList() throws Exception{ + WxPropertyContract wxPropertyContract = new WxPropertyContract(); + wxPropertyContract.updateTenantInfo(getTenantInfo()); + return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getMerchantList(wxPropertyContract)); + } +} diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java index 2387143a8..f9d092e2e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java @@ -13,6 +13,7 @@ import com.iformall.enums.EnumRentStartType; import com.iformall.service.WxRentContractService; import com.iformall.service.WxRentPropertyContractService; import com.iformall.service.WxShopService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import lombok.extern.slf4j.Slf4j; @@ -33,6 +34,7 @@ import java.util.Map; @Slf4j @RestController +@Api(description = "租赁合同续签") @RequestMapping("wxRentContractExtension") public class WxRentContractExtensionController extends BaseController { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java index 277d64649..3ea9cad50 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java @@ -51,4 +51,6 @@ public interface WxPropertyContractMapper extends CommonMapper getMerchantList(WxPropertyContract wxPropertyContract); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 97176f6fe..ad6cf5804 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -76,5 +76,6 @@ public interface WxPropertyContractService { WxPropertyContract getByBill(WxBillProperty billRent); + Object getMerchantList(WxPropertyContract record); } 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 44b659347..7c0adc420 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -1155,6 +1155,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService return wxPropertyContractMapper.getByBill(billRent); } + @Override + public Object getMerchantList(WxPropertyContract record) { + return wxPropertyContractMapper.getMerchantList(record); + } } diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 33feeaaed..23c0d0931 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -272,4 +272,13 @@ select property_contract_id from wx_bill_property id = #{id} ) + +