Просмотр исходного кода

合同续签

release_toaliyun_real
furunxin 5 лет назад
Родитель
Сommit
834a8eefff
4 измененных файлов: 10 добавлений и 5 удалений
  1. +4
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractExtensionController.java
  2. +4
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 4
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractExtensionController.java Просмотреть файл

@@ -37,9 +37,12 @@ public class WxPropertyContractExtensionController extends BaseController {

@GetMapping("getMerchantList")
@SystemControllerLog(description = "获取可续签商户列表")
public ResultData getMerchantList() throws Exception{
@ApiImplicitParams({
@ApiImplicitParam(name = "shopType", value = "店铺类型 1:店铺 2:多经点位", dataType = "Integer", paramType = "query", required = true)})
public ResultData getMerchantList(Integer shopType) throws Exception{
WxPropertyContract wxPropertyContract = new WxPropertyContract();
wxPropertyContract.updateTenantInfo(getTenantInfo());
wxPropertyContract.setRentShopType(shopType);
return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getMerchantList(wxPropertyContract));
}
}

+ 4
- 2
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java Просмотреть файл

@@ -49,12 +49,14 @@ public class WxRentContractExtensionController extends BaseController {

@GetMapping("searchMerchant")
@ApiImplicitParams({
@ApiImplicitParam(name = "merchantName", value = "商户名称", dataType = "string", paramType = "query", required = true)})
@ApiImplicitParam(name = "merchantName", value = "商户名称", dataType = "string", paramType = "query", required = true),
@ApiImplicitParam(name = "shopType", value = "店铺类型 1:店铺 2:多经点位", dataType = "Integer", paramType = "query", required = true)})
@SystemControllerLog(description = "商户搜索")
public ResultData searchMerchant(String merchantName) throws Exception{
public ResultData searchMerchant(String merchantName,Integer shopType) throws Exception{
WxRentContract wxRentContract = new WxRentContract();
wxRentContract.updateTenantInfo(getTenantInfo());
wxRentContract.setMerchantName(merchantName);
wxRentContract.setRentShopType(shopType);
List<Map<String,Object>> result = wxRentContractService.searchMerchantByname(wxRentContract);
return new ResultData(result);
}


+ 1
- 1
mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml Просмотреть файл

@@ -398,6 +398,6 @@
and `parent_tenant_id` = #{parentTenantId}
</if>
) pc)
and rent_shop_type = 1
and rent_shop_type = #{shopType}
</select>
</mapper>

+ 1
- 1
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Просмотреть файл

@@ -652,7 +652,7 @@
</select>

<select id="searchMerchantByname" resultType="hashmap" parameterType="com.iformall.domain.po.WxRentContract">
select merchant_id,merchant_name from wx_rent_contract where tenant_id = #{tenantId} and merchant_name like concat('%',#{merchantName},'%') and rent_shop_type = 1 ORDER BY merchant_name
select merchant_id,merchant_name from wx_rent_contract where tenant_id = #{tenantId} and merchant_name like concat('%',#{merchantName},'%') and rent_shop_type = #{shopType} ORDER BY merchant_name
</select>

<select id="getByMerchantId" resultType="com.iformall.domain.po.WxRentContract" parameterType="com.iformall.domain.po.WxRentContract">


Загрузка…
Отмена
Сохранить