Browse Source

[BUG][ID1001364][dev version:.906.1329:补录-没有终止上次签约合同,有进行补录-提示需要在第一步]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
100465724f
3 changed files with 37 additions and 0 deletions
  1. +8
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  3. +27
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 8
- 0
mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java View File

@@ -207,4 +207,12 @@ public class WxRentContractController extends BaseController {
return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getMerchants(wxRentContract));
}

@GetMapping("/hasRentStatus")
@SystemControllerLog(description = "查询店铺租赁状态")
public ResultData hasRentStatus(@ModelAttribute WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::hasRentStatus");
wxRentContract.setTenantId(getTenantId());
return wxRentContractService.hasRentStatus(wxRentContract);
}

}

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxRentContractService.java View File

@@ -78,4 +78,6 @@ public interface WxRentContractService {
Object getMerchants(WxRentContract wxRentContract);

void updateInvalidContract(Long rentContractId);

ResultData hasRentStatus(WxRentContract wxRentContract);
}

+ 27
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -633,6 +633,33 @@ public class WxRentContractServiceImpl implements WxRentContractService {
updateInvalidStatus(wxRentContract);
}

@Override
public ResultData hasRentStatus(WxRentContract record) {
String rentInfo = record.getRentInfo();
JSONArray rentInfoArray = JSONArray.parseArray(rentInfo);
int size = rentInfoArray.size();
if (size == 0) {
return new ResultData(ErrorCode.SHOP_NOT_SELECTED);
}
//查询rent_info 包括 shopId
for (int i = 0; i < size; i++) {
JSONObject rentInfoObject = rentInfoArray.getJSONObject(i);
WxRentContract wxRentContractQuery = new WxRentContract();
wxRentContractQuery.setTenantId(record.getTenantId());
Long shopId = rentInfoObject.getLong("shopId");
String shopNumber = rentInfoObject.getString("shopNumber");
if (shopId == null) {
return new ResultData(ErrorCode.SHOP_IS_NOT_FOUND.getCode(), "店铺 " + shopNumber + " 已删除");
}
wxRentContractQuery.setShopId(shopId);
int count = wxRentContractMapper.selectRentContractCountByShopId(wxRentContractQuery);
if (count > 0) {
return new ResultData(ErrorCode.SHOP_IS_RENT.getCode(), "店铺 " + shopNumber + " 已出租");
}
}
return new ResultData(Result.SUCCESS, "操作成功");
}

public void updateInvalidStatus(WxRentContract wxRentContract) {
WxRentContract record = new WxRentContract();
record.setTenantId(wxRentContract.getTenantId());


Loading…
Cancel
Save