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

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
xiaohu 1 год назад
Родитель
Сommit
7448f1a2ee
4 измененных файлов: 15 добавлений и 11 удалений
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  3. +10
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  4. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java

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

@@ -249,14 +249,14 @@ public class WxRentContractController extends WxContractBaseController {
@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
public ResultData findById(Long id) {
public ResultData findById(Long id,Integer noBillList) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::findById");
// 同步欠缴状态
// WxAllBill wxBillRent = new WxAllBill();
// wxBillRent.updateTenantInfo(getTenantInfo());
// wxBillRentService.updateBillStatus(wxBillRent);
try {
Map<String, Object> data = wxRentContractService.getById(id);
Map<String, Object> data = wxRentContractService.getById(id,noBillList);
return new ResultData(data);
} catch (MallinkException e) {
logger.error(e.getMessage());


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxRentContractService.java Просмотреть файл

@@ -44,7 +44,7 @@ public interface WxRentContractService {
* @param id
* @return
*/
Map<String, Object> getById(Long id);
Map<String, Object> getById(Long id,Integer noBillList);
WxRentContract selectById(Long id);

/**


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

@@ -244,7 +244,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}
@Override
public Map<String, Object> getById(Long id) {
public Map<String, Object> getById(Long id,Integer noBillList) {
Map<String, Object> result = new HashMap<>();
WxRentContract wxRentContract = wxRentContractMapper.selectById(id);
if (wxRentContract == null) {
@@ -359,12 +359,15 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}
//查询预账单用于展示
WxAllBill wxBillRent = new WxAllBill();
wxBillRent.setRentContractId(id);
wxBillRent.updateTenantInfo(wxRentContract);
wxBillRent.setBillType(EnumBillAllType.RENT.getCode());
List<WxAllBill> resultList = wxAllBillMapper.findContractSamePeriodSum(wxBillRent);
result.put("previewBillRentList",resultList);
if (null != noBillList && EnumYesOrNo.YES.getCode().intValue() == noBillList.intValue()) {
}else {
WxAllBill wxBillRent = new WxAllBill();
wxBillRent.setRentContractId(id);
wxBillRent.updateTenantInfo(wxRentContract);
wxBillRent.setBillType(EnumBillAllType.RENT.getCode());
List<WxAllBill> resultList = wxAllBillMapper.findContractSamePeriodSum(wxBillRent);
result.put("previewBillRentList",resultList);
}
return result;
}


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

@@ -14,6 +14,7 @@ import com.iformall.enums.EnumContract;
import com.iformall.enums.EnumContractOperationType;
import com.iformall.enums.EnumContractType;
import com.iformall.enums.EnumRentShopType;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.mapper.WxContractCustomersMapper;
import com.iformall.mapper.WxPropertyContractMapper;
import com.iformall.mapper.WxRentContractMapper;
@@ -162,7 +163,7 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract
public ResultData getContractInfo(Long rentId,Long propertyId) {
Map<String, Object> data = new HashMap<>(2);
if (null != rentId) {
Map<String, Object> rent = wxRentContractService.getById(rentId);
Map<String, Object> rent = wxRentContractService.getById(rentId,EnumYesOrNo.YES.getCode());
data.put("rent", rent);
}
//WxPropertyContract wxPropertyContractQuery = new WxPropertyContract();


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