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

fix contract

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
e030f51a1c
2 измененных файлов: 31 добавлений и 29 удалений
  1. +17
    -19
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +14
    -10
      mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java

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

@@ -493,7 +493,23 @@ public class WxRentContractController extends WxContractBaseController {
return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize));
}
@GetMapping("getPayAccountInfo")
@SystemControllerLog(description = "租赁合同-获取甲方账户")
public ResultData getPayAccountInfo() {
logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus");
WxPayAccountBill payAccountBill = payAccountBillService.getByTenantInfo(getTenantInfo());
Map<String, String> map = new HashMap<>();
if(StringUtils.isNotBlank(payAccountBill.getBankAccountName()) && StringUtils.isNotBlank(payAccountBill.getBankCardId())) {
map.put("bankAccountName", payAccountBill.getBankAccountName());
map.put("bankCardId", payAccountBill.getBankCardId());
if(payAccountBill.getServiceChargeRate() == null){
map.put("serviceChargeRate", "0");
}else{
map.put("serviceChargeRate", payAccountBill.getServiceChargeRate()+"");
}
}
return new ResultData(map);
}
@@ -626,24 +642,6 @@ public class WxRentContractController extends WxContractBaseController {
return wxRentContractService.updateRentContractStatus(wxRentContract.getId());
}

@GetMapping("getPayAccountInfo")
@SystemControllerLog(description = "租赁合同-获取甲方账户")
public ResultData getPayAccountInfo() {
logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus");
WxPayAccountBill payAccountBill = payAccountBillService.getByTenantInfo(getTenantInfo());
Map<String, String> map = new HashMap<>();
if(StringUtils.isNotBlank(payAccountBill.getBankAccountName()) && StringUtils.isNotBlank(payAccountBill.getBankCardId())) {
map.put("bankAccountName", payAccountBill.getBankAccountName());
map.put("bankCardId", payAccountBill.getBankCardId());
if(payAccountBill.getServiceChargeRate() == null){
map.put("serviceChargeRate", "0");
}else{
map.put("serviceChargeRate", payAccountBill.getServiceChargeRate()+"");
}
}
return new ResultData(map);
}

@PostMapping("savePayAccountInfo")
@SystemControllerLog(description = "租赁合同-保存甲方账户")
public ResultData savePayAccountInfo(@RequestBody WxPayAccountBill payAccountBill) {


+ 14
- 10
mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java Просмотреть файл

@@ -72,19 +72,23 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract
@Override
public ResultData getContractApplyInfo(Long rentId,Long propertyId) {
Map<String, Object> data = new HashMap<>(2);
Map<String, Object> rent = wxRentContractService.getById(rentId);
data.put("rent", rent);
if (null != rentId) {
Map<String, Object> rent = wxRentContractService.getById(rentId);
data.put("rent", rent);
}
// WxPropertyContract wxPropertyContractQuery = new WxPropertyContract();
// wxPropertyContractQuery.setRentContractId(id);
// WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(new QueryWrapper(wxPropertyContractQuery));
WxPropertyContract propertyContract = wxPropertyContractMapper.selectById(propertyId);
if (propertyContract != null) {
try {
Map<String, Object> property = wxPropertyContractService.getById(propertyContract.getId());
data.put("property", property);
} catch (MallinkException e) {
logger.error(e.getMessage());
}
if (null != propertyId) {
WxPropertyContract propertyContract = wxPropertyContractMapper.selectById(propertyId);
if (propertyContract != null) {
try {
Map<String, Object> property = wxPropertyContractService.getById(propertyContract.getId());
data.put("property", property);
} catch (MallinkException e) {
logger.error(e.getMessage());
}
}
}
return new ResultData(data);
}


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