diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contractv2/WxRentContractv2Controller.java b/mallinkAdmin/src/main/java/com/iformall/controller/contractv2/WxRentContractv2Controller.java new file mode 100644 index 000000000..ec491e566 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contractv2/WxRentContractv2Controller.java @@ -0,0 +1,59 @@ +package com.iformall.controller.contractv2; + +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.WxMerchant; +import com.iformall.domain.po.WxRentContract; +import com.iformall.enums.EnumContractType; +import com.iformall.service.WxMerchantService; +import com.iformall.service.WxRentPropertyContractService; +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.*; + +/** + * @author: furunxin + * @Date: 2020/8/5 10:13 + * @Description: + */ + +@Slf4j +@RestController +@RequestMapping("wxRentContract_V2") +@Api(description = "租赁合同V2版本") +public class WxRentContractv2Controller extends BaseController { + + @Autowired + private WxMerchantService wxMerchantService; + + + @Autowired + private WxRentPropertyContractService wxRentPropertyContractService; + + @GetMapping("getMerchantList") + @SystemControllerLog(description = "获取商户列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "shopType", value = "店铺类型 1:店铺 2:多经点位", dataType = "Integer", paramType = "query", required = true)}) + public ResultData getMerchantList(Integer shopType) throws Exception{ + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.updateTenantInfo(getTenantInfo()); + wxMerchant.setRentShopType(shopType); + return new ResultData(Result.SUCCESS, "查询成功", wxMerchantService.getMerchantList(wxMerchant)); + } + + + @PostMapping("add") + @SystemControllerLog(description = "租赁合同-添加") + public ResultData add(@RequestBody WxRentContract wxRentContract) { + log.debug("[" + getIpAddr() + "] WxRentContractv2Controller::add"); + //查询合同类型 + Integer contractType = wxRentPropertyContractService.getContractType(wxRentContract.getRentShopType(), wxRentContract.getOperationType(), EnumContractType.RENT.getCode()); + wxRentContract.setContractType(contractType); + return null; + } +} diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 69ced7cb0..ac3c2bb36 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -75,7 +75,9 @@ public class WxCarController extends BaseController { private WxPark getCurrentPark(TenantEntity tenantEntity) { WxPark parkQ = new WxPark(); - parkQ.updateTenantInfo(tenantEntity); + //parkQ.updateTenantInfo(tenantEntity); + parkQ.setTenantId("789"); + parkQ.setParentTenantId("788"); WxPark wxPark = wxParkService.getByObj(parkQ); // 1, get mall's park // future use redis to optimize diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 9abd85f68..b93f079e1 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -36,4 +36,6 @@ public interface WxMerchantMapper extends CommonMapper { WxMerchant findByTrade(HashMap params); List findListVo2(WxMerchant record); + + List getMerchantList(WxMerchant wxMerchant); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index e412c227f..a26410c9b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -147,4 +147,6 @@ public interface WxMerchantService { PageInfo listVoAsPage2(WxMerchant wxMerchant, Integer pageNum, Integer pageSize); + List getMerchantList(WxMerchant wxMerchant); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 75c55b3df..f39136a4c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -721,8 +721,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); List merchantList = wxMerchantMapper.selectList(new QueryWrapper(wxMerchant)); - if (merchantList.size() == 1) + if (merchantList.size() == 1){ return Optional.of(merchantList.get(0)); + } return Optional.empty(); } @@ -803,4 +804,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { PageInfo pageInfo = new PageInfo<>(merchants); return pageInfo; } + + @Override + public List getMerchantList(WxMerchant wxMerchant) { + return wxMerchantMapper.getMerchantList(wxMerchant); + } }