|
|
|
@@ -148,9 +148,14 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){ |
|
|
|
wxRentContract.setBusDiscountTime(new Integer(0)); |
|
|
|
} |
|
|
|
MallUserInfo user = getUser(); |
|
|
|
//MallUserInfo user = getUser(); |
|
|
|
MallUserInfo user = new MallUserInfo(); |
|
|
|
user.setId(321127266275430400L); |
|
|
|
user.setName("alitest"); |
|
|
|
user.setTenantId("789"); |
|
|
|
user.setParentTenantId("788"); |
|
|
|
|
|
|
|
wxRentContract.updateTenantInfo(user); |
|
|
|
//wxRentContract.setTenantId("789"); |
|
|
|
wxRentContract.setAdjustPeriodHandle(); |
|
|
|
wxRentContract.setRentPriceHandle(); |
|
|
|
Date oldDate = wxRentContract.getRentalStartDate(); |
|
|
|
@@ -711,6 +716,26 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
return wxRentContractService.getContractByContractNumber(wxRentContract); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("/init") |
|
|
|
public ResultData init() { |
|
|
|
List<WxRentContract> clist = wxRentContractService.findList(new WxRentContract()); |
|
|
|
for (WxRentContract wrc: clist) { |
|
|
|
List<Long> shopIds = wrc.shopIdsByRentInfo(); |
|
|
|
if (null != shopIds) { |
|
|
|
List<WxShop> shops = wxShopService.getByIds(shopIds); |
|
|
|
String shopName = ""; |
|
|
|
for (WxShop shop : shops) { |
|
|
|
shopName = shopName +","+shop.getShopNumber(); |
|
|
|
} |
|
|
|
if(!StringUtils.isBlank(shopName)) { |
|
|
|
wrc.setShopName(shopName); |
|
|
|
wxRentContractService.updateRentContract(wrc); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|