Parcourir la source

fix

release_toaliyun_real
winter il y a 1 an
Parent
révision
93a251097c
4 fichiers modifiés avec 21 ajouts et 9 suppressions
  1. +10
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java
  2. +7
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

+ 10
- 6
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java Voir le fichier

@@ -8,6 +8,7 @@ import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxMallBuilding; import com.iformall.domain.po.WxMallBuilding;
import com.iformall.domain.po.WxMallFloor; import com.iformall.domain.po.WxMallFloor;
import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.WxUserDataRule;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.service.WxMallBuildingService; import com.iformall.service.WxMallBuildingService;
import com.iformall.utils.Constant; import com.iformall.utils.Constant;
import com.iformall.utils.RedisCacheUtils; import com.iformall.utils.RedisCacheUtils;
@@ -37,12 +38,15 @@ public class WxMallBuildingController extends BaseController {
@GetMapping("getbuildingfloorlist") @GetMapping("getbuildingfloorlist")
public ResultData getbuildingfloorlist(WxMallBuilding wxMallBuilding) { public ResultData getbuildingfloorlist(WxMallBuilding wxMallBuilding) {
wxMallBuilding.updateTenantInfo(getTenantInfo()); wxMallBuilding.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxMallBuilding.setFloorForRule(dataRule.getFloorIds());
wxMallBuilding.setBusinessForRule(dataRule.getBussinessIds());
wxMallBuilding.setShopTypeForRule(dataRule.getShopTypes());
}
if (null != wxMallBuilding.getIsAll() && wxMallBuilding.getIsAll()==EnumYesOrNo.YES.getCode()) {
}else {
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxMallBuilding.setFloorForRule(dataRule.getFloorIds());
wxMallBuilding.setBusinessForRule(dataRule.getBussinessIds());
wxMallBuilding.setShopTypeForRule(dataRule.getShopTypes());
}
}
return wxMallBuildingService.getBuildingFloorList(wxMallBuilding,this.getUser()); return wxMallBuildingService.getBuildingFloorList(wxMallBuilding,this.getUser());
} }


+ 7
- 3
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Voir le fichier

@@ -335,14 +335,16 @@ public class WxRentContractController extends WxContractBaseController {
*/ */
@GetMapping("getXuQianRentContract") @GetMapping("getXuQianRentContract")
@ApiImplicitParams({}) @ApiImplicitParams({})
public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList");
public ResultData getXuQianRentContract(@ModelAttribute WxRentContract wxRentContract) {
wxRentContract.updateTenantInfo(getTenantInfo()); wxRentContract.updateTenantInfo(getTenantInfo());
List<Integer> statss = new ArrayList<Integer>(); List<Integer> statss = new ArrayList<Integer>();
statss.add(EnumRentContractStatus.PAING.getCode()); statss.add(EnumRentContractStatus.PAING.getCode());
statss.add(EnumRentContractStatus.OUT_DATE.getCode()); statss.add(EnumRentContractStatus.OUT_DATE.getCode());
wxRentContract.setStatuss(statss); wxRentContract.setStatuss(statss);
wxRentContract.setSortColumn(BaseEntity.SortField.Createtime_DESC.getValue()); wxRentContract.setSortColumn(BaseEntity.SortField.Createtime_DESC.getValue());
if (null == wxRentContract.getIsPrivateMerchant()) {
wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode());
}
PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, 1, 100000); PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, 1, 100000);
if (null != page && null != page.getList()) { if (null != page && null != page.getList()) {
List<Map<String, Object>> retList = new ArrayList<Map<String, Object>>(); List<Map<String, Object>> retList = new ArrayList<Map<String, Object>>();
@@ -650,7 +652,9 @@ public class WxRentContractController extends WxContractBaseController {
wxRentContract.setStatuss(statuss); wxRentContract.setStatuss(statuss);
} }
} }
if (null == wxRentContract.getIsPrivateMerchant()) {
wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode());
}
wxRentContract.setSortColumns(SortField.Createtime_DESC); wxRentContract.setSortColumns(SortField.Createtime_DESC);
return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize));
} }


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java Voir le fichier

@@ -44,4 +44,7 @@ public class WxMallBuilding extends TenantEntity {
this.buildingName = buildingName; this.buildingName = buildingName;
this.name = buildingName; this.name = buildingName;
} }
@TableField(exist = false)
private Integer isAll;
} }

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Voir le fichier

@@ -562,6 +562,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
// wxBillDeposit.setEndtime(instance.getTime()); // wxBillDeposit.setEndtime(instance.getTime());
wxBillDeposit.setEndtime(record.getFirstBillDateEnd()); wxBillDeposit.setEndtime(record.getFirstBillDateEnd());
wxBillDeposit.setReceiveDate(record.getFirstBillReceiveDate()); wxBillDeposit.setReceiveDate(record.getFirstBillReceiveDate());
wxBillDeposit.setPeriod(WxRentContractHelper.getPeriod(record.getFirstBillReceiveDate()));
wxBillDeposit.updateTenantInfo(wxPropertyContract); wxBillDeposit.updateTenantInfo(wxPropertyContract);
wxBillDeposit.setMerchantId(record.getMerchantId()); wxBillDeposit.setMerchantId(record.getMerchantId());
wxBillDeposit.setCreatetime(date); wxBillDeposit.setCreatetime(date);


Chargement…
Annuler
Enregistrer