| @@ -220,7 +220,7 @@ public class WxMerchantController extends BaseController { | |||||
| @GetMapping("/exportData") | @GetMapping("/exportData") | ||||
| @SystemControllerLog(description = "商户-商户数据导出") | @SystemControllerLog(description = "商户-商户数据导出") | ||||
| public void exportData(@ModelAttribute WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response) { | public void exportData(@ModelAttribute WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response) { | ||||
| wxMerchant.setTenantId(getTenantId()); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); | wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); | ||||
| wxMerchantService.exportData(wxMerchant,request,response); | wxMerchantService.exportData(wxMerchant,request,response); | ||||
| } | } | ||||
| @@ -57,7 +57,7 @@ public class WxPropertyContractController extends BaseController { | |||||
| if (null == wxPropertyContract) { | if (null == wxPropertyContract) { | ||||
| wxPropertyContract = new WxPropertyContract(); | wxPropertyContract = new WxPropertyContract(); | ||||
| } | } | ||||
| wxPropertyContract.setTenantId(getTenantId()); | |||||
| wxPropertyContract.updateTenantInfo(getTenantInfo()); | |||||
| Map<String, Object> result = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); | Map<String, Object> result = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| @@ -67,7 +67,7 @@ public class WxPropertyContractController extends BaseController { | |||||
| public ResultData add(@RequestBody WxPropertyContract wxPropertyContract) { | public ResultData add(@RequestBody WxPropertyContract wxPropertyContract) { | ||||
| logger.debug("[" + getIpAddr() + "] WxPropertyContractController::add"); | logger.debug("[" + getIpAddr() + "] WxPropertyContractController::add"); | ||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| wxPropertyContract.setTenantId(user.getTenantId()); | |||||
| wxPropertyContract.updateTenantInfo(user); | |||||
| wxPropertyContract.setAdjustPeriodHandle(); | wxPropertyContract.setAdjustPeriodHandle(); | ||||
| Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); | Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); | ||||
| wxPropertyContract.setContractType(contractType); | wxPropertyContract.setContractType(contractType); | ||||
| @@ -83,7 +83,7 @@ public class WxPropertyContractController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); | logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); | ||||
| WxPropertyContract propertyContract = wxPropertyContractMapper.selectById(wxPropertyContract.getId()); | WxPropertyContract propertyContract = wxPropertyContractMapper.selectById(wxPropertyContract.getId()); | ||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| propertyContract.setTenantId(user.getTenantId()); | |||||
| propertyContract.updateTenantInfo(user); | |||||
| propertyContract.setAdjustPeriodHandle(); | propertyContract.setAdjustPeriodHandle(); | ||||
| propertyContract.setRentStartType(wxPropertyContract.getRentStartType()); | propertyContract.setRentStartType(wxPropertyContract.getRentStartType()); | ||||
| return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName()); | return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName()); | ||||
| @@ -94,7 +94,7 @@ public class WxPropertyContractController extends BaseController { | |||||
| public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) { | public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) { | ||||
| logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update"); | logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update"); | ||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| wxPropertyContract.setTenantId(user.getTenantId()); | |||||
| wxPropertyContract.updateTenantInfo(user); | |||||
| wxPropertyContract.setAdjustPeriodHandle(); | wxPropertyContract.setAdjustPeriodHandle(); | ||||
| //第三步提交 SWITCH | //第三步提交 SWITCH | ||||
| return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); | return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); | ||||
| @@ -116,7 +116,7 @@ public class WxPropertyContractController extends BaseController { | |||||
| public ResultData findById(Long id) { | public ResultData findById(Long id) { | ||||
| logger.debug("[" + getIpAddr() + "] WxPropertyContractController::findById"); | logger.debug("[" + getIpAddr() + "] WxPropertyContractController::findById"); | ||||
| WxBillProperty wxBillProperty = new WxBillProperty(); | WxBillProperty wxBillProperty = new WxBillProperty(); | ||||
| wxBillProperty.setTenantId(super.getTenantId()); | |||||
| wxBillProperty.updateTenantInfo(getTenantInfo()); | |||||
| wxBillPropertyService.updateBillStatus(wxBillProperty); | wxBillPropertyService.updateBillStatus(wxBillProperty); | ||||
| try { | try { | ||||
| Map<String, Object> data = wxPropertyContractService.getById(id); | Map<String, Object> data = wxPropertyContractService.getById(id); | ||||
| @@ -138,7 +138,7 @@ public class WxPropertyContractController extends BaseController { | |||||
| @SystemControllerLog(description = "物业合同-状态信息") | @SystemControllerLog(description = "物业合同-状态信息") | ||||
| public ResultData getPropertyContractStatusInfo(@ModelAttribute WxPropertyContract wxPropertyContract) { | public ResultData getPropertyContractStatusInfo(@ModelAttribute WxPropertyContract wxPropertyContract) { | ||||
| logger.debug("[" + getIpAddr() + "] WxPropertyContractController::getPropertyContractStatusInfo"); | logger.debug("[" + getIpAddr() + "] WxPropertyContractController::getPropertyContractStatusInfo"); | ||||
| wxPropertyContract.setTenantId(getTenantId()); | |||||
| wxPropertyContract.updateTenantInfo(getTenantInfo()); | |||||
| return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getRentContractStatusInfo(wxPropertyContract)); | return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getRentContractStatusInfo(wxPropertyContract)); | ||||
| } | } | ||||
| @@ -154,7 +154,7 @@ public class WxPropertyContractController extends BaseController { | |||||
| @SystemControllerLog(description = "物业合同-查询列表") | @SystemControllerLog(description = "物业合同-查询列表") | ||||
| public ResultData getRentContractList(@ModelAttribute WxPropertyContract wxPropertyContract) { | public ResultData getRentContractList(@ModelAttribute WxPropertyContract wxPropertyContract) { | ||||
| logger.debug("[" + getIpAddr() + "] WxPropertyContractController::getRentContractList"); | logger.debug("[" + getIpAddr() + "] WxPropertyContractController::getRentContractList"); | ||||
| wxPropertyContract.setTenantId(getTenantId()); | |||||
| wxPropertyContract.updateTenantInfo(getTenantInfo()); | |||||
| return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getRentContractList(wxPropertyContract)); | return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getRentContractList(wxPropertyContract)); | ||||
| } | } | ||||
| @@ -104,7 +104,7 @@ public class WxRentContractController extends BaseController { | |||||
| if (null == wxRentContract) { | if (null == wxRentContract) { | ||||
| wxRentContract = new WxRentContract(); | wxRentContract = new WxRentContract(); | ||||
| } | } | ||||
| wxRentContract.setTenantId(getTenantId()); | |||||
| wxRentContract.updateTenantInfo(getTenantInfo()); | |||||
| Map<String, Object> result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); | Map<String, Object> result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| @@ -145,7 +145,7 @@ public class WxRentContractController extends BaseController { | |||||
| } | } | ||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| wxRentContract.setTenantId(user.getTenantId()); | |||||
| wxRentContract.updateTenantInfo(user); | |||||
| wxRentContract.setAdjustPeriodHandle(); | wxRentContract.setAdjustPeriodHandle(); | ||||
| Date oldDate = wxRentContract.getRentalStartDate(); | Date oldDate = wxRentContract.getRentalStartDate(); | ||||
| if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ | if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ | ||||
| @@ -165,7 +165,7 @@ public class WxRentContractController extends BaseController { | |||||
| rentContract.setRentalStartDate(rentContract.getStartDate()); | rentContract.setRentalStartDate(rentContract.getStartDate()); | ||||
| } | } | ||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| rentContract.setTenantId(user.getTenantId()); | |||||
| rentContract.updateTenantInfo(user); | |||||
| rentContract.setAdjustPeriodHandle(); | rentContract.setAdjustPeriodHandle(); | ||||
| rentContract.setRentStartType(wxRentContract.getRentStartType()); | rentContract.setRentStartType(wxRentContract.getRentStartType()); | ||||
| return wxRentContractService.update(rentContract, user.getId(),user.getName(), EnumFromType.SWITCH.getCode(),oldDate); | return wxRentContractService.update(rentContract, user.getId(),user.getName(), EnumFromType.SWITCH.getCode(),oldDate); | ||||
| @@ -180,7 +180,7 @@ public class WxRentContractController extends BaseController { | |||||
| wxRentContract.setBusDiscountTime(new Integer(0)); | wxRentContract.setBusDiscountTime(new Integer(0)); | ||||
| } | } | ||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| wxRentContract.setTenantId(user.getTenantId()); | |||||
| wxRentContract.updateTenantInfo(user); | |||||
| wxRentContract.setAdjustPeriodHandle(); | wxRentContract.setAdjustPeriodHandle(); | ||||
| wxRentContract.setRentPriceHandle(); | wxRentContract.setRentPriceHandle(); | ||||
| Date oldDate = wxRentContract.getRentalStartDate(); | Date oldDate = wxRentContract.getRentalStartDate(); | ||||
| @@ -209,7 +209,7 @@ public class WxRentContractController extends BaseController { | |||||
| wxRentContract.setBusDiscountTime(new Integer(0)); | wxRentContract.setBusDiscountTime(new Integer(0)); | ||||
| } | } | ||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| wxRentContract.setTenantId(user.getTenantId()); | |||||
| wxRentContract.updateTenantInfo(user); | |||||
| wxRentContract.setAdjustPeriodHandle(); | wxRentContract.setAdjustPeriodHandle(); | ||||
| wxRentContract.setRentPriceHandle(); | wxRentContract.setRentPriceHandle(); | ||||
| Date oldDate = wxRentContract.getRentalStartDate(); | Date oldDate = wxRentContract.getRentalStartDate(); | ||||
| @@ -227,7 +227,7 @@ public class WxRentContractController extends BaseController { | |||||
| wxRentContract.setBusDiscountTime(new Integer(0)); | wxRentContract.setBusDiscountTime(new Integer(0)); | ||||
| } | } | ||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| wxRentContract.setTenantId(user.getTenantId()); | |||||
| wxRentContract.updateTenantInfo(user); | |||||
| wxRentContract.setAdjustPeriodHandle(); | wxRentContract.setAdjustPeriodHandle(); | ||||
| wxRentContract.setRentPriceHandle(); | wxRentContract.setRentPriceHandle(); | ||||
| Date oldDate = wxRentContract.getRentalStartDate(); | Date oldDate = wxRentContract.getRentalStartDate(); | ||||
| @@ -252,7 +252,7 @@ public class WxRentContractController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxRentContractController::findById"); | logger.debug("[" + getIpAddr() + "] WxRentContractController::findById"); | ||||
| // 同步欠缴状态 | // 同步欠缴状态 | ||||
| WxBillRent wxBillRent = new WxBillRent(); | WxBillRent wxBillRent = new WxBillRent(); | ||||
| wxBillRent.setTenantId(getTenantId()); | |||||
| wxBillRent.updateTenantInfo(getTenantInfo()); | |||||
| wxBillRentService.updateBillStatus(wxBillRent); | wxBillRentService.updateBillStatus(wxBillRent); | ||||
| try { | try { | ||||
| Map<String, Object> data = wxRentContractService.getById(id); | Map<String, Object> data = wxRentContractService.getById(id); | ||||
| @@ -273,7 +273,7 @@ public class WxRentContractController extends BaseController { | |||||
| @SystemControllerLog(description = "租赁合同-获取合同状态信息") | @SystemControllerLog(description = "租赁合同-获取合同状态信息") | ||||
| public ResultData getRentContractStatusInfo(@ModelAttribute WxRentContract wxRentContract) { | public ResultData getRentContractStatusInfo(@ModelAttribute WxRentContract wxRentContract) { | ||||
| logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractStatusInfo"); | logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractStatusInfo"); | ||||
| wxRentContract.setTenantId(getTenantId()); | |||||
| wxRentContract.updateTenantInfo(getTenantInfo()); | |||||
| return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getRentContractStatusInfo(wxRentContract)); | return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getRentContractStatusInfo(wxRentContract)); | ||||
| } | } | ||||
| @@ -301,7 +301,7 @@ public class WxRentContractController extends BaseController { | |||||
| @SystemControllerLog(description = "租赁合同-列表") | @SystemControllerLog(description = "租赁合同-列表") | ||||
| public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract, Integer pageNum, Integer pageSize) { | public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); | logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); | ||||
| wxRentContract.setTenantId(getTenantId()); | |||||
| wxRentContract.updateTenantInfo(getTenantInfo()); | |||||
| return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); | return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); | ||||
| } | } | ||||
| @@ -324,8 +324,7 @@ public class WxRentContractController extends BaseController { | |||||
| @SystemControllerLog(description = "租赁合同-获取甲方账户") | @SystemControllerLog(description = "租赁合同-获取甲方账户") | ||||
| public ResultData getPayAccountInfo() { | public ResultData getPayAccountInfo() { | ||||
| logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); | logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); | ||||
| String tenantId = getTenantId(); | |||||
| WxPayAccountBill payAccountBill = payAccountBillService.getByTenantId(tenantId); | |||||
| WxPayAccountBill payAccountBill = payAccountBillService.getByTenantId(getTenantInfo().getTenantId()); | |||||
| Map<String, String> map = new HashMap<>(); | Map<String, String> map = new HashMap<>(); | ||||
| if(StringUtils.isNotBlank(payAccountBill.getBankAccountName()) && StringUtils.isNotBlank(payAccountBill.getBankCardId())) { | if(StringUtils.isNotBlank(payAccountBill.getBankAccountName()) && StringUtils.isNotBlank(payAccountBill.getBankCardId())) { | ||||
| map.put("bankAccountName", payAccountBill.getBankAccountName()); | map.put("bankAccountName", payAccountBill.getBankAccountName()); | ||||
| @@ -352,8 +351,7 @@ public class WxRentContractController extends BaseController { | |||||
| if (payAccountBill.getServiceChargeRate() == null) { | if (payAccountBill.getServiceChargeRate() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "手续费费率未填写"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "手续费费率未填写"); | ||||
| } | } | ||||
| String tenantId = getTenantId(); | |||||
| WxPayAccountBill payAccountBillNew = payAccountBillService.getByTenantId(tenantId); | |||||
| WxPayAccountBill payAccountBillNew = payAccountBillService.getByTenantId(getTenantInfo().getTenantId()); | |||||
| payAccountBillNew.setBankAccountName(payAccountBill.getBankAccountName()); | payAccountBillNew.setBankAccountName(payAccountBill.getBankAccountName()); | ||||
| payAccountBillNew.setBankCardId(payAccountBill.getBankCardId()); | payAccountBillNew.setBankCardId(payAccountBill.getBankCardId()); | ||||
| payAccountBillNew.setServiceChargeRate(payAccountBill.getServiceChargeRate()); | payAccountBillNew.setServiceChargeRate(payAccountBill.getServiceChargeRate()); | ||||
| @@ -365,7 +363,7 @@ public class WxRentContractController extends BaseController { | |||||
| @SystemControllerLog(description = "租赁合同-获取已签约租赁合同且未有物业的商户") | @SystemControllerLog(description = "租赁合同-获取已签约租赁合同且未有物业的商户") | ||||
| public ResultData getMerchants(@ModelAttribute WxRentContract wxRentContract) { | public ResultData getMerchants(@ModelAttribute WxRentContract wxRentContract) { | ||||
| logger.debug("[" + getIpAddr() + "] WxRentContractController::getMerchants"); | logger.debug("[" + getIpAddr() + "] WxRentContractController::getMerchants"); | ||||
| wxRentContract.setTenantId(getTenantId()); | |||||
| wxRentContract.updateTenantInfo(getTenantInfo()); | |||||
| return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getMerchants(wxRentContract)); | return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getMerchants(wxRentContract)); | ||||
| } | } | ||||
| @@ -373,7 +371,7 @@ public class WxRentContractController extends BaseController { | |||||
| @SystemControllerLog(description = "查询店铺租赁状态") | @SystemControllerLog(description = "查询店铺租赁状态") | ||||
| public ResultData hasRentStatus(@ModelAttribute WxRentContract wxRentContract) { | public ResultData hasRentStatus(@ModelAttribute WxRentContract wxRentContract) { | ||||
| logger.debug("[" + getIpAddr() + "] WxRentContractController::hasRentStatus"); | logger.debug("[" + getIpAddr() + "] WxRentContractController::hasRentStatus"); | ||||
| wxRentContract.setTenantId(getTenantId()); | |||||
| wxRentContract.updateTenantInfo(getTenantInfo()); | |||||
| return wxRentContractService.hasRentStatus(wxRentContract); | return wxRentContractService.hasRentStatus(wxRentContract); | ||||
| } | } | ||||
| @@ -381,7 +379,7 @@ public class WxRentContractController extends BaseController { | |||||
| @SystemControllerLog(description = "租赁合同-检查合同编号是否存在") | @SystemControllerLog(description = "租赁合同-检查合同编号是否存在") | ||||
| public ResultData hasContractNumber(@ModelAttribute WxRentContract wxRentContract) { | public ResultData hasContractNumber(@ModelAttribute WxRentContract wxRentContract) { | ||||
| logger.debug("[" + getIpAddr() + "] WxRentContractController::hasContractNumber"); | logger.debug("[" + getIpAddr() + "] WxRentContractController::hasContractNumber"); | ||||
| wxRentContract.setTenantId(getTenantId()); | |||||
| wxRentContract.updateTenantInfo(getTenantInfo()); | |||||
| return wxRentContractService.hasContractNumber(wxRentContract); | return wxRentContractService.hasContractNumber(wxRentContract); | ||||
| } | } | ||||
| @@ -397,7 +395,7 @@ public class WxRentContractController extends BaseController { | |||||
| @SystemControllerLog(description = "租赁合同-通过合同编号查询信息") | @SystemControllerLog(description = "租赁合同-通过合同编号查询信息") | ||||
| public ResultData getContractByContractNumber(@ModelAttribute WxRentContract wxRentContract) { | public ResultData getContractByContractNumber(@ModelAttribute WxRentContract wxRentContract) { | ||||
| logger.debug("[" + getIpAddr() + "] WxRentContractController::getContractByContractNumber"); | logger.debug("[" + getIpAddr() + "] WxRentContractController::getContractByContractNumber"); | ||||
| wxRentContract.setTenantId(getTenantId()); | |||||
| wxRentContract.updateTenantInfo(getTenantInfo()); | |||||
| return wxRentContractService.getContractByContractNumber(wxRentContract); | return wxRentContractService.getContractByContractNumber(wxRentContract); | ||||
| } | } | ||||
| @@ -39,7 +39,7 @@ public class WxRentPropertyContractController extends BaseController { | |||||
| if (null == wxRentPropertyContractVo) { | if (null == wxRentPropertyContractVo) { | ||||
| wxRentPropertyContractVo = new WxRentPropertyContractVo(); | wxRentPropertyContractVo = new WxRentPropertyContractVo(); | ||||
| } | } | ||||
| wxRentPropertyContractVo.setTenantId(getTenantId()); | |||||
| wxRentPropertyContractVo.updateTenantInfo(getTenantInfo()); | |||||
| final PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); | final PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -67,7 +67,7 @@ public class WxRentPropertyContractController extends BaseController { | |||||
| public ResultData insertRent(@RequestBody WxRentContract wxRentContract) { | public ResultData insertRent(@RequestBody WxRentContract wxRentContract) { | ||||
| logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::insertRentForCreate"); | logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::insertRentForCreate"); | ||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| wxRentContract.setTenantId(user.getTenantId()); | |||||
| wxRentContract.updateTenantInfo(user); | |||||
| return wxRentPropertyContractService.insertRentForCreate(wxRentContract); | return wxRentPropertyContractService.insertRentForCreate(wxRentContract); | ||||
| } | } | ||||
| @@ -44,7 +44,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||||
| if (wxMerchantTradeDaily == null) | if (wxMerchantTradeDaily == null) | ||||
| wxMerchantTradeDaily = new WxMerchantTradeDaily(); | wxMerchantTradeDaily = new WxMerchantTradeDaily(); | ||||
| wxMerchantTradeDaily.setTenantId(getTenantId()); | |||||
| wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); | |||||
| wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.MerchantId_DESC); | wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.MerchantId_DESC); | ||||
| PageInfo<WxMerchantTradeDailyVo> page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize); | PageInfo<WxMerchantTradeDailyVo> page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize); | ||||
| @@ -85,7 +85,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||||
| wxMerchantTradeDaily.getMerchantId() == null || | wxMerchantTradeDaily.getMerchantId() == null || | ||||
| wxMerchantTradeDaily.getTradeAmt() == null) | wxMerchantTradeDaily.getTradeAmt() == null) | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| wxMerchantTradeDaily.setTenantId(getTenantId()); | |||||
| wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); | |||||
| if (wxMerchantTradeDaily.getReportDate() == null) { | if (wxMerchantTradeDaily.getReportDate() == null) { | ||||
| SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); | SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); | ||||
| wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); | wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); | ||||
| @@ -98,7 +98,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||||
| @SystemControllerLog(description = "商户-查询解单数据") | @SystemControllerLog(description = "商户-查询解单数据") | ||||
| public ResultData queryTradeDaily(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily) { | public ResultData queryTradeDaily(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::queryTradeDaily"); | logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::queryTradeDaily"); | ||||
| wxMerchantTradeDaily.setTenantId(getTenantId()); | |||||
| wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); | |||||
| return wxMerchantTradeDailyService.queryTradeDaily(wxMerchantTradeDaily); | return wxMerchantTradeDailyService.queryTradeDaily(wxMerchantTradeDaily); | ||||
| } | } | ||||
| @@ -110,7 +110,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||||
| if (null == wxMerchantTradeDaily) { | if (null == wxMerchantTradeDaily) { | ||||
| wxMerchantTradeDaily = new WxMerchantTradeDaily(); | wxMerchantTradeDaily = new WxMerchantTradeDaily(); | ||||
| } | } | ||||
| wxMerchantTradeDaily.setTenantId(getTenantId()); | |||||
| wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); | |||||
| wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.MerchantId_DESC); | wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.MerchantId_DESC); | ||||
| wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response); | wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response); | ||||
| } | } | ||||
| @@ -62,7 +62,7 @@ public class WxUserStructureController extends BaseController { | |||||
| public ResultData findUserSexStructure(Date startTime, Date endTime) { | public ResultData findUserSexStructure(Date startTime, Date endTime) { | ||||
| logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserSexStructure"); | logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserSexStructure"); | ||||
| WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | ||||
| dto.setTenantId(getTenantId()); | |||||
| dto.updateTenantInfo(getTenantInfo()); | |||||
| dto.setStartTime(startTime); | dto.setStartTime(startTime); | ||||
| dto.setEndTime(endTime); | dto.setEndTime(endTime); | ||||
| //保密 | //保密 | ||||
| @@ -86,7 +86,7 @@ public class WxUserStructureController extends BaseController { | |||||
| public ResultData findUserAgeStructure(Date startTime, Date endTime) { | public ResultData findUserAgeStructure(Date startTime, Date endTime) { | ||||
| logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserAgeStructure"); | logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserAgeStructure"); | ||||
| WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | ||||
| dto.setTenantId(getTenantId()); | |||||
| dto.updateTenantInfo(getTenantInfo()); | |||||
| dto.setStartTime(startTime); | dto.setStartTime(startTime); | ||||
| dto.setEndTime(endTime); | dto.setEndTime(endTime); | ||||
| long all = wxCUserBasicInfoService.findCount(dto); | long all = wxCUserBasicInfoService.findCount(dto); | ||||
| @@ -110,14 +110,14 @@ public class WxUserStructureController extends BaseController { | |||||
| public ResultData findUserLevelStructure(Date startTime, Date endTime) { | public ResultData findUserLevelStructure(Date startTime, Date endTime) { | ||||
| logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserAgeStructure"); | logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserAgeStructure"); | ||||
| WxLevelConfig wxLevelConfig = new WxLevelConfig(); | WxLevelConfig wxLevelConfig = new WxLevelConfig(); | ||||
| wxLevelConfig.setTenantId(getTenantId()); | |||||
| wxLevelConfig.updateTenantInfo(getTenantInfo()); | |||||
| wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); | wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); | ||||
| List<WxLevelConfig> levelList = wxLevelConfigService.findList(wxLevelConfig); | List<WxLevelConfig> levelList = wxLevelConfigService.findList(wxLevelConfig); | ||||
| for( int i = 0; i < levelList.size(); i++) { | for( int i = 0; i < levelList.size(); i++) { | ||||
| WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | ||||
| dto.setTenantId(getTenantId()); | |||||
| dto.updateTenantInfo(getTenantInfo()); | |||||
| dto.setStartTime(startTime); | dto.setStartTime(startTime); | ||||
| dto.setEndTime(endTime); | dto.setEndTime(endTime); | ||||
| if (i + 1 < levelList.size()) { | if (i + 1 < levelList.size()) { | ||||
| @@ -151,7 +151,7 @@ public class WxUserStructureController extends BaseController { | |||||
| public ResultData findCarLevelStructure(Date startTime, Date endTime) { | public ResultData findCarLevelStructure(Date startTime, Date endTime) { | ||||
| logger.debug("[" + getIpAddr() + "] WxUserStructureController::findCarLevelStructure"); | logger.debug("[" + getIpAddr() + "] WxUserStructureController::findCarLevelStructure"); | ||||
| WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | ||||
| dto.setTenantId(getTenantId()); | |||||
| dto.updateTenantInfo(getTenantInfo()); | |||||
| dto.setStartTime(startTime); | dto.setStartTime(startTime); | ||||
| dto.setEndTime(endTime); | dto.setEndTime(endTime); | ||||
| long total = wxCUserBasicInfoService.findCount(dto); | long total = wxCUserBasicInfoService.findCount(dto); | ||||
| @@ -193,7 +193,7 @@ public class WxUserStructureController extends BaseController { | |||||
| public ResultData findUserPhoneBandStructure(Date startTime, Date endTime) { | public ResultData findUserPhoneBandStructure(Date startTime, Date endTime) { | ||||
| logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserPhoneBandStructure"); | logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserPhoneBandStructure"); | ||||
| WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | ||||
| dto.setTenantId(getTenantId()); | |||||
| dto.updateTenantInfo(getTenantInfo()); | |||||
| dto.setStartTime(startTime); | dto.setStartTime(startTime); | ||||
| dto.setEndTime(endTime); | dto.setEndTime(endTime); | ||||
| long total = wxCUserBasicInfoService.findCount(dto); | long total = wxCUserBasicInfoService.findCount(dto); | ||||
| @@ -230,7 +230,7 @@ public class WxUserStructureController extends BaseController { | |||||
| public ResultData findUserActivityStructure(Date startTime, Date endTime) { | public ResultData findUserActivityStructure(Date startTime, Date endTime) { | ||||
| logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserActivityStructure"); | logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserActivityStructure"); | ||||
| WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | ||||
| dto.setTenantId(getTenantId()); | |||||
| dto.updateTenantInfo(getTenantInfo()); | |||||
| dto.setStartTime(startTime); | dto.setStartTime(startTime); | ||||
| dto.setEndTime(endTime); | dto.setEndTime(endTime); | ||||
| long total = wxCUserBasicInfoService.findCount(dto); | long total = wxCUserBasicInfoService.findCount(dto); | ||||
| @@ -296,7 +296,7 @@ public class WxUserStructureController extends BaseController { | |||||
| Map<String, Object> map = new HashMap<>(); | Map<String, Object> map = new HashMap<>(); | ||||
| WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | ||||
| dto.setTenantId(getTenantId()); | |||||
| dto.updateTenantInfo(getTenantInfo()); | |||||
| dto.setEndTime(new Date()); | dto.setEndTime(new Date()); | ||||
| //微信用户数据 | //微信用户数据 | ||||
| long wxTotalCount = wxCUserService.findCount(dto);//总量 | long wxTotalCount = wxCUserService.findCount(dto);//总量 | ||||
| @@ -349,7 +349,7 @@ public class WxUserStructureController extends BaseController { | |||||
| reportType = EnumUserCountReportType.DAY.getCode(); | reportType = EnumUserCountReportType.DAY.getCode(); | ||||
| } | } | ||||
| dto.setTenantId(getTenantId()); | |||||
| dto.updateTenantInfo(getTenantInfo()); | |||||
| dto.setStartTime(startTime); | dto.setStartTime(startTime); | ||||
| dto.setEndTime(endTime); | dto.setEndTime(endTime); | ||||
| dto.setReportType(reportType); | dto.setReportType(reportType); | ||||
| @@ -421,7 +421,7 @@ public class WxUserStructureController extends BaseController { | |||||
| && wxCountList.get(0).getTotalCount() != null | && wxCountList.get(0).getTotalCount() != null | ||||
| && wxCountList.get(0).getTotalCount() == 0) { | && wxCountList.get(0).getTotalCount() == 0) { | ||||
| WxCUserBasicInfoDto pdto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto pdto = new WxCUserBasicInfoDto(); | ||||
| pdto.setTenantId(getTenantId()); | |||||
| pdto.updateTenantInfo(getTenantInfo()); | |||||
| pdto.setEndTime(startTime); | pdto.setEndTime(startTime); | ||||
| wxCountList.get(0).setTotalCount(wxCUserService.findCount(pdto)); | wxCountList.get(0).setTotalCount(wxCUserService.findCount(pdto)); | ||||
| } | } | ||||
| @@ -437,7 +437,7 @@ public class WxUserStructureController extends BaseController { | |||||
| && memCountList.get(0).getTotalCount() != null | && memCountList.get(0).getTotalCount() != null | ||||
| && memCountList.get(0).getTotalCount() == 0) { | && memCountList.get(0).getTotalCount() == 0) { | ||||
| WxCUserBasicInfoDto pdto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto pdto = new WxCUserBasicInfoDto(); | ||||
| pdto.setTenantId(getTenantId()); | |||||
| pdto.updateTenantInfo(getTenantInfo()); | |||||
| pdto.setEndTime(startTime); | pdto.setEndTime(startTime); | ||||
| memCountList.get(0).setTotalCount(wxCUserBasicInfoService.findCount(pdto)); | memCountList.get(0).setTotalCount(wxCUserBasicInfoService.findCount(pdto)); | ||||
| } | } | ||||
| @@ -43,7 +43,7 @@ public class KwBoxController extends BaseController { | |||||
| @SystemControllerLog(description = "开物盒子-设备列表") | @SystemControllerLog(description = "开物盒子-设备列表") | ||||
| public Result list(@ModelAttribute KwBox kwBox, Integer pageNum, Integer pageSize) { | public Result list(@ModelAttribute KwBox kwBox, Integer pageNum, Integer pageSize) { | ||||
| if (kwBox == null) kwBox = new KwBox(); | if (kwBox == null) kwBox = new KwBox(); | ||||
| kwBox.setTenantId(getTenantId()); | |||||
| kwBox.updateTenantInfo(getTenantInfo()); | |||||
| kwBox.setStatus(EnumBoxStatus.VALID.getCode()); | kwBox.setStatus(EnumBoxStatus.VALID.getCode()); | ||||
| return new ResultData(kwBoxService.listAsPage(kwBox, pageNum,pageSize)); | return new ResultData(kwBoxService.listAsPage(kwBox, pageNum,pageSize)); | ||||
| } | } | ||||
| @@ -59,7 +59,7 @@ public class KwBoxController extends BaseController { | |||||
| List<KwBox> list = kwBoxService.findList(record); | List<KwBox> list = kwBoxService.findList(record); | ||||
| if (list.size() > 0) | if (list.size() > 0) | ||||
| return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); | return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); | ||||
| kwBox.setTenantId(getTenantId()); | |||||
| kwBox.updateTenantInfo(getTenantInfo()); | |||||
| kwBox.setStatus(EnumBoxStatus.VALID.getCode()); | kwBox.setStatus(EnumBoxStatus.VALID.getCode()); | ||||
| kwBoxService.saveOrUpdate(kwBox); | kwBoxService.saveOrUpdate(kwBox); | ||||
| return new ResultData(kwBox); | return new ResultData(kwBox); | ||||
| @@ -41,7 +41,7 @@ public class KwMerchantMeterController extends BaseController { | |||||
| @SystemControllerLog(description = "商户列表") | @SystemControllerLog(description = "商户列表") | ||||
| public Result list(@ModelAttribute KwMerchantMeterDto kwMerchantMeterDto, Integer pageNum, Integer pageSize) { | public Result list(@ModelAttribute KwMerchantMeterDto kwMerchantMeterDto, Integer pageNum, Integer pageSize) { | ||||
| if (kwMerchantMeterDto == null) kwMerchantMeterDto = new KwMerchantMeterDto(); | if (kwMerchantMeterDto == null) kwMerchantMeterDto = new KwMerchantMeterDto(); | ||||
| kwMerchantMeterDto.setTenantId(getTenantId()); | |||||
| kwMerchantMeterDto.updateTenantInfo(getTenantInfo()); | |||||
| return new ResultData(kwMerchantMeterService.listVoAsPage(kwMerchantMeterDto, pageNum, pageSize)); | return new ResultData(kwMerchantMeterService.listVoAsPage(kwMerchantMeterDto, pageNum, pageSize)); | ||||
| } | } | ||||
| @@ -7,6 +7,7 @@ import com.iformall.common.Result; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| import com.iformall.service.ExcelService; | import com.iformall.service.ExcelService; | ||||
| @@ -75,7 +76,7 @@ public class KwMeterController extends BaseController { | |||||
| @SystemControllerLog(description = "电表设备-设备列表") | @SystemControllerLog(description = "电表设备-设备列表") | ||||
| public Result list(@ModelAttribute KwMeter kwMeter, Integer pageNum, Integer pageSize) { | public Result list(@ModelAttribute KwMeter kwMeter, Integer pageNum, Integer pageSize) { | ||||
| if (kwMeter == null) kwMeter = new KwMeter(); | if (kwMeter == null) kwMeter = new KwMeter(); | ||||
| kwMeter.setTenantId(getTenantId()); | |||||
| kwMeter.updateTenantInfo(getTenantInfo()); | |||||
| kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); | kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); | ||||
| return new ResultData(kwMeterService.listAsPage(kwMeter, pageNum,pageSize)); | return new ResultData(kwMeterService.listAsPage(kwMeter, pageNum,pageSize)); | ||||
| } | } | ||||
| @@ -89,15 +90,15 @@ public class KwMeterController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| if (kwMeter.getAddress() == null) | if (kwMeter.getAddress() == null) | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| TenantEntity tenantEntity = getTenantInfo(); | |||||
| KwMeter record = new KwMeter(); | KwMeter record = new KwMeter(); | ||||
| record.setTenantId(getTenantId()); | |||||
| record.updateTenantInfo(tenantEntity); | |||||
| record.setAddress(kwMeter.getAddress()); | record.setAddress(kwMeter.getAddress()); | ||||
| record.setStatus(EnumMeterStatus.VALID.getCode()); | record.setStatus(EnumMeterStatus.VALID.getCode()); | ||||
| List<KwMeter> KwMeters = kwMeterService.findList(record); | List<KwMeter> KwMeters = kwMeterService.findList(record); | ||||
| if (KwMeters.size() > 0) | if (KwMeters.size() > 0) | ||||
| return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); | return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); | ||||
| kwMeter.setTenantId(getTenantId()); | |||||
| kwMeter.updateTenantInfo(tenantEntity); | |||||
| kwMeter.setBoxId(0L); | kwMeter.setBoxId(0L); | ||||
| kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); | kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); | ||||
| kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode()); | kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode()); | ||||
| @@ -155,7 +156,7 @@ public class KwMeterController extends BaseController { | |||||
| record.setStatus(EnumBoxStatus.VALID.getCode()); | record.setStatus(EnumBoxStatus.VALID.getCode()); | ||||
| List<KwBox> list = kwBoxService.findList(record); | List<KwBox> list = kwBoxService.findList(record); | ||||
| if (list.size() > 0) return list.get(0); | if (list.size() > 0) return list.get(0); | ||||
| kwBox.setTenantId(getTenantId()); | |||||
| kwBox.updateTenantInfo(getTenantInfo()); | |||||
| kwBox.setStatus(EnumBoxStatus.VALID.getCode()); | kwBox.setStatus(EnumBoxStatus.VALID.getCode()); | ||||
| kwBoxService.saveOrUpdate(kwBox); | kwBoxService.saveOrUpdate(kwBox); | ||||
| return kwBox; | return kwBox; | ||||
| @@ -178,7 +179,7 @@ public class KwMeterController extends BaseController { | |||||
| private void addOrUpdate(KwMeter kwMeter) { | private void addOrUpdate(KwMeter kwMeter) { | ||||
| KwMeter record = new KwMeter(); | KwMeter record = new KwMeter(); | ||||
| record.setTenantId(getTenantId()); | |||||
| record.updateTenantInfo(getTenantInfo()); | |||||
| record.setAddress(kwMeter.getAddress()); | record.setAddress(kwMeter.getAddress()); | ||||
| record.setStatus(EnumMeterStatus.VALID.getCode()); | record.setStatus(EnumMeterStatus.VALID.getCode()); | ||||
| List<KwMeter> kwMeters = kwMeterService.findList(record); | List<KwMeter> kwMeters = kwMeterService.findList(record); | ||||
| @@ -47,7 +47,7 @@ public class KwMeterDataController extends BaseController { | |||||
| @SystemControllerLog(description = "电表设备-电表数据") | @SystemControllerLog(description = "电表设备-电表数据") | ||||
| public Result list(@ModelAttribute KwMeterDataDto kwMeterDataDto, Integer pageNum, Integer pageSize) { | public Result list(@ModelAttribute KwMeterDataDto kwMeterDataDto, Integer pageNum, Integer pageSize) { | ||||
| if (kwMeterDataDto == null) kwMeterDataDto = new KwMeterDataDto(); | if (kwMeterDataDto == null) kwMeterDataDto = new KwMeterDataDto(); | ||||
| kwMeterDataDto.setTenantId(getTenantId()); | |||||
| kwMeterDataDto.updateTenantInfo(getTenantInfo()); | |||||
| return new ResultData(kwMeterDataService.listVoAsPage(kwMeterDataDto, pageNum, pageSize)); | return new ResultData(kwMeterDataService.listVoAsPage(kwMeterDataDto, pageNum, pageSize)); | ||||
| } | } | ||||
| @@ -57,7 +57,7 @@ public class KwMeterDataController extends BaseController { | |||||
| @SystemControllerLog(description = "电表设备-电表数据") | @SystemControllerLog(description = "电表设备-电表数据") | ||||
| public Result listPower(@ModelAttribute KwMeterDataDto kwMeterDataDto) { | public Result listPower(@ModelAttribute KwMeterDataDto kwMeterDataDto) { | ||||
| if (kwMeterDataDto == null) kwMeterDataDto = new KwMeterDataDto(); | if (kwMeterDataDto == null) kwMeterDataDto = new KwMeterDataDto(); | ||||
| kwMeterDataDto.setTenantId(getTenantId()); | |||||
| kwMeterDataDto.updateTenantInfo(getTenantInfo()); | |||||
| List<KwMeterDataVo> kwMeterDataVos = kwMeterDataService.findVoList(kwMeterDataDto); | List<KwMeterDataVo> kwMeterDataVos = kwMeterDataService.findVoList(kwMeterDataDto); | ||||
| @@ -38,7 +38,7 @@ public class WxDeviceController extends BaseController { | |||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | ||||
| @SystemControllerLog(description = "IOT设备-设备列表") | @SystemControllerLog(description = "IOT设备-设备列表") | ||||
| public Result list(@ModelAttribute WxDevice wxDevice, Integer pageNum, Integer pageSize) { | public Result list(@ModelAttribute WxDevice wxDevice, Integer pageNum, Integer pageSize) { | ||||
| wxDevice.setTenantId(getTenantId()); | |||||
| wxDevice.updateTenantInfo(getTenantInfo()); | |||||
| wxDevice.setStatus(EnumDeviceStatus.VALID.getCode()); | wxDevice.setStatus(EnumDeviceStatus.VALID.getCode()); | ||||
| return new ResultData(wxDeviceService.listAsPage(wxDevice, pageNum,pageSize)); | return new ResultData(wxDeviceService.listAsPage(wxDevice, pageNum,pageSize)); | ||||
| } | } | ||||
| @@ -56,7 +56,7 @@ public class WxDeviceController extends BaseController { | |||||
| return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); | return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); | ||||
| wxDevice.setStatus(EnumDeviceStatus.VALID.getCode()); | wxDevice.setStatus(EnumDeviceStatus.VALID.getCode()); | ||||
| wxDevice.setOnlineStatus(EnumDeviceOnlineStatus.OFFLINE.getCode()); | wxDevice.setOnlineStatus(EnumDeviceOnlineStatus.OFFLINE.getCode()); | ||||
| wxDevice.setTenantId(getTenantId()); | |||||
| wxDevice.updateTenantInfo(getTenantInfo()); | |||||
| return wxDeviceService.saveOrUpdate(wxDevice); | return wxDeviceService.saveOrUpdate(wxDevice); | ||||
| } | } | ||||
| @@ -69,7 +69,7 @@ public class WxDeviceController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| if (wxDevice.getId() == null) | if (wxDevice.getId() == null) | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| wxDevice.setTenantId(getTenantId()); | |||||
| wxDevice.updateTenantInfo(getTenantInfo()); | |||||
| return wxDeviceService.saveOrUpdate(wxDevice); | return wxDeviceService.saveOrUpdate(wxDevice); | ||||
| } | } | ||||
| @@ -95,7 +95,7 @@ public class WxDeviceController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| WxDevice wxDevice = new WxDevice(); | WxDevice wxDevice = new WxDevice(); | ||||
| wxDevice.setId(id); | wxDevice.setId(id); | ||||
| wxDevice.setTenantId(getTenantId()); | |||||
| wxDevice.updateTenantInfo(getTenantInfo()); | |||||
| wxDevice.setStatus(EnumDeviceStatus.INVALID.getCode()); | wxDevice.setStatus(EnumDeviceStatus.INVALID.getCode()); | ||||
| return wxDeviceService.saveOrUpdate(wxDevice); | return wxDeviceService.saveOrUpdate(wxDevice); | ||||
| @@ -44,7 +44,7 @@ public class WxScreenAdController extends BaseController { | |||||
| @SystemControllerLog(description = "广告屏-广告列表") | @SystemControllerLog(description = "广告屏-广告列表") | ||||
| public Result list(@ModelAttribute WxScreenAd wxScreenAd, Integer pageNum, Integer pageSize) { | public Result list(@ModelAttribute WxScreenAd wxScreenAd, Integer pageNum, Integer pageSize) { | ||||
| if (wxScreenAd == null) wxScreenAd = new WxScreenAd(); | if (wxScreenAd == null) wxScreenAd = new WxScreenAd(); | ||||
| wxScreenAd.setTenantId(getTenantId()); | |||||
| wxScreenAd.updateTenantInfo(getTenantInfo()); | |||||
| wxScreenAd.setStatus(EnumScreenAdStatus.VALID.getCode()); | wxScreenAd.setStatus(EnumScreenAdStatus.VALID.getCode()); | ||||
| return new ResultData(wxScreenAdService.listAsPage(wxScreenAd,pageNum,pageSize)); | return new ResultData(wxScreenAdService.listAsPage(wxScreenAd,pageNum,pageSize)); | ||||
| } | } | ||||
| @@ -55,7 +55,7 @@ public class WxScreenAdController extends BaseController { | |||||
| public Result add(@RequestBody WxScreenAd wxScreenAd) { | public Result add(@RequestBody WxScreenAd wxScreenAd) { | ||||
| if (wxScreenAd == null) wxScreenAd = new WxScreenAd(); | if (wxScreenAd == null) wxScreenAd = new WxScreenAd(); | ||||
| wxScreenAd.setStatus(EnumScreenAdStatus.VALID.getCode()); | wxScreenAd.setStatus(EnumScreenAdStatus.VALID.getCode()); | ||||
| wxScreenAd.setTenantId(getTenantId()); | |||||
| wxScreenAd.updateTenantInfo(getTenantInfo()); | |||||
| return wxScreenAdService.saveOrUpdate(wxScreenAd); | return wxScreenAdService.saveOrUpdate(wxScreenAd); | ||||
| } | } | ||||
| @@ -67,7 +67,7 @@ public class WxScreenAdController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| if (wxScreenAd.getId() == null) | if (wxScreenAd.getId() == null) | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| wxScreenAd.setTenantId(getTenantId()); | |||||
| wxScreenAd.updateTenantInfo(getTenantInfo()); | |||||
| wxScreenAdService.saveOrUpdate(wxScreenAd); | wxScreenAdService.saveOrUpdate(wxScreenAd); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -100,7 +100,7 @@ public class WxScreenAdController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| WxScreenAd wxScreenAd = new WxScreenAd(); | WxScreenAd wxScreenAd = new WxScreenAd(); | ||||
| wxScreenAd.setId(id); | wxScreenAd.setId(id); | ||||
| wxScreenAd.setTenantId(getTenantId()); | |||||
| wxScreenAd.updateTenantInfo(getTenantInfo()); | |||||
| wxScreenAd.setStatus(EnumScreenAdStatus.INVALID.getCode()); | wxScreenAd.setStatus(EnumScreenAdStatus.INVALID.getCode()); | ||||
| wxScreenAdService.saveOrUpdate(wxScreenAd); | wxScreenAdService.saveOrUpdate(wxScreenAd); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| @@ -93,7 +93,7 @@ public class MarkingDataReportController extends BaseController { | |||||
| @GetMapping("/exportTouchUsersData") | @GetMapping("/exportTouchUsersData") | ||||
| @SystemControllerLog(description = "券数据-触达用户数数据导出") | @SystemControllerLog(description = "券数据-触达用户数数据导出") | ||||
| public void exportTouchUsersData(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, HttpServletRequest request, HttpServletResponse response) { | public void exportTouchUsersData(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, HttpServletRequest request, HttpServletResponse response) { | ||||
| markingCouponDataReportDto.setTenantId(getTenantId()); | |||||
| markingCouponDataReportDto.updateTenantInfo(getTenantInfo()); | |||||
| markingDataReportService.exportTouchUsersData(request, response, markingCouponDataReportDto); | markingDataReportService.exportTouchUsersData(request, response, markingCouponDataReportDto); | ||||
| } | } | ||||
| @@ -35,7 +35,7 @@ public class PushLimitController extends BaseController { | |||||
| @SystemControllerLog(description = "疲劳度-配置更新") | @SystemControllerLog(description = "疲劳度-配置更新") | ||||
| public ResultData update(@RequestBody PushLimit pushLimit) { | public ResultData update(@RequestBody PushLimit pushLimit) { | ||||
| logger.debug("[" + getIpAddr() + "] PushLimitController::update"); | logger.debug("[" + getIpAddr() + "] PushLimitController::update"); | ||||
| pushLimit.setTenantId(getTenantId()); | |||||
| pushLimit.updateTenantInfo(getTenantInfo()); | |||||
| pushLimitService.saveOrUpdate(pushLimit); | pushLimitService.saveOrUpdate(pushLimit); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -43,7 +43,7 @@ public class WxActivityController extends BaseController { | |||||
| if (wxActivity.getStatus() != null && wxActivity.getStatus() == -1) { | if (wxActivity.getStatus() != null && wxActivity.getStatus() == -1) { | ||||
| wxActivity.setStatus(null); | wxActivity.setStatus(null); | ||||
| } | } | ||||
| wxActivity.setTenantId(getTenantId()); | |||||
| wxActivity.updateTenantInfo(getTenantInfo()); | |||||
| wxActivity.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | wxActivity.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<WxActivity> page = wxActivityService.listAsPage(wxActivity, pageNum, pageSize); | final PageInfo<WxActivity> page = wxActivityService.listAsPage(wxActivity, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -55,7 +55,7 @@ public class WxActivityController extends BaseController { | |||||
| public ResultData add(@RequestBody WxActivity wxActivity) { | public ResultData add(@RequestBody WxActivity wxActivity) { | ||||
| logger.debug("[" + getIpAddr() + "] WxActivityController::add"); | logger.debug("[" + getIpAddr() + "] WxActivityController::add"); | ||||
| wxActivity.setStatus(EnumActivityStatus.STATUS_THROW_IN.getCode()); | wxActivity.setStatus(EnumActivityStatus.STATUS_THROW_IN.getCode()); | ||||
| wxActivity.setTenantId(getTenantId()); | |||||
| wxActivity.updateTenantInfo(getTenantInfo()); | |||||
| try { | try { | ||||
| wxActivityService.saveOrUpdate(wxActivity); | wxActivityService.saveOrUpdate(wxActivity); | ||||
| } catch (MallinkException e) { | } catch (MallinkException e) { | ||||
| @@ -44,7 +44,7 @@ public class WxActivityJoinController extends BaseController { | |||||
| if (null == wxActivityJoin) { | if (null == wxActivityJoin) { | ||||
| wxActivityJoin = new WxActivityJoin(); | wxActivityJoin = new WxActivityJoin(); | ||||
| } | } | ||||
| wxActivityJoin.setTenantId(getTenantId()); | |||||
| wxActivityJoin.updateTenantInfo(getTenantInfo()); | |||||
| wxActivityJoin.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | wxActivityJoin.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<WxActivityJoin> page = wxActivityJoinService.listAsPage(wxActivityJoin, pageNum, pageSize); | final PageInfo<WxActivityJoin> page = wxActivityJoinService.listAsPage(wxActivityJoin, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -76,7 +76,7 @@ public class WxActivityJoinController extends BaseController { | |||||
| if (wxActivityJoin.getActivityId() == null) { | if (wxActivityJoin.getActivityId() == null) { | ||||
| throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); | throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); | ||||
| } | } | ||||
| wxActivityJoin.setTenantId(getTenantId()); | |||||
| wxActivityJoin.updateTenantInfo(getTenantInfo()); | |||||
| wxActivityJoinService.exportData(request, response, wxActivityJoin); | wxActivityJoinService.exportData(request, response, wxActivityJoin); | ||||
| } | } | ||||
| @@ -90,7 +90,7 @@ public class WxActivityJoinController extends BaseController { | |||||
| if (wxActivityJoin.getActivityId() == null) { | if (wxActivityJoin.getActivityId() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); | ||||
| } | } | ||||
| wxActivityJoin.setTenantId(getTenantId()); | |||||
| wxActivityJoin.updateTenantInfo(getTenantInfo()); | |||||
| return wxActivityJoinService.queryJoinInfo(wxActivityJoin); | return wxActivityJoinService.queryJoinInfo(wxActivityJoin); | ||||
| } | } | ||||
| @@ -103,7 +103,7 @@ public class WxActivityJoinController extends BaseController { | |||||
| if (wxActivityJoin.getActivityId() == null) { | if (wxActivityJoin.getActivityId() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); | ||||
| } | } | ||||
| wxActivityJoin.setTenantId(getTenantId()); | |||||
| wxActivityJoin.updateTenantInfo(getTenantInfo()); | |||||
| return wxActivityJoinService.sendMsg(wxActivityJoin); | return wxActivityJoinService.sendMsg(wxActivityJoin); | ||||
| } | } | ||||
| @@ -60,7 +60,7 @@ public class WxCampaignController extends BaseController { | |||||
| if (wxCampaign.getStatus() != null && wxCampaign.getStatus() == -1) { | if (wxCampaign.getStatus() != null && wxCampaign.getStatus() == -1) { | ||||
| wxCampaign.setStatus(null); | wxCampaign.setStatus(null); | ||||
| } | } | ||||
| wxCampaign.setTenantId(getTenantId()); | |||||
| wxCampaign.updateTenantInfo(getTenantInfo()); | |||||
| wxCampaign.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | wxCampaign.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<WxCampaign> page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); | final PageInfo<WxCampaign> page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -78,7 +78,7 @@ public class WxCampaignController extends BaseController { | |||||
| wxCampaign.setCouponIds(JSONArray.toJSONString(new String[0])); | wxCampaign.setCouponIds(JSONArray.toJSONString(new String[0])); | ||||
| } | } | ||||
| wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); | wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); | ||||
| wxCampaign.setTenantId(getTenantId()); | |||||
| wxCampaign.updateTenantInfo(getTenantInfo()); | |||||
| wxCampaignService.saveOrUpdate(wxCampaign); | wxCampaignService.saveOrUpdate(wxCampaign); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -89,7 +89,7 @@ public class WxCampaignController extends BaseController { | |||||
| public ResultData addByPath(@RequestBody WxCampaign wxCampaign) { | public ResultData addByPath(@RequestBody WxCampaign wxCampaign) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCampaignController::addByPath"); | logger.debug("[" + getIpAddr() + "] WxCampaignController::addByPath"); | ||||
| wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); | wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); | ||||
| wxCampaign.setTenantId(getTenantId()); | |||||
| wxCampaign.updateTenantInfo(getTenantInfo()); | |||||
| wxCampaignService.addForPath(wxCampaign); | wxCampaignService.addForPath(wxCampaign); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -159,7 +159,7 @@ public class WxCampaignController extends BaseController { | |||||
| WxCampaign wxCampaign = wxCampaignService.getById(id); | WxCampaign wxCampaign = wxCampaignService.getById(id); | ||||
| if (wxCampaign != null) { | if (wxCampaign != null) { | ||||
| WxCouponChannel wxCouponChannel = new WxCouponChannel(); | WxCouponChannel wxCouponChannel = new WxCouponChannel(); | ||||
| wxCouponChannel.setTenantId(getTenantId()); | |||||
| wxCouponChannel.updateTenantInfo(getTenantInfo()); | |||||
| wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); | wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); | ||||
| wxCouponChannel.setSubTargetId(wxCampaign.getId()); | wxCouponChannel.setSubTargetId(wxCampaign.getId()); | ||||
| wxCouponChannel.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); | wxCouponChannel.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); | ||||
| @@ -66,7 +66,7 @@ public class WxCardPayController extends BaseController { | |||||
| wxCardVo.setOuPhone(null); | wxCardVo.setOuPhone(null); | ||||
| } | } | ||||
| } | } | ||||
| wxCardVo.setTenantId(getTenantId()); | |||||
| wxCardVo.updateTenantInfo(getTenantInfo()); | |||||
| if(StringUtils.isNotBlank(wxCardVo.getStatusStr())) { | if(StringUtils.isNotBlank(wxCardVo.getStatusStr())) { | ||||
| String [] statusAttr = wxCardVo.getStatusStr().split(","); | String [] statusAttr = wxCardVo.getStatusStr().split(","); | ||||
| List<Integer> tmpList = new ArrayList<Integer>(); | List<Integer> tmpList = new ArrayList<Integer>(); | ||||
| @@ -93,7 +93,7 @@ public class WxCardPayController extends BaseController { | |||||
| if (wxCardSpendVo == null) { | if (wxCardSpendVo == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); | ||||
| } | } | ||||
| wxCardSpendVo.setTenantId(getTenantId()); | |||||
| wxCardSpendVo.updateTenantInfo(getTenantInfo()); | |||||
| if(StringUtils.isNotBlank(wxCardSpendVo.getPayStatusStr())) { | if(StringUtils.isNotBlank(wxCardSpendVo.getPayStatusStr())) { | ||||
| String [] statusAttr = wxCardSpendVo.getPayStatusStr().split(","); | String [] statusAttr = wxCardSpendVo.getPayStatusStr().split(","); | ||||
| List<Integer> tmpList = new ArrayList<Integer>(); | List<Integer> tmpList = new ArrayList<Integer>(); | ||||
| @@ -117,7 +117,7 @@ public class WxCardPayController extends BaseController { | |||||
| if (wxCardSpend == null) { | if (wxCardSpend == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); | ||||
| } | } | ||||
| wxCardSpend.setTenantId(getTenantId()); | |||||
| wxCardSpend.updateTenantInfo(getTenantInfo()); | |||||
| final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); | final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); | ||||
| return new ResultData(mapList); | return new ResultData(mapList); | ||||
| } | } | ||||
| @@ -130,7 +130,7 @@ public class WxCardPayController extends BaseController { | |||||
| if (wxCardSpendVo == null) { | if (wxCardSpendVo == null) { | ||||
| throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); | throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); | ||||
| } | } | ||||
| wxCardSpendVo.setTenantId(getTenantId()); | |||||
| wxCardSpendVo.updateTenantInfo(getTenantInfo()); | |||||
| if(StringUtils.isNotBlank(wxCardSpendVo.getPayStatusStr())) { | if(StringUtils.isNotBlank(wxCardSpendVo.getPayStatusStr())) { | ||||
| String [] statusAttr = wxCardSpendVo.getPayStatusStr().split(","); | String [] statusAttr = wxCardSpendVo.getPayStatusStr().split(","); | ||||
| List<Integer> tmpList = new ArrayList<Integer>(); | List<Integer> tmpList = new ArrayList<Integer>(); | ||||
| @@ -153,7 +153,7 @@ public class WxCardPayController extends BaseController { | |||||
| if (wxCardSpend == null) { | if (wxCardSpend == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); | ||||
| } | } | ||||
| wxCardSpend.setTenantId(getTenantId()); | |||||
| wxCardSpend.updateTenantInfo(getTenantInfo()); | |||||
| wxCardSpendService.update(wxCardSpend); | wxCardSpendService.update(wxCardSpend); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -188,7 +188,7 @@ public class WxCardPayController extends BaseController { | |||||
| wxCardVo.setOuPhone(null); | wxCardVo.setOuPhone(null); | ||||
| } | } | ||||
| } | } | ||||
| wxCardVo.setTenantId(getTenantId()); | |||||
| wxCardVo.updateTenantInfo(getTenantInfo()); | |||||
| if (StringUtils.isNotBlank(wxCardVo.getStatusStr())) { | if (StringUtils.isNotBlank(wxCardVo.getStatusStr())) { | ||||
| String[] statusAttr = wxCardVo.getStatusStr().split(","); | String[] statusAttr = wxCardVo.getStatusStr().split(","); | ||||
| List<Integer> tmpList = new ArrayList<Integer>(); | List<Integer> tmpList = new ArrayList<Integer>(); | ||||
| @@ -211,7 +211,7 @@ public class WxCardPayController extends BaseController { | |||||
| if (wxCardSpendVo == null) { | if (wxCardSpendVo == null) { | ||||
| wxCardSpendVo = new WxCardSpendVo(); | wxCardSpendVo = new WxCardSpendVo(); | ||||
| } | } | ||||
| wxCardSpendVo.setTenantId(getTenantId()); | |||||
| wxCardSpendVo.updateTenantInfo(getTenantInfo()); | |||||
| if (StringUtils.isNotBlank(wxCardSpendVo.getPayStatusStr())) { | if (StringUtils.isNotBlank(wxCardSpendVo.getPayStatusStr())) { | ||||
| String[] statusAttr = wxCardSpendVo.getPayStatusStr().split(","); | String[] statusAttr = wxCardSpendVo.getPayStatusStr().split(","); | ||||
| List<Integer> tmpList = new ArrayList<Integer>(); | List<Integer> tmpList = new ArrayList<Integer>(); | ||||
| @@ -62,7 +62,7 @@ public class WxCouponChannelController extends BaseController { | |||||
| if (wxCouponChannel.getStatus() != null && wxCouponChannel.getStatus() == -1) { | if (wxCouponChannel.getStatus() != null && wxCouponChannel.getStatus() == -1) { | ||||
| wxCouponChannel.setStatus(null); | wxCouponChannel.setStatus(null); | ||||
| } | } | ||||
| wxCouponChannel.setTenantId(getTenantId()); | |||||
| wxCouponChannel.updateTenantInfo(getTenantInfo()); | |||||
| wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); | wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); | ||||
| final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); | final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -74,7 +74,7 @@ public class WxCouponChannelController extends BaseController { | |||||
| @SystemControllerLog(description = "券投放-更新") | @SystemControllerLog(description = "券投放-更新") | ||||
| public ResultData update(@RequestBody WxCouponChannel wxCouponChannel) { | public ResultData update(@RequestBody WxCouponChannel wxCouponChannel) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCouponChannelController::update"); | logger.debug("[" + getIpAddr() + "] WxCouponChannelController::update"); | ||||
| wxCouponChannel.setTenantId(getTenantId()); | |||||
| wxCouponChannel.updateTenantInfo(getTenantInfo()); | |||||
| ResultData resultData = wxCouponChannelService.saveOrUpdate(wxCouponChannel); | ResultData resultData = wxCouponChannelService.saveOrUpdate(wxCouponChannel); | ||||
| WxCouponChannel couponChannel = (WxCouponChannel)resultData.data; | WxCouponChannel couponChannel = (WxCouponChannel)resultData.data; | ||||
| @@ -121,7 +121,7 @@ public class WxCouponChannelController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxCouponChannelController::findChannelByCouponId"); | logger.debug("[" + getIpAddr() + "] WxCouponChannelController::findChannelByCouponId"); | ||||
| List<Integer> channellist = new ArrayList<>(); | List<Integer> channellist = new ArrayList<>(); | ||||
| WxCouponChannel wxCouponChannel = new WxCouponChannel(); | WxCouponChannel wxCouponChannel = new WxCouponChannel(); | ||||
| wxCouponChannel.setTenantId(getTenantId()); | |||||
| wxCouponChannel.updateTenantInfo(getTenantInfo()); | |||||
| wxCouponChannel.setStatus(0); | wxCouponChannel.setStatus(0); | ||||
| wxCouponChannel.setCouponId(id); | wxCouponChannel.setCouponId(id); | ||||
| List<WxCouponChannel> list = wxCouponChannelService.listAsPage(wxCouponChannel, 1, 5).getList(); | List<WxCouponChannel> list = wxCouponChannelService.listAsPage(wxCouponChannel, 1, 5).getList(); | ||||
| @@ -55,7 +55,7 @@ public class WxCouponController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCouponController::list"); | logger.debug("[" + getIpAddr() + "] WxCouponController::list"); | ||||
| if (wxCoupon == null) wxCoupon = new WxCoupon(); | if (wxCoupon == null) wxCoupon = new WxCoupon(); | ||||
| wxCoupon.setTenantId(getTenantId()); | |||||
| wxCoupon.updateTenantInfo(getTenantInfo()); | |||||
| return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 | return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 | ||||
| } | } | ||||
| @ApiOperation("分页列表接口") | @ApiOperation("分页列表接口") | ||||
| @@ -67,7 +67,7 @@ public class WxCouponController extends BaseController { | |||||
| public ResultData listWithTypePress(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { | public ResultData listWithTypePress(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCouponController::list"); | logger.debug("[" + getIpAddr() + "] WxCouponController::list"); | ||||
| if (wxCoupon == null) wxCoupon = new WxCoupon(); | if (wxCoupon == null) wxCoupon = new WxCoupon(); | ||||
| wxCoupon.setTenantId(getTenantId()); | |||||
| wxCoupon.updateTenantInfo(getTenantInfo()); | |||||
| Integer[] typeArray = { | Integer[] typeArray = { | ||||
| EnumCouponType.COUPON_MANJIAN.getCode(), | EnumCouponType.COUPON_MANJIAN.getCode(), | ||||
| EnumCouponType.COUPON_DAIJIN.getCode(), | EnumCouponType.COUPON_DAIJIN.getCode(), | ||||
| @@ -86,7 +86,7 @@ public class WxCouponController extends BaseController { | |||||
| @SystemControllerLog(description = "券投放-新增") | @SystemControllerLog(description = "券投放-新增") | ||||
| public ResultData add(@RequestBody WxCoupon wxCoupon) { | public ResultData add(@RequestBody WxCoupon wxCoupon) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCouponController::add"); | logger.debug("[" + getIpAddr() + "] WxCouponController::add"); | ||||
| wxCoupon.setTenantId(getTenantId()); | |||||
| wxCoupon.updateTenantInfo(getTenantInfo()); | |||||
| ResultData resultData = wxCouponService.saveOrUpdate(wxCoupon); | ResultData resultData = wxCouponService.saveOrUpdate(wxCoupon); | ||||
| if(resultData.code != 200){ | if(resultData.code != 200){ | ||||
| @@ -120,7 +120,7 @@ public class WxCouponController extends BaseController { | |||||
| return new ResultData(ResultData.ERROR, "有活动正在上架,请先下架。"); | return new ResultData(ResultData.ERROR, "有活动正在上架,请先下架。"); | ||||
| } | } | ||||
| } | } | ||||
| wxCoupon.setTenantId(getTenantId()); | |||||
| wxCoupon.updateTenantInfo(getTenantInfo()); | |||||
| //启动审批流 | //启动审批流 | ||||
| if (wxCoupon.getFlowParams() != null && wxCoupon.getFlowParams().size() > 0) { | if (wxCoupon.getFlowParams() != null && wxCoupon.getFlowParams().size() > 0) { | ||||
| @@ -180,7 +180,7 @@ public class WxCouponController extends BaseController { | |||||
| logger.error("券库存有效期不支持停车券"); | logger.error("券库存有效期不支持停车券"); | ||||
| return new ResultData(ErrorCode.COUPON_STOCK_DATE_NO_CAR); | return new ResultData(ErrorCode.COUPON_STOCK_DATE_NO_CAR); | ||||
| } | } | ||||
| wxCoupon.setTenantId(getTenantId()); | |||||
| wxCoupon.updateTenantInfo(getTenantInfo()); | |||||
| WxCoupon coupon = wxCouponService.findById(wxCoupon); | WxCoupon coupon = wxCouponService.findById(wxCoupon); | ||||
| if(coupon!=null){ | if(coupon!=null){ | ||||
| @@ -337,7 +337,7 @@ public class WxCouponController extends BaseController { | |||||
| @SystemControllerLog(description = "券投放-砍价营销列表") | @SystemControllerLog(description = "券投放-砍价营销列表") | ||||
| public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { | public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { | ||||
| Map<String,Object> result = new HashedMap(); | Map<String,Object> result = new HashedMap(); | ||||
| wxCoupon.setTenantId(getTenantId()); | |||||
| wxCoupon.updateTenantInfo(getTenantInfo()); | |||||
| PageInfo<WxCouponStatisVo> pages = wxCouponService.findPressData(wxCoupon,pageNum,pageSize); | PageInfo<WxCouponStatisVo> pages = wxCouponService.findPressData(wxCoupon,pageNum,pageSize); | ||||
| return new ResultData(pages); | return new ResultData(pages); | ||||
| } | } | ||||
| @@ -345,7 +345,7 @@ public class WxCouponController extends BaseController { | |||||
| @GetMapping("exportCouponPassword") | @GetMapping("exportCouponPassword") | ||||
| @SystemControllerLog(description = "卡券兑换码-导出数据") | @SystemControllerLog(description = "卡券兑换码-导出数据") | ||||
| public void exportCouponPassword(@ModelAttribute WxCouponPassword wxCouponPassword, HttpServletRequest request, HttpServletResponse response) { | public void exportCouponPassword(@ModelAttribute WxCouponPassword wxCouponPassword, HttpServletRequest request, HttpServletResponse response) { | ||||
| wxCouponPassword.setTenantId(getTenantId()); | |||||
| wxCouponPassword.updateTenantInfo(getTenantInfo()); | |||||
| if (wxCouponPassword.getCouponId() == null) { | if (wxCouponPassword.getCouponId() == null) { | ||||
| wxCouponPassword.setCouponId(0L); | wxCouponPassword.setCouponId(0L); | ||||
| } | } | ||||
| @@ -46,7 +46,7 @@ public class WxCouponInjectController extends BaseController { | |||||
| if (couponInject.getStatus() != null && couponInject.getStatus() == -1) { | if (couponInject.getStatus() != null && couponInject.getStatus() == -1) { | ||||
| couponInject.setStatus(null); | couponInject.setStatus(null); | ||||
| } | } | ||||
| couponInject.setTenantId(getTenantId()); | |||||
| couponInject.updateTenantInfo(getTenantInfo()); | |||||
| couponInject.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | couponInject.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<WxCouponInject> page = wxCouponInjectService.listAsPage(couponInject, pageNum, pageSize); | final PageInfo<WxCouponInject> page = wxCouponInjectService.listAsPage(couponInject, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -51,7 +51,7 @@ public class WxCouponOrderController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxCouponOrderBVo wxCouponOrder, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxCouponOrderBVo wxCouponOrder, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCouponOrderController::list"); | logger.debug("[" + getIpAddr() + "] WxCouponOrderController::list"); | ||||
| if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo(); | if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo(); | ||||
| wxCouponOrder.setTenantId(getTenantId()); | |||||
| wxCouponOrder.updateTenantInfo(getTenantInfo()); | |||||
| if (wxCouponOrder.getMerchantName() != null && | if (wxCouponOrder.getMerchantName() != null && | ||||
| wxCouponOrder.getMerchantName().isEmpty()) { | wxCouponOrder.getMerchantName().isEmpty()) { | ||||
| wxCouponOrder.setMerchantName(null); | wxCouponOrder.setMerchantName(null); | ||||
| @@ -94,7 +94,7 @@ public class WxCouponOrderController extends BaseController { | |||||
| } | } | ||||
| WxAppinfo appinfoQ = new WxAppinfo(); | WxAppinfo appinfoQ = new WxAppinfo(); | ||||
| appinfoQ.setTenantId(getTenantId()); | |||||
| appinfoQ.updateTenantInfo(getTenantInfo()); | |||||
| appinfoQ.setType(EnumAppType.B.getCode()); | appinfoQ.setType(EnumAppType.B.getCode()); | ||||
| PageInfo<WxAppinfo> appinfoPageInfo = wxAppinfoService.listAsPage(appinfoQ, 1, 1); | PageInfo<WxAppinfo> appinfoPageInfo = wxAppinfoService.listAsPage(appinfoQ, 1, 1); | ||||
| if (appinfoPageInfo.getList().size() > 0) { | if (appinfoPageInfo.getList().size() > 0) { | ||||
| @@ -120,7 +120,7 @@ public class WxCouponOrderController extends BaseController { | |||||
| public void exportData(@ModelAttribute WxCouponOrderBVo wxCouponOrder, HttpServletRequest request, HttpServletResponse response) { | public void exportData(@ModelAttribute WxCouponOrderBVo wxCouponOrder, HttpServletRequest request, HttpServletResponse response) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCouponOrderController::exportData"); | logger.debug("[" + getIpAddr() + "] WxCouponOrderController::exportData"); | ||||
| if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo(); | if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo(); | ||||
| wxCouponOrder.setTenantId(getTenantId()); | |||||
| wxCouponOrder.updateTenantInfo(getTenantInfo()); | |||||
| if (wxCouponOrder.getMerchantName() != null && | if (wxCouponOrder.getMerchantName() != null && | ||||
| wxCouponOrder.getMerchantName().isEmpty()) { | wxCouponOrder.getMerchantName().isEmpty()) { | ||||
| wxCouponOrder.setMerchantName(null); | wxCouponOrder.setMerchantName(null); | ||||
| @@ -40,7 +40,7 @@ public class WxCouponPasswordController extends BaseController { | |||||
| @SystemControllerLog(description = "列表") | @SystemControllerLog(description = "列表") | ||||
| public ResultData list(@ModelAttribute WxCouponPassword wxCouponPassword, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxCouponPassword wxCouponPassword, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCouponPasswordController::list"); | logger.debug("[" + getIpAddr() + "] WxCouponPasswordController::list"); | ||||
| wxCouponPassword.setTenantId(getTenantId()); | |||||
| wxCouponPassword.updateTenantInfo(getTenantInfo()); | |||||
| wxCouponPassword.setSortColumns(BaseEntity.SortField.CreateDate_DESC, BaseEntity.SortField.Id_DESC); | wxCouponPassword.setSortColumns(BaseEntity.SortField.CreateDate_DESC, BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<WxCouponPassword> page = wxCouponPasswordService.listAsPage(wxCouponPassword, pageNum, pageSize); | final PageInfo<WxCouponPassword> page = wxCouponPasswordService.listAsPage(wxCouponPassword, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -54,7 +54,7 @@ public class WxCouponPasswordController extends BaseController { | |||||
| @SystemControllerLog(description = "可发送卡数据") | @SystemControllerLog(description = "可发送卡数据") | ||||
| public ResultData findCouponList(@ModelAttribute WxCouponPassword wxCouponPassword, Integer pageNum, Integer pageSize) { | public ResultData findCouponList(@ModelAttribute WxCouponPassword wxCouponPassword, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCouponPasswordController::findCouponList"); | logger.debug("[" + getIpAddr() + "] WxCouponPasswordController::findCouponList"); | ||||
| wxCouponPassword.setTenantId(getTenantId()); | |||||
| wxCouponPassword.updateTenantInfo(getTenantInfo()); | |||||
| final PageInfo<WxCouponPasswordCountInfoVO> page = wxCouponPasswordService.findCouponList(wxCouponPassword, pageNum, pageSize); | final PageInfo<WxCouponPasswordCountInfoVO> page = wxCouponPasswordService.findCouponList(wxCouponPassword, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -58,7 +58,7 @@ public class WxCouponPresentController extends BaseController { | |||||
| @SystemControllerLog(description = "列表") | @SystemControllerLog(description = "列表") | ||||
| public ResultData list(@ModelAttribute WxCouponPresent wxCouponPresent, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxCouponPresent wxCouponPresent, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCouponPresentController::list"); | logger.debug("[" + getIpAddr() + "] WxCouponPresentController::list"); | ||||
| wxCouponPresent.setTenantId(getTenantId()); | |||||
| wxCouponPresent.updateTenantInfo(getTenantInfo()); | |||||
| wxCouponPresent.setSortColumns(BaseEntity.SortField.CreateTime_DESC, BaseEntity.SortField.Id_DESC); | wxCouponPresent.setSortColumns(BaseEntity.SortField.CreateTime_DESC, BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<WxCouponPresent> page = wxCouponPresentService.listAsPage(wxCouponPresent, pageNum, pageSize); | final PageInfo<WxCouponPresent> page = wxCouponPresentService.listAsPage(wxCouponPresent, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -35,7 +35,7 @@ public class WxCouponSendConfigController extends BaseController { | |||||
| if (wxCouponSendConfig == null || wxCouponSendConfig.getSendType() == null) | if (wxCouponSendConfig == null || wxCouponSendConfig.getSendType() == null) | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| wxCouponSendConfig.setTenantId(getTenantId()); | |||||
| wxCouponSendConfig.updateTenantInfo(getTenantInfo()); | |||||
| PageInfo<WxCouponSendConfig> page = wxCouponSendConfigService.listAsPage(wxCouponSendConfig, 1, 1); | PageInfo<WxCouponSendConfig> page = wxCouponSendConfigService.listAsPage(wxCouponSendConfig, 1, 1); | ||||
| if (page.getSize() > 0) { | if (page.getSize() > 0) { | ||||
| return new ResultData(page.getList().get(0)); | return new ResultData(page.getList().get(0)); | ||||
| @@ -62,7 +62,7 @@ public class WxCouponSendConfigController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| if (wxCouponSendConfig.getValue() == null) | if (wxCouponSendConfig.getValue() == null) | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| wxCouponSendConfig.setTenantId(getTenantId()); | |||||
| wxCouponSendConfig.updateTenantInfo(getTenantInfo()); | |||||
| wxCouponSendConfig.setUpdateTime(new Date()); | wxCouponSendConfig.setUpdateTime(new Date()); | ||||
| wxCouponSendConfigService.update(wxCouponSendConfig); | wxCouponSendConfigService.update(wxCouponSendConfig); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| @@ -53,7 +53,7 @@ public class WxCouponSendController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxCouponSend wxCouponSend, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxCouponSend wxCouponSend, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCouponSendController::list"); | logger.debug("[" + getIpAddr() + "] WxCouponSendController::list"); | ||||
| if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); | if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); | ||||
| wxCouponSend.setTenantId(getTenantId()); | |||||
| wxCouponSend.updateTenantInfo(getTenantInfo()); | |||||
| // if (Objects.equals(EnumCouponSendSendType.MERCHANT.getCode(), wxCouponSend.getSendType())) { | // if (Objects.equals(EnumCouponSendSendType.MERCHANT.getCode(), wxCouponSend.getSendType())) { | ||||
| // if (Objects.nonNull(wxCouponSend.getStatus())) { | // if (Objects.nonNull(wxCouponSend.getStatus())) { | ||||
| @@ -135,7 +135,7 @@ public class WxCouponSendController extends BaseController { | |||||
| // @SystemControllerLog(description = "注券-更新") | // @SystemControllerLog(description = "注券-更新") | ||||
| // public ResultData update(@RequestBody WxCouponSend wxCouponSend) { | // public ResultData update(@RequestBody WxCouponSend wxCouponSend) { | ||||
| // logger.debug("[" + getIpAddr() + "] WxCouponSendController::update"); | // logger.debug("[" + getIpAddr() + "] WxCouponSendController::update"); | ||||
| // wxCouponSend.setTenantId(getTenantId()); | |||||
| // wxCouponSend.updateTenantInfo(getTenantInfo()); | |||||
| // wxCouponSendService.saveOrUpdate(wxCouponSend); | // wxCouponSendService.saveOrUpdate(wxCouponSend); | ||||
| // return new ResultData(); | // return new ResultData(); | ||||
| // } | // } | ||||
| @@ -41,7 +41,7 @@ public class WxFloatingLayerController extends BaseController { | |||||
| @SystemControllerLog(description = "列表") | @SystemControllerLog(description = "列表") | ||||
| public ResultData list(@ModelAttribute WxFloatingLayer wxFloatingLayer, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxFloatingLayer wxFloatingLayer, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxFloatingLayerController::list"); | logger.debug("[" + getIpAddr() + "] WxFloatingLayerController::list"); | ||||
| wxFloatingLayer.setTenantId(getTenantId()); | |||||
| wxFloatingLayer.updateTenantInfo(getTenantInfo()); | |||||
| wxFloatingLayer.setSortColumns(BaseEntity.SortField.CreateTime_DESC, BaseEntity.SortField.Id_DESC); | wxFloatingLayer.setSortColumns(BaseEntity.SortField.CreateTime_DESC, BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<WxFloatingLayerVO> page = wxFloatingLayerService.listAsPage(wxFloatingLayer, pageNum, pageSize); | final PageInfo<WxFloatingLayerVO> page = wxFloatingLayerService.listAsPage(wxFloatingLayer, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -53,7 +53,7 @@ public class WxFloatingLayerController extends BaseController { | |||||
| public ResultData add(@RequestBody WxFloatingLayer wxFloatingLayer) { | public ResultData add(@RequestBody WxFloatingLayer wxFloatingLayer) { | ||||
| logger.debug("[" + getIpAddr() + "] WxFloatingLayerController::add"); | logger.debug("[" + getIpAddr() + "] WxFloatingLayerController::add"); | ||||
| wxFloatingLayer.setStatus(EnumFloatingLayerStatus.STATUS_THROW_IN.getCode()); | wxFloatingLayer.setStatus(EnumFloatingLayerStatus.STATUS_THROW_IN.getCode()); | ||||
| wxFloatingLayer.setTenantId(getTenantId()); | |||||
| wxFloatingLayer.updateTenantInfo(getTenantInfo()); | |||||
| try { | try { | ||||
| return wxFloatingLayerService.saveOrUpdate(wxFloatingLayer); | return wxFloatingLayerService.saveOrUpdate(wxFloatingLayer); | ||||
| } catch (MallinkException e) { | } catch (MallinkException e) { | ||||
| @@ -38,7 +38,7 @@ public class WxGameController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxGame wxGame, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxGame wxGame, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxGameController::list"); | logger.debug("[" + getIpAddr() + "] WxGameController::list"); | ||||
| if (null == wxGame) wxGame = new WxGame(); | if (null == wxGame) wxGame = new WxGame(); | ||||
| wxGame.setTenantId(getTenantId()); | |||||
| wxGame.updateTenantInfo(getTenantInfo()); | |||||
| wxGame.setSortColumns(BaseEntity.SortField.Id_DESC); | wxGame.setSortColumns(BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<WxGame> page = wxGameService.listAsPage(wxGame, pageNum, pageSize); | final PageInfo<WxGame> page = wxGameService.listAsPage(wxGame, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -55,7 +55,7 @@ public class WxGameController extends BaseController { | |||||
| wxGame.setCouponIds(JSONArray.toJSONString(new String[0])); | wxGame.setCouponIds(JSONArray.toJSONString(new String[0])); | ||||
| } | } | ||||
| wxGame.setStatus(EnumGameStatus.STATUS_THROW_IN.getCode()); | wxGame.setStatus(EnumGameStatus.STATUS_THROW_IN.getCode()); | ||||
| wxGame.setTenantId(getTenantId()); | |||||
| wxGame.updateTenantInfo(getTenantInfo()); | |||||
| wxGameService.saveOrUpdate(wxGame); | wxGameService.saveOrUpdate(wxGame); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -68,7 +68,7 @@ public class WxGameController extends BaseController { | |||||
| if (StringUtils.isBlank(wxGame.getCouponIds())) { | if (StringUtils.isBlank(wxGame.getCouponIds())) { | ||||
| wxGame.setCouponIds(JSONArray.toJSONString(new String[0])); | wxGame.setCouponIds(JSONArray.toJSONString(new String[0])); | ||||
| } | } | ||||
| wxGame.setTenantId(getTenantId()); | |||||
| wxGame.updateTenantInfo(getTenantInfo()); | |||||
| wxGameService.saveOrUpdate(wxGame); | wxGameService.saveOrUpdate(wxGame); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -32,7 +32,7 @@ public class WxMerchantMicroPayController extends BaseController { | |||||
| public ResultData listMonth() { | public ResultData listMonth() { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::listMonth"); | logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::listMonth"); | ||||
| WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); | WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); | ||||
| wxOrderReportDto.setTenantId(getTenantId()); | |||||
| wxOrderReportDto.updateTenantInfo(getTenantInfo()); | |||||
| wxOrderReportDto.setType(EnumOrderType.MICROPAY.getCode()); | wxOrderReportDto.setType(EnumOrderType.MICROPAY.getCode()); | ||||
| wxOrderReportDto.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | wxOrderReportDto.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | ||||
| return new ResultData(markingDataReportService.listOrderReportByDate(wxOrderReportDto)); | return new ResultData(markingDataReportService.listOrderReportByDate(wxOrderReportDto)); | ||||
| @@ -45,7 +45,7 @@ public class WxMerchantMicroPayController extends BaseController { | |||||
| public ResultData detail(@RequestParam Long merchantId) { | public ResultData detail(@RequestParam Long merchantId) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::detail"); | logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::detail"); | ||||
| WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); | WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); | ||||
| wxOrderReportDto.setTenantId(getTenantId()); | |||||
| wxOrderReportDto.updateTenantInfo(getTenantInfo()); | |||||
| wxOrderReportDto.setMerchantId(merchantId); | wxOrderReportDto.setMerchantId(merchantId); | ||||
| return new ResultData(markingDataReportService.listMicroPayOrderReportByDateAndMerchant(wxOrderReportDto)); | return new ResultData(markingDataReportService.listMicroPayOrderReportByDateAndMerchant(wxOrderReportDto)); | ||||
| } | } | ||||
| @@ -57,7 +57,7 @@ public class WxMerchantMicroPayController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday"); | logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday"); | ||||
| if (wxOrderReportDto == null) | if (wxOrderReportDto == null) | ||||
| wxOrderReportDto = new WxOrderReportDto(); | wxOrderReportDto = new WxOrderReportDto(); | ||||
| wxOrderReportDto.setTenantId(getTenantId()); | |||||
| wxOrderReportDto.updateTenantInfo(getTenantInfo()); | |||||
| final PageInfo<WxMerchantMicroPayVo> page = markingDataReportService.listMerchantMicroPayOrderReportByDate(wxOrderReportDto, pageNum, pageSize); | final PageInfo<WxMerchantMicroPayVo> page = markingDataReportService.listMerchantMicroPayOrderReportByDate(wxOrderReportDto, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -39,7 +39,7 @@ public class WxMerchantPowerBillConfigController extends BaseController { | |||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | ||||
| public ResultData findCouponDataList(@ModelAttribute WxMerchantPowerBillConfig wxMerchantPowerBillConfig, Integer pageNum, Integer pageSize) { | public ResultData findCouponDataList(@ModelAttribute WxMerchantPowerBillConfig wxMerchantPowerBillConfig, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantPowerBillConfigController::list"); | logger.debug("[" + getIpAddr() + "] WxMerchantPowerBillConfigController::list"); | ||||
| wxMerchantPowerBillConfig.setTenantId(getTenantId()); | |||||
| wxMerchantPowerBillConfig.updateTenantInfo(getTenantInfo()); | |||||
| wxMerchantPowerBillConfig.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | wxMerchantPowerBillConfig.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | ||||
| final PageInfo<WxMerchantPowerBillConfig> page = wxMerchantPowerBillConfigService.listAsPage(wxMerchantPowerBillConfig, pageNum, pageSize); | final PageInfo<WxMerchantPowerBillConfig> page = wxMerchantPowerBillConfigService.listAsPage(wxMerchantPowerBillConfig, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -45,7 +45,7 @@ public class WxMerchantSubsidyController extends BaseController { | |||||
| if (wxMerchantSubsidy == null) { | if (wxMerchantSubsidy == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); | ||||
| } | } | ||||
| wxMerchantSubsidy.setTenantId(getTenantId()); | |||||
| wxMerchantSubsidy.updateTenantInfo(getTenantInfo()); | |||||
| if(StringUtils.isNotBlank(wxMerchantSubsidy.getStatusStr())) { | if(StringUtils.isNotBlank(wxMerchantSubsidy.getStatusStr())) { | ||||
| String [] statusAttr = wxMerchantSubsidy.getStatusStr().split(","); | String [] statusAttr = wxMerchantSubsidy.getStatusStr().split(","); | ||||
| List<Integer> tmpList = new ArrayList<Integer>(); | List<Integer> tmpList = new ArrayList<Integer>(); | ||||
| @@ -72,7 +72,7 @@ public class WxMerchantSubsidyController extends BaseController { | |||||
| if (wxMerchantSubsidy == null) { | if (wxMerchantSubsidy == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); | ||||
| } | } | ||||
| wxMerchantSubsidy.setTenantId(getTenantId()); | |||||
| wxMerchantSubsidy.updateTenantInfo(getTenantInfo()); | |||||
| if(StringUtils.isNotBlank(wxMerchantSubsidy.getStatusStr())) { | if(StringUtils.isNotBlank(wxMerchantSubsidy.getStatusStr())) { | ||||
| String [] statusAttr = wxMerchantSubsidy.getStatusStr().split(","); | String [] statusAttr = wxMerchantSubsidy.getStatusStr().split(","); | ||||
| List<Integer> tmpList = new ArrayList<Integer>(); | List<Integer> tmpList = new ArrayList<Integer>(); | ||||
| @@ -96,7 +96,7 @@ public class WxMerchantSubsidyController extends BaseController { | |||||
| if (null == wxMerchantSubsidy) { | if (null == wxMerchantSubsidy) { | ||||
| wxMerchantSubsidy = new WxMerchantSubsidyVo(); | wxMerchantSubsidy = new WxMerchantSubsidyVo(); | ||||
| } | } | ||||
| wxMerchantSubsidy.setTenantId(getTenantId()); | |||||
| wxMerchantSubsidy.updateTenantInfo(getTenantInfo()); | |||||
| Map<String, Long> data = wxMerchantSubsidyService.summary(wxMerchantSubsidy); | Map<String, Long> data = wxMerchantSubsidyService.summary(wxMerchantSubsidy); | ||||
| return new ResultData(data); | return new ResultData(data); | ||||
| } | } | ||||
| @@ -110,7 +110,7 @@ public class WxMerchantSubsidyController extends BaseController { | |||||
| if (wxMerchantSubsidy == null) { | if (wxMerchantSubsidy == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); | ||||
| } | } | ||||
| wxMerchantSubsidy.setTenantId(getTenantId()); | |||||
| wxMerchantSubsidy.updateTenantInfo(getTenantInfo()); | |||||
| wxMerchantSubsidy.setStatus(EnumMerchantSubsidyStatus.MANUAL_SUBSIDIED.getCode()); | wxMerchantSubsidy.setStatus(EnumMerchantSubsidyStatus.MANUAL_SUBSIDIED.getCode()); | ||||
| wxMerchantSubsidy.setUpdateDate(new Date()); | wxMerchantSubsidy.setUpdateDate(new Date()); | ||||
| if(StringUtils.isNotBlank(wxMerchantSubsidy.getIdStr())) { | if(StringUtils.isNotBlank(wxMerchantSubsidy.getIdStr())) { | ||||
| @@ -134,7 +134,7 @@ public class WxMerchantSubsidyController extends BaseController { | |||||
| if (wxMerchantSubsidy == null) { | if (wxMerchantSubsidy == null) { | ||||
| throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件不能为空"); | throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件不能为空"); | ||||
| } | } | ||||
| wxMerchantSubsidy.setTenantId(getTenantId()); | |||||
| wxMerchantSubsidy.updateTenantInfo(getTenantInfo()); | |||||
| if(StringUtils.isNotBlank(wxMerchantSubsidy.getStatusStr())) { | if(StringUtils.isNotBlank(wxMerchantSubsidy.getStatusStr())) { | ||||
| String [] statusAttr = wxMerchantSubsidy.getStatusStr().split(","); | String [] statusAttr = wxMerchantSubsidy.getStatusStr().split(","); | ||||
| List<Integer> tmpList = new ArrayList<Integer>(); | List<Integer> tmpList = new ArrayList<Integer>(); | ||||
| @@ -70,7 +70,7 @@ public class WxOrderController extends BaseController { | |||||
| if (null == wxOrder) { | if (null == wxOrder) { | ||||
| wxOrder = new WxOrder(); | wxOrder = new WxOrder(); | ||||
| } | } | ||||
| wxOrder.setTenantId(getTenantId()); | |||||
| wxOrder.updateTenantInfo(getTenantInfo()); | |||||
| wxOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); | wxOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<WxOrder> page = wxOrderService.listAsPage(wxOrder, pageNum, pageSize); | final PageInfo<WxOrder> page = wxOrderService.listAsPage(wxOrder, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -128,7 +128,7 @@ public class WxOrderController extends BaseController { | |||||
| if (null == wxOrderQueryVo) { | if (null == wxOrderQueryVo) { | ||||
| wxOrderQueryVo = new WxOrderQueryVo(); | wxOrderQueryVo = new WxOrderQueryVo(); | ||||
| } | } | ||||
| wxOrderQueryVo.setTenantId(getTenantId()); | |||||
| wxOrderQueryVo.updateTenantInfo(getTenantInfo()); | |||||
| final PageInfo<WxOrder> page = wxOrderService.listOrderAsPage(wxOrderQueryVo, pageNum, pageSize); | final PageInfo<WxOrder> page = wxOrderService.listOrderAsPage(wxOrderQueryVo, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -222,7 +222,7 @@ public class WxOrderController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxOrderController::detail"); | logger.debug("[" + getIpAddr() + "] WxOrderController::detail"); | ||||
| WxOrder order = new WxOrder(); | WxOrder order = new WxOrder(); | ||||
| order.setId(id); | order.setId(id); | ||||
| order.setTenantId(getTenantId()); | |||||
| order.updateTenantInfo(getTenantInfo()); | |||||
| return new ResultData(Result.SUCCESS, "查询成功", wxOrderService.detailCUserVo(order)); | return new ResultData(Result.SUCCESS, "查询成功", wxOrderService.detailCUserVo(order)); | ||||
| } | } | ||||
| @@ -234,7 +234,7 @@ public class WxOrderController extends BaseController { | |||||
| if (null == wxOrderQueryVo) { | if (null == wxOrderQueryVo) { | ||||
| wxOrderQueryVo = new WxOrderQueryVo(); | wxOrderQueryVo = new WxOrderQueryVo(); | ||||
| } | } | ||||
| wxOrderQueryVo.setTenantId(getTenantId()); | |||||
| wxOrderQueryVo.updateTenantInfo(getTenantInfo()); | |||||
| Map<String, Long> data = wxOrderService.summary(wxOrderQueryVo); | Map<String, Long> data = wxOrderService.summary(wxOrderQueryVo); | ||||
| return new ResultData(data); | return new ResultData(data); | ||||
| } | } | ||||
| @@ -247,7 +247,7 @@ public class WxOrderController extends BaseController { | |||||
| if (null == wxOrderQueryVo) { | if (null == wxOrderQueryVo) { | ||||
| wxOrderQueryVo = new WxOrderQueryVo(); | wxOrderQueryVo = new WxOrderQueryVo(); | ||||
| } | } | ||||
| wxOrderQueryVo.setTenantId(getTenantId()); | |||||
| wxOrderQueryVo.updateTenantInfo(getTenantInfo()); | |||||
| wxOrderService.exportData(wxOrderQueryVo, request, response); | wxOrderService.exportData(wxOrderQueryVo, request, response); | ||||
| } | } | ||||
| @@ -36,7 +36,7 @@ public class WxOrderGroupController extends BaseController { | |||||
| }) | }) | ||||
| @SystemControllerLog(description = "订单管理-拼团营销分析") | @SystemControllerLog(description = "订单管理-拼团营销分析") | ||||
| public ResultData queryOrderGroupMarketingList(@ModelAttribute WxOrderGroupMarketing wxOrderGroupMarketing, Integer pageNum, Integer pageSize) { | public ResultData queryOrderGroupMarketingList(@ModelAttribute WxOrderGroupMarketing wxOrderGroupMarketing, Integer pageNum, Integer pageSize) { | ||||
| wxOrderGroupMarketing.setTenantId(getTenantId()); | |||||
| wxOrderGroupMarketing.updateTenantInfo(getTenantInfo()); | |||||
| final PageInfo<WxOrderGroupMarketing> page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing, pageNum, pageSize); | final PageInfo<WxOrderGroupMarketing> page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -39,7 +39,7 @@ public class WxPowerBillAutoConfigController extends BaseController { | |||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | ||||
| public ResultData findCouponDataList(@ModelAttribute WxPowerBillAutoConfig wxPowerBillAutoConfig, Integer pageNum, Integer pageSize) { | public ResultData findCouponDataList(@ModelAttribute WxPowerBillAutoConfig wxPowerBillAutoConfig, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxPowerBillAutoConfigController::list"); | logger.debug("[" + getIpAddr() + "] WxPowerBillAutoConfigController::list"); | ||||
| wxPowerBillAutoConfig.setTenantId(getTenantId()); | |||||
| wxPowerBillAutoConfig.updateTenantInfo(getTenantInfo()); | |||||
| wxPowerBillAutoConfig.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | wxPowerBillAutoConfig.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | ||||
| final PageInfo<WxPowerBillAutoConfig> page = wxPowerBillAutoConfigService.listAsPage(wxPowerBillAutoConfig, pageNum, pageSize); | final PageInfo<WxPowerBillAutoConfig> page = wxPowerBillAutoConfigService.listAsPage(wxPowerBillAutoConfig, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -68,7 +68,7 @@ public class WxPrepaymentController extends BaseController { | |||||
| @SystemControllerLog(description = "预付费-交费") | @SystemControllerLog(description = "预付费-交费") | ||||
| public ResultData payFirst(@RequestBody WxPrepayment wxPrepayment) { | public ResultData payFirst(@RequestBody WxPrepayment wxPrepayment) { | ||||
| logger.debug("[" + getIpAddr() + "] prepayment::add"); | logger.debug("[" + getIpAddr() + "] prepayment::add"); | ||||
| wxPrepayment.setTenantId(getTenantId()); | |||||
| wxPrepayment.updateTenantInfo(getTenantInfo()); | |||||
| wxPrepayment.setOperationType(EnumUserType.MALLUSER.getCode()); | wxPrepayment.setOperationType(EnumUserType.MALLUSER.getCode()); | ||||
| wxPrepayment.setOperator(getUserId()); | wxPrepayment.setOperator(getUserId()); | ||||
| wxPrepaymentService.payFirst(wxPrepayment); | wxPrepaymentService.payFirst(wxPrepayment); | ||||
| @@ -80,7 +80,7 @@ public class WxPrepaymentController extends BaseController { | |||||
| @SystemControllerLog(description = "预付费-交费或扣费") | @SystemControllerLog(description = "预付费-交费或扣费") | ||||
| public ResultData payAgain(@RequestBody WxPrepayment wxPrepayment) { | public ResultData payAgain(@RequestBody WxPrepayment wxPrepayment) { | ||||
| logger.debug("[" + getIpAddr() + "] prepayment::update"); | logger.debug("[" + getIpAddr() + "] prepayment::update"); | ||||
| wxPrepayment.setTenantId(getTenantId()); | |||||
| wxPrepayment.updateTenantInfo(getTenantInfo()); | |||||
| wxPrepayment.setOperationType(EnumUserType.MALLUSER.getCode()); | wxPrepayment.setOperationType(EnumUserType.MALLUSER.getCode()); | ||||
| wxPrepayment.setOperator(getUserId()); | wxPrepayment.setOperator(getUserId()); | ||||
| wxPrepaymentService.payAgain(wxPrepayment); | wxPrepaymentService.payAgain(wxPrepayment); | ||||
| @@ -37,8 +37,8 @@ public class WxQuestionController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxQuestionController::getQuestionConfig"); | logger.debug("[" + getIpAddr() + "] WxQuestionController::getQuestionConfig"); | ||||
| WxQuestionConfig wxQuestionConfig = new WxQuestionConfig(); | WxQuestionConfig wxQuestionConfig = new WxQuestionConfig(); | ||||
| WxQuestion wxQuestion = new WxQuestion(); | WxQuestion wxQuestion = new WxQuestion(); | ||||
| wxQuestionConfig.setTenantId(getTenantId()); | |||||
| wxQuestion.setTenantId(getTenantId()); | |||||
| wxQuestionConfig.updateTenantInfo(getTenantInfo()); | |||||
| wxQuestion.updateTenantInfo(getTenantInfo()); | |||||
| List<WxQuestionConfig> list = wxQuestionService.findConfigList(wxQuestionConfig); | List<WxQuestionConfig> list = wxQuestionService.findConfigList(wxQuestionConfig); | ||||
| if (list.size() > 0) { | if (list.size() > 0) { | ||||
| @@ -79,7 +79,7 @@ public class WxQuestionController extends BaseController { | |||||
| } | } | ||||
| wxQuestionConfig.setQuestionList(JSONObject.toJSONString(qs)); | wxQuestionConfig.setQuestionList(JSONObject.toJSONString(qs)); | ||||
| wxQuestionConfig.setCouponTypeList(JSONObject.toJSONString(ct)); | wxQuestionConfig.setCouponTypeList(JSONObject.toJSONString(ct)); | ||||
| wxQuestionConfig.setTenantId(getTenantId()); | |||||
| wxQuestionConfig.updateTenantInfo(getTenantInfo()); | |||||
| wxQuestionService.saveOrUpdateConfig(wxQuestionConfig); | wxQuestionService.saveOrUpdateConfig(wxQuestionConfig); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -181,11 +181,11 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(), "手机号已存在"); | return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(), "手机号已存在"); | ||||
| } | } | ||||
| } | } | ||||
| wxCUserBasicInfo.setTenantId(getTenantId()); | |||||
| wxCUserBasicInfo.updateTenantInfo(getTenantInfo()); | |||||
| if (StringUtils.isNotBlank(wxCUserBasicInfo.getTagIds())) { | if (StringUtils.isNotBlank(wxCUserBasicInfo.getTagIds())) { | ||||
| WxCUserTags record = new WxCUserTags(); | WxCUserTags record = new WxCUserTags(); | ||||
| record.setUserId(oldInfo.getId()); | record.setUserId(oldInfo.getId()); | ||||
| record.setTenantId(getTenantId()); | |||||
| record.updateTenantInfo(getTenantInfo()); | |||||
| PageInfo<WxCUserTags> page = wxCUserTagsService.listAsPage(record, 1, 1); | PageInfo<WxCUserTags> page = wxCUserTagsService.listAsPage(record, 1, 1); | ||||
| if (page.getSize() > 0) { | if (page.getSize() > 0) { | ||||
| WxCUserTags t = page.getList().get(0); | WxCUserTags t = page.getList().get(0); | ||||
| @@ -240,7 +240,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::findOrderCouponByUserId"); | logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::findOrderCouponByUserId"); | ||||
| WxCouponOrder corder = new WxCouponOrder(); | WxCouponOrder corder = new WxCouponOrder(); | ||||
| corder.setCUserId(userId); | corder.setCUserId(userId); | ||||
| corder.setTenantId(getTenantId()); | |||||
| corder.updateTenantInfo(getTenantInfo()); | |||||
| corder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | corder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | ||||
| PageInfo<WxCouponOrder> page = wxCouponOrderService.listAsPage(corder, pageNum, pageSize); | PageInfo<WxCouponOrder> page = wxCouponOrderService.listAsPage(corder, pageNum, pageSize); | ||||
| if (page.getSize() > 0) { | if (page.getSize() > 0) { | ||||
| @@ -270,7 +270,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::exportOrderCouponByUserId"); | logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::exportOrderCouponByUserId"); | ||||
| WxCouponOrder corder = new WxCouponOrder(); | WxCouponOrder corder = new WxCouponOrder(); | ||||
| corder.setCUserId(userId); | corder.setCUserId(userId); | ||||
| corder.setTenantId(getTenantId()); | |||||
| corder.updateTenantInfo(getTenantInfo()); | |||||
| corder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | corder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | ||||
| PageInfo<WxCouponOrder> page = wxCouponOrderService.listAsPage(corder, 1, Integer.MAX_VALUE); | PageInfo<WxCouponOrder> page = wxCouponOrderService.listAsPage(corder, 1, Integer.MAX_VALUE); | ||||
| if (page.getSize() > 0) { | if (page.getSize() > 0) { | ||||
| @@ -315,7 +315,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| } | } | ||||
| } | } | ||||
| basicInfo.setTenantId(getTenantId()); | |||||
| basicInfo.updateTenantInfo(getTenantInfo()); | |||||
| int exportDataCount = wxCUserBasicInfoService.exportDataCount(basicInfo); | int exportDataCount = wxCUserBasicInfoService.exportDataCount(basicInfo); | ||||
| return new ResultData(exportDataCount); | return new ResultData(exportDataCount); | ||||
| @@ -338,7 +338,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| } | } | ||||
| } | } | ||||
| basicInfo.setTenantId(getTenantId()); | |||||
| basicInfo.updateTenantInfo(getTenantInfo()); | |||||
| wxCUserBasicInfoService.exportData(basicInfo, request, response); | wxCUserBasicInfoService.exportData(basicInfo, request, response); | ||||
| } | } | ||||
| @@ -508,7 +508,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| @SystemControllerLog(description = "会员管理-停车会员记录导出") | @SystemControllerLog(description = "会员管理-停车会员记录导出") | ||||
| public void exportCarPayData(@ModelAttribute WxCarPayRecord record,HttpServletRequest request, HttpServletResponse response) { | public void exportCarPayData(@ModelAttribute WxCarPayRecord record,HttpServletRequest request, HttpServletResponse response) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::exportData"); | logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::exportData"); | ||||
| record.setTenantId(getTenantId()); | |||||
| record.updateTenantInfo(getTenantInfo()); | |||||
| wxCUserBasicInfoService.exportCarPayData(record, request, response); | wxCUserBasicInfoService.exportCarPayData(record, request, response); | ||||
| } | } | ||||
| @@ -58,7 +58,7 @@ public class WxCUserDataController extends BaseController { | |||||
| public ResultData findUserCountData() { | public ResultData findUserCountData() { | ||||
| logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserCountData"); | logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserCountData"); | ||||
| WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | ||||
| dto.setTenantId(getTenantId()); | |||||
| dto.updateTenantInfo(getTenantInfo()); | |||||
| long allCount = wxCUserService.findCount(dto);//总数 | long allCount = wxCUserService.findCount(dto);//总数 | ||||
| Calendar c = Calendar.getInstance(); | Calendar c = Calendar.getInstance(); | ||||
| c.set(Calendar.HOUR_OF_DAY, 0); | c.set(Calendar.HOUR_OF_DAY, 0); | ||||
| @@ -138,7 +138,7 @@ public class WxCUserDataController extends BaseController { | |||||
| //Date startDate = DateUtils.getDateFromString(startdate + " 00:00:00","yyyy-MM-dd HH:mm:ss").getTime(); | //Date startDate = DateUtils.getDateFromString(startdate + " 00:00:00","yyyy-MM-dd HH:mm:ss").getTime(); | ||||
| //Date endDate = DateUtils.getDateFromString(systemTime + " 23:59:59","yyyy-MM-dd HH:mm:ss").getTime(); | //Date endDate = DateUtils.getDateFromString(systemTime + " 23:59:59","yyyy-MM-dd HH:mm:ss").getTime(); | ||||
| WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); | ||||
| wxCUserBasicInfoDto.setTenantId(getTenantId()); | |||||
| wxCUserBasicInfoDto.updateTenantInfo(getTenantInfo()); | |||||
| wxCUserBasicInfoDto.setStartTime(null); | wxCUserBasicInfoDto.setStartTime(null); | ||||
| wxCUserBasicInfoDto.setEndTime(null); | wxCUserBasicInfoDto.setEndTime(null); | ||||
| map.put("growCount", wxCUserBasicInfoService.findGrowUserCount(wxCUserBasicInfoDto)); | map.put("growCount", wxCUserBasicInfoService.findGrowUserCount(wxCUserBasicInfoDto)); | ||||
| @@ -167,7 +167,7 @@ public class WxCUserDataController extends BaseController { | |||||
| params.put("endTime", endTime); | params.put("endTime", endTime); | ||||
| params.put("tenantId", getTenantId()); | params.put("tenantId", getTenantId()); | ||||
| MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); | MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); | ||||
| markingCouponDataReportDto.setTenantId(getTenantId()); | |||||
| markingCouponDataReportDto.updateTenantInfo(getTenantInfo()); | |||||
| markingCouponDataReportDto.setStartTime(startTime); | markingCouponDataReportDto.setStartTime(startTime); | ||||
| markingCouponDataReportDto.setEndTime(endTime); | markingCouponDataReportDto.setEndTime(endTime); | ||||
| List<TouchUsersReportVo> list = wxUserVisitService.touchUsersReportList(markingCouponDataReportDto); | List<TouchUsersReportVo> list = wxUserVisitService.touchUsersReportList(markingCouponDataReportDto); | ||||
| @@ -110,7 +110,7 @@ public class WxCreditHistoryController extends BaseController { | |||||
| @GetMapping("exportData") | @GetMapping("exportData") | ||||
| @SystemControllerLog(description = "积分历史-导出数据") | @SystemControllerLog(description = "积分历史-导出数据") | ||||
| public void exportData(@ModelAttribute WxCreditHistory wxCreditHistory, HttpServletRequest request, HttpServletResponse response) { | public void exportData(@ModelAttribute WxCreditHistory wxCreditHistory, HttpServletRequest request, HttpServletResponse response) { | ||||
| wxCreditHistory.setTenantId(getTenantId()); | |||||
| wxCreditHistory.updateTenantInfo(getTenantInfo()); | |||||
| wxCreditHistoryService.exportData(request, response, wxCreditHistory); | wxCreditHistoryService.exportData(request, response, wxCreditHistory); | ||||
| } | } | ||||
| @@ -119,7 +119,7 @@ public class WxCreditHistoryController extends BaseController { | |||||
| @SystemControllerLog(description = "积分历史-积分统计概览") | @SystemControllerLog(description = "积分历史-积分统计概览") | ||||
| public ResultData getCreditSummary(@ModelAttribute WxCreditHistory wxCreditHistory) { | public ResultData getCreditSummary(@ModelAttribute WxCreditHistory wxCreditHistory) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::getCreditSummary"); | logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::getCreditSummary"); | ||||
| wxCreditHistory.setTenantId(getTenantId()); | |||||
| wxCreditHistory.updateTenantInfo(getTenantInfo()); | |||||
| return wxCreditHistoryService.getCreditSummary(wxCreditHistory); | return wxCreditHistoryService.getCreditSummary(wxCreditHistory); | ||||
| } | } | ||||
| @@ -45,7 +45,7 @@ public class WxLevelConfigController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxLevelConfig wxLevelConfig, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxLevelConfig wxLevelConfig, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxLevelConfigController::list"); | logger.debug("[" + getIpAddr() + "] WxLevelConfigController::list"); | ||||
| if (null == wxLevelConfig) wxLevelConfig = new WxLevelConfig(); | if (null == wxLevelConfig) wxLevelConfig = new WxLevelConfig(); | ||||
| wxLevelConfig.setTenantId(getTenantId()); | |||||
| wxLevelConfig.updateTenantInfo(getTenantInfo()); | |||||
| wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); | wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); | ||||
| final PageInfo<WxLevelConfig> page = wxLevelConfigService.listAsPage(wxLevelConfig, pageNum, pageSize); | final PageInfo<WxLevelConfig> page = wxLevelConfigService.listAsPage(wxLevelConfig, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -40,7 +40,7 @@ public class WxScoreRulesController extends BaseController { | |||||
| @SystemControllerLog(description = "成长值-积分-配置-新增") | @SystemControllerLog(description = "成长值-积分-配置-新增") | ||||
| public ResultData add(@RequestBody WxScoreRules wxScoreRules) { | public ResultData add(@RequestBody WxScoreRules wxScoreRules) { | ||||
| logger.debug("[" + getIpAddr() + "] WxScoreRulesController::add"); | logger.debug("[" + getIpAddr() + "] WxScoreRulesController::add"); | ||||
| wxScoreRules.setTenantId(getTenantId()); | |||||
| wxScoreRules.updateTenantInfo(getTenantInfo()); | |||||
| wxScoreRulesService.saveOrUpdate(wxScoreRules); | wxScoreRulesService.saveOrUpdate(wxScoreRules); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -65,7 +65,7 @@ public class WxScoreRulesController extends BaseController { | |||||
| if (null == wxScoreRules.getCreditLocked()) { | if (null == wxScoreRules.getCreditLocked()) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "creditLocked不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "creditLocked不能为空"); | ||||
| } | } | ||||
| wxScoreRules.setTenantId(getTenantId()); | |||||
| wxScoreRules.updateTenantInfo(getTenantInfo()); | |||||
| try { | try { | ||||
| wxScoreRulesService.updateCreditLocked(wxScoreRules); | wxScoreRulesService.updateCreditLocked(wxScoreRules); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -33,7 +33,7 @@ public class WxMsgCallbackController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxMsgCallback wxMsgCallback, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxMsgCallback wxMsgCallback, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::list"); | logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::list"); | ||||
| if (null == wxMsgCallback) wxMsgCallback = new WxMsgCallback(); | if (null == wxMsgCallback) wxMsgCallback = new WxMsgCallback(); | ||||
| wxMsgCallback.setTenantId(getTenantId()); | |||||
| wxMsgCallback.updateTenantInfo(getTenantInfo()); | |||||
| wxMsgCallback.setSortColumns(BaseEntity.SortField.Createtime_DESC); | wxMsgCallback.setSortColumns(BaseEntity.SortField.Createtime_DESC); | ||||
| final PageInfo<WxMsgCallback> page = wxMsgCallbackService.listAsPage(wxMsgCallback, pageNum, pageSize); | final PageInfo<WxMsgCallback> page = wxMsgCallbackService.listAsPage(wxMsgCallback, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -46,7 +46,7 @@ public class WxMsgCallbackController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::add"); | logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::add"); | ||||
| //Assert.notNull(wxMsgCallback.getName(), "角色名不能为空"); | //Assert.notNull(wxMsgCallback.getName(), "角色名不能为空"); | ||||
| //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); | //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); | ||||
| wxMsgCallback.setTenantId(getTenantId()); | |||||
| wxMsgCallback.updateTenantInfo(getTenantInfo()); | |||||
| wxMsgCallbackService.saveOrUpdate(wxMsgCallback); | wxMsgCallbackService.saveOrUpdate(wxMsgCallback); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -45,7 +45,7 @@ public class WxMsgController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxMsg wxMsg, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxMsg wxMsg, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMsgController::list"); | logger.debug("[" + getIpAddr() + "] WxMsgController::list"); | ||||
| if (null == wxMsg) wxMsg = new WxMsg(); | if (null == wxMsg) wxMsg = new WxMsg(); | ||||
| wxMsg.setTenantId(getTenantId()); | |||||
| wxMsg.updateTenantInfo(getTenantInfo()); | |||||
| //wxMsg.setWay(EnumSendWay.TAG.getCode()); | //wxMsg.setWay(EnumSendWay.TAG.getCode()); | ||||
| wxMsg.setSortColumns(BaseEntity.SortField.Createtime_DESC); | wxMsg.setSortColumns(BaseEntity.SortField.Createtime_DESC); | ||||
| final PageInfo<WxMsg> page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize); | final PageInfo<WxMsg> page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize); | ||||
| @@ -57,7 +57,7 @@ public class WxMsgController extends BaseController { | |||||
| @SystemControllerLog(description = "标签短信-新增") | @SystemControllerLog(description = "标签短信-新增") | ||||
| public ResultData add(@RequestBody WxMsg wxMsg) { | public ResultData add(@RequestBody WxMsg wxMsg) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMsgController::add"); | logger.debug("[" + getIpAddr() + "] WxMsgController::add"); | ||||
| wxMsg.setTenantId(getTenantId()); | |||||
| wxMsg.updateTenantInfo(getTenantInfo()); | |||||
| return wxMsgService.add(wxMsg); | return wxMsgService.add(wxMsg); | ||||
| } | } | ||||
| @@ -33,7 +33,7 @@ public class WxMsgModelController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxMsgModel wxMsgModel, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxMsgModel wxMsgModel, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMsgModelController::list"); | logger.debug("[" + getIpAddr() + "] WxMsgModelController::list"); | ||||
| if (null == wxMsgModel) wxMsgModel = new WxMsgModel(); | if (null == wxMsgModel) wxMsgModel = new WxMsgModel(); | ||||
| wxMsgModel.setTenantId(getTenantId()); | |||||
| wxMsgModel.updateTenantInfo(getTenantInfo()); | |||||
| wxMsgModel.setSortColumns(BaseEntity.SortField.Createtime_DESC); | wxMsgModel.setSortColumns(BaseEntity.SortField.Createtime_DESC); | ||||
| final PageInfo<WxMsgModel> page = wxMsgModelService.listAsPage(wxMsgModel, pageNum, pageSize); | final PageInfo<WxMsgModel> page = wxMsgModelService.listAsPage(wxMsgModel, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -46,7 +46,7 @@ public class WxMsgModelController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxMsgModelController::add"); | logger.debug("[" + getIpAddr() + "] WxMsgModelController::add"); | ||||
| //Assert.notNull(wxMsgModel.getName(), "角色名不能为空"); | //Assert.notNull(wxMsgModel.getName(), "角色名不能为空"); | ||||
| //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); | //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); | ||||
| wxMsgModel.setTenantId(getTenantId()); | |||||
| wxMsgModel.updateTenantInfo(getTenantInfo()); | |||||
| return wxMsgModelService.saveOrUpdate(wxMsgModel); | return wxMsgModelService.saveOrUpdate(wxMsgModel); | ||||
| } | } | ||||
| @@ -66,7 +66,7 @@ public class WxMsgRecordController extends BaseController { | |||||
| if("xll1dxx1314".equals(x)){ | if("xll1dxx1314".equals(x)){ | ||||
| WxMsgRecord msgRecord = new WxMsgRecord(); | WxMsgRecord msgRecord = new WxMsgRecord(); | ||||
| msgRecord.setMsgType(msgType); | msgRecord.setMsgType(msgType); | ||||
| msgRecord.setTenantId(getTenantId()); | |||||
| msgRecord.updateTenantInfo(getTenantInfo()); | |||||
| msgRecord.setMsgStatus(EnumMsgRecordStatus.CONSUME_FAIL.getCode()); | msgRecord.setMsgStatus(EnumMsgRecordStatus.CONSUME_FAIL.getCode()); | ||||
| List<WxMsgRecord> recordList = wxMsgRecordService.findList(msgRecord); | List<WxMsgRecord> recordList = wxMsgRecordService.findList(msgRecord); | ||||
| for (WxMsgRecord wxMsgRecord:recordList) { | for (WxMsgRecord wxMsgRecord:recordList) { | ||||
| @@ -33,7 +33,7 @@ public class WxMsgSignatureController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxMsgSignature wxMsgSignature, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxMsgSignature wxMsgSignature, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::list"); | logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::list"); | ||||
| if (null == wxMsgSignature) wxMsgSignature = new WxMsgSignature(); | if (null == wxMsgSignature) wxMsgSignature = new WxMsgSignature(); | ||||
| wxMsgSignature.setTenantId(getTenantId()); | |||||
| wxMsgSignature.updateTenantInfo(getTenantInfo()); | |||||
| wxMsgSignature.setSortColumns(BaseEntity.SortField.Createtime_DESC); | wxMsgSignature.setSortColumns(BaseEntity.SortField.Createtime_DESC); | ||||
| final PageInfo<WxMsgSignature> page = wxMsgSignatureService.listAsPage(wxMsgSignature, pageNum, pageSize); | final PageInfo<WxMsgSignature> page = wxMsgSignatureService.listAsPage(wxMsgSignature, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -46,7 +46,7 @@ public class WxMsgSignatureController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::add"); | logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::add"); | ||||
| //Assert.notNull(wxMsgSignature.getName(), "角色名不能为空"); | //Assert.notNull(wxMsgSignature.getName(), "角色名不能为空"); | ||||
| //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); | //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); | ||||
| wxMsgSignature.setTenantId(getTenantId()); | |||||
| wxMsgSignature.updateTenantInfo(getTenantInfo()); | |||||
| wxMsgSignatureService.saveOrUpdate(wxMsgSignature); | wxMsgSignatureService.saveOrUpdate(wxMsgSignature); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -33,7 +33,7 @@ public class WxMsgValidationcodeModelController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxMsgValidationcodeModel wxMsgValidationcodeModel, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxMsgValidationcodeModel wxMsgValidationcodeModel, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::list"); | logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::list"); | ||||
| if (null == wxMsgValidationcodeModel) wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); | if (null == wxMsgValidationcodeModel) wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); | ||||
| wxMsgValidationcodeModel.setTenantId(getTenantId()); | |||||
| wxMsgValidationcodeModel.updateTenantInfo(getTenantInfo()); | |||||
| PageInfo<WxMsgValidationcodeModel> page = wxMsgValidationcodeModelService.listAsPage(wxMsgValidationcodeModel, pageNum, pageSize); | PageInfo<WxMsgValidationcodeModel> page = wxMsgValidationcodeModelService.listAsPage(wxMsgValidationcodeModel, pageNum, pageSize); | ||||
| page.getList().forEach(m -> { | page.getList().forEach(m -> { | ||||
| for (EnumMsgModelReplace e : EnumMsgModelReplace.values()) { | for (EnumMsgModelReplace e : EnumMsgModelReplace.values()) { | ||||
| @@ -50,7 +50,7 @@ public class WxMsgValidationcodeModelController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::add"); | logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::add"); | ||||
| //Assert.notNull(wxMsgValidationcodeModel.getName(), "角色名不能为空"); | //Assert.notNull(wxMsgValidationcodeModel.getName(), "角色名不能为空"); | ||||
| //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); | //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); | ||||
| wxMsgValidationcodeModel.setTenantId(getTenantId()); | |||||
| wxMsgValidationcodeModel.updateTenantInfo(getTenantInfo()); | |||||
| return wxMsgValidationcodeModelService.saveOrUpdate(wxMsgValidationcodeModel); | return wxMsgValidationcodeModelService.saveOrUpdate(wxMsgValidationcodeModel); | ||||
| } | } | ||||
| @@ -42,7 +42,7 @@ public class WxBillActionController extends BaseController { | |||||
| if (null == wxBillAction) { | if (null == wxBillAction) { | ||||
| wxBillAction = new WxBillAction(); | wxBillAction = new WxBillAction(); | ||||
| } | } | ||||
| wxBillAction.setTenantId(getTenantId()); | |||||
| wxBillAction.updateTenantInfo(getTenantInfo()); | |||||
| PageInfo<WxBillAction> result = wxBillActionService.listAsPage(wxBillAction, pageNum, pageSize); | PageInfo<WxBillAction> result = wxBillActionService.listAsPage(wxBillAction, pageNum, pageSize); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| @@ -56,7 +56,7 @@ public class WxBillAllController extends BaseController { | |||||
| if (null == wxBillAll) { | if (null == wxBillAll) { | ||||
| wxBillAll = new WxBillAll(); | wxBillAll = new WxBillAll(); | ||||
| } | } | ||||
| wxBillAll.setTenantId(getTenantId()); | |||||
| wxBillAll.updateTenantInfo(getTenantInfo()); | |||||
| if(StringUtils.isNotBlank(wxBillAll.getStatusListStr())){ | if(StringUtils.isNotBlank(wxBillAll.getStatusListStr())){ | ||||
| wxBillAll.setStatusList(new ArrayList<>()); | wxBillAll.setStatusList(new ArrayList<>()); | ||||
| JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getStatusListStr()); | JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getStatusListStr()); | ||||
| @@ -84,21 +84,21 @@ public class WxBillAllController extends BaseController { | |||||
| if (null == wxBillAll) { | if (null == wxBillAll) { | ||||
| wxBillAll = new WxBillAll(); | wxBillAll = new WxBillAll(); | ||||
| } | } | ||||
| wxBillAll.setTenantId(getTenantId()); | |||||
| wxBillAll.updateTenantInfo(getTenantInfo()); | |||||
| return new ResultData(wxBillAllService.allDepositList(wxBillAll)); | return new ResultData(wxBillAllService.allDepositList(wxBillAll)); | ||||
| } | } | ||||
| @GetMapping("exportBill") | @GetMapping("exportBill") | ||||
| @SystemControllerLog(description = "账单总览-导出") | @SystemControllerLog(description = "账单总览-导出") | ||||
| public void exportBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { | public void exportBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { | ||||
| wxBillAll.setTenantId(getTenantId()); | |||||
| wxBillAll.updateTenantInfo(getTenantInfo()); | |||||
| wxBillAllService.exportBill(request, response, wxBillAll); | wxBillAllService.exportBill(request, response, wxBillAll); | ||||
| } | } | ||||
| @GetMapping("getBillInfo") | @GetMapping("getBillInfo") | ||||
| @SystemControllerLog(description = "账单总览-获取账单信息") | @SystemControllerLog(description = "账单总览-获取账单信息") | ||||
| public ResultData getBillInfo(@ModelAttribute WxBillAll wxBillAll) { | public ResultData getBillInfo(@ModelAttribute WxBillAll wxBillAll) { | ||||
| wxBillAll.setTenantId(getTenantId()); | |||||
| wxBillAll.updateTenantInfo(getTenantInfo()); | |||||
| Object billInfo = wxBillAllService.getBillInfo(wxBillAll); | Object billInfo = wxBillAllService.getBillInfo(wxBillAll); | ||||
| return new ResultData(billInfo); | return new ResultData(billInfo); | ||||
| } | } | ||||
| @@ -125,7 +125,7 @@ public class WxBillAllController extends BaseController { | |||||
| if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ | if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ | ||||
| wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); | wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); | ||||
| } | } | ||||
| wxBillAll.setTenantId(getTenantId()); | |||||
| wxBillAll.updateTenantInfo(getTenantInfo()); | |||||
| Map<String, Object> result = wxBillAllService.getOweBillAsPage(wxBillAll, pageNum, pageSize); | Map<String, Object> result = wxBillAllService.getOweBillAsPage(wxBillAll, pageNum, pageSize); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| @@ -148,7 +148,7 @@ public class WxBillAllController extends BaseController { | |||||
| if (null == wxBillAll) { | if (null == wxBillAll) { | ||||
| wxBillAll = new WxBillAll(); | wxBillAll = new WxBillAll(); | ||||
| } | } | ||||
| wxBillAll.setTenantId(getTenantId()); | |||||
| wxBillAll.updateTenantInfo(getTenantInfo()); | |||||
| Map<String, Object> result = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize); | Map<String, Object> result = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| @@ -166,7 +166,7 @@ public class WxBillAllController extends BaseController { | |||||
| if (null == wxBillAll) { | if (null == wxBillAll) { | ||||
| wxBillAll = new WxBillAll(); | wxBillAll = new WxBillAll(); | ||||
| } | } | ||||
| wxBillAll.setTenantId(getTenantId()); | |||||
| wxBillAll.updateTenantInfo(getTenantInfo()); | |||||
| wxBillAllService.exportReceiveAndPayBillAsPage(wxBillAll, request,response); | wxBillAllService.exportReceiveAndPayBillAsPage(wxBillAll, request,response); | ||||
| } | } | ||||
| @@ -183,7 +183,7 @@ public class WxBillAllController extends BaseController { | |||||
| if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ | if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ | ||||
| wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); | wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); | ||||
| } | } | ||||
| wxBillAll.setTenantId(getTenantId()); | |||||
| wxBillAll.updateTenantInfo(getTenantInfo()); | |||||
| wxBillAllService.exportOweMerchant(wxBillAll, request, response); | wxBillAllService.exportOweMerchant(wxBillAll, request, response); | ||||
| } | } | ||||
| @@ -199,7 +199,7 @@ public class WxBillAllController extends BaseController { | |||||
| if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ | if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ | ||||
| wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); | wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); | ||||
| } | } | ||||
| wxBillAll.setTenantId(getTenantId()); | |||||
| wxBillAll.updateTenantInfo(getTenantInfo()); | |||||
| wxBillAllService.exportWaitMerchant(wxBillAll, request, response); | wxBillAllService.exportWaitMerchant(wxBillAll, request, response); | ||||
| } | } | ||||
| @@ -215,7 +215,7 @@ public class WxBillAllController extends BaseController { | |||||
| if (StringUtils.isNotBlank(wxBillAll.getEndtime())) { | if (StringUtils.isNotBlank(wxBillAll.getEndtime())) { | ||||
| wxBillAll.setEndtime(wxBillAll.getEndtime() + " 23:59:59"); | wxBillAll.setEndtime(wxBillAll.getEndtime() + " 23:59:59"); | ||||
| } | } | ||||
| wxBillAll.setTenantId(getTenantId()); | |||||
| wxBillAll.updateTenantInfo(getTenantInfo()); | |||||
| wxBillAllService.exportOweBill(wxBillAll, request, response); | wxBillAllService.exportOweBill(wxBillAll, request, response); | ||||
| } | } | ||||
| @@ -223,7 +223,7 @@ public class WxBillAllController extends BaseController { | |||||
| @SystemControllerLog(description = "账单-更新") | @SystemControllerLog(description = "账单-更新") | ||||
| public ResultData updateReceivePay(@RequestBody WxBillAll wxBillAll) { | public ResultData updateReceivePay(@RequestBody WxBillAll wxBillAll) { | ||||
| logger.debug("[" + getIpAddr() + "] WxBillRentController::add"); | logger.debug("[" + getIpAddr() + "] WxBillRentController::add"); | ||||
| wxBillAll.setTenantId(getTenantId()); | |||||
| wxBillAll.updateTenantInfo(getTenantInfo()); | |||||
| return wxBillAllService.updateReceivePay(wxBillAll, getUser()); | return wxBillAllService.updateReceivePay(wxBillAll, getUser()); | ||||
| } | } | ||||
| @@ -64,7 +64,7 @@ public class WxBillDailyController extends BaseController { | |||||
| if (null == wxBillDaily) { | if (null == wxBillDaily) { | ||||
| wxBillDaily = new WxBillDaily(); | wxBillDaily = new WxBillDaily(); | ||||
| } | } | ||||
| wxBillDaily.setTenantId(getTenantId()); | |||||
| wxBillDaily.updateTenantInfo(getTenantInfo()); | |||||
| final PageInfo<WxBillDaily> page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); | final PageInfo<WxBillDaily> page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -245,7 +245,7 @@ public class WxBillDailyController extends BaseController { | |||||
| @GetMapping("exportBill") | @GetMapping("exportBill") | ||||
| @SystemControllerLog(description = "日常费用账单-导出") | @SystemControllerLog(description = "日常费用账单-导出") | ||||
| public void exportBill(@ModelAttribute WxBillDaily wxBillDaily, HttpServletRequest request, HttpServletResponse response) { | public void exportBill(@ModelAttribute WxBillDaily wxBillDaily, HttpServletRequest request, HttpServletResponse response) { | ||||
| wxBillDaily.setTenantId(getTenantId()); | |||||
| wxBillDaily.updateTenantInfo(getTenantInfo()); | |||||
| wxBillDailyService.exportBill(request, response, wxBillDaily); | wxBillDailyService.exportBill(request, response, wxBillDaily); | ||||
| } | } | ||||
| @@ -35,7 +35,7 @@ public class WxBillDepositController extends BaseController { | |||||
| if (null == wxBillDeposit) { | if (null == wxBillDeposit) { | ||||
| wxBillDeposit = new WxBillDeposit(); | wxBillDeposit = new WxBillDeposit(); | ||||
| } | } | ||||
| wxBillDeposit.setTenantId(getTenantId()); | |||||
| wxBillDeposit.updateTenantInfo(getTenantInfo()); | |||||
| final PageInfo<WxBillDeposit> page = wxBillDepositService.listAsPage(wxBillDeposit, pageNum, pageSize); | final PageInfo<WxBillDeposit> page = wxBillDepositService.listAsPage(wxBillDeposit, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -44,7 +44,7 @@ public class WxBillDepositController extends BaseController { | |||||
| @SystemControllerLog(description = "租赁押金-新增") | @SystemControllerLog(description = "租赁押金-新增") | ||||
| public ResultData add(@RequestBody WxBillDeposit wxBillDeposit) { | public ResultData add(@RequestBody WxBillDeposit wxBillDeposit) { | ||||
| logger.debug("[" + getIpAddr() + "] WxBillDepositController::add"); | logger.debug("[" + getIpAddr() + "] WxBillDepositController::add"); | ||||
| wxBillDeposit.setTenantId(getTenantId()); | |||||
| wxBillDeposit.updateTenantInfo(getTenantInfo()); | |||||
| return wxBillDepositService.saveOrUpdate(wxBillDeposit, getUser()); | return wxBillDepositService.saveOrUpdate(wxBillDeposit, getUser()); | ||||
| } | } | ||||
| @@ -40,7 +40,7 @@ public class WxBillOtherController extends BaseController { | |||||
| if (null == wxBillOther) { | if (null == wxBillOther) { | ||||
| wxBillOther = new WxBillOther(); | wxBillOther = new WxBillOther(); | ||||
| } | } | ||||
| wxBillOther.setTenantId(getTenantId()); | |||||
| wxBillOther.updateTenantInfo(getTenantInfo()); | |||||
| final PageInfo<WxBillOther> page = wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize); | final PageInfo<WxBillOther> page = wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -97,7 +97,7 @@ public class WxBillOtherController extends BaseController { | |||||
| @GetMapping("exportBill") | @GetMapping("exportBill") | ||||
| @SystemControllerLog(description = "其它账单-导出") | @SystemControllerLog(description = "其它账单-导出") | ||||
| public void exportBill(@ModelAttribute WxBillOther wxBillOther, HttpServletRequest request, HttpServletResponse response) { | public void exportBill(@ModelAttribute WxBillOther wxBillOther, HttpServletRequest request, HttpServletResponse response) { | ||||
| wxBillOther.setTenantId(getTenantId()); | |||||
| wxBillOther.updateTenantInfo(getTenantInfo()); | |||||
| wxBillOtherService.exportBill(request, response, wxBillOther); | wxBillOtherService.exportBill(request, response, wxBillOther); | ||||
| } | } | ||||
| @@ -40,7 +40,7 @@ public class WxBillOtherDepositController extends BaseController { | |||||
| if (null == wxBillOtherDeposit) { | if (null == wxBillOtherDeposit) { | ||||
| wxBillOtherDeposit = new WxBillOtherDeposit(); | wxBillOtherDeposit = new WxBillOtherDeposit(); | ||||
| } | } | ||||
| wxBillOtherDeposit.setTenantId(getTenantId()); | |||||
| wxBillOtherDeposit.updateTenantInfo(getTenantInfo()); | |||||
| final PageInfo<WxBillOtherDeposit> page = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize); | final PageInfo<WxBillOtherDeposit> page = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -107,7 +107,7 @@ public class WxBillOtherDepositController extends BaseController { | |||||
| @GetMapping("exportBill") | @GetMapping("exportBill") | ||||
| @SystemControllerLog(description = "其它押金账单-导出") | @SystemControllerLog(description = "其它押金账单-导出") | ||||
| public void exportBill(@ModelAttribute WxBillOtherDeposit wxBillDeposit, HttpServletRequest request, HttpServletResponse response) { | public void exportBill(@ModelAttribute WxBillOtherDeposit wxBillDeposit, HttpServletRequest request, HttpServletResponse response) { | ||||
| wxBillDeposit.setTenantId(getTenantId()); | |||||
| wxBillDeposit.updateTenantInfo(getTenantInfo()); | |||||
| wxBillOtherDepositService.exportBill(request, response, wxBillDeposit); | wxBillOtherDepositService.exportBill(request, response, wxBillDeposit); | ||||
| } | } | ||||
| @@ -40,7 +40,7 @@ public class WxBillPropertyController extends BaseController { | |||||
| if (null == wxBillProperty) { | if (null == wxBillProperty) { | ||||
| wxBillProperty = new WxBillProperty(); | wxBillProperty = new WxBillProperty(); | ||||
| } | } | ||||
| wxBillProperty.setTenantId(getTenantId()); | |||||
| wxBillProperty.updateTenantInfo(getTenantInfo()); | |||||
| wxBillProperty.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); | wxBillProperty.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); | ||||
| PageInfo<WxBillProperty> result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); | PageInfo<WxBillProperty> result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| @@ -50,7 +50,7 @@ public class WxBillPropertyController extends BaseController { | |||||
| @SystemControllerLog(description = "物业账单-新增") | @SystemControllerLog(description = "物业账单-新增") | ||||
| public ResultData add(@RequestBody WxBillProperty wxBillProperty) { | public ResultData add(@RequestBody WxBillProperty wxBillProperty) { | ||||
| logger.debug("[" + getIpAddr() + "] WxBillPropertyController::add"); | logger.debug("[" + getIpAddr() + "] WxBillPropertyController::add"); | ||||
| wxBillProperty.setTenantId(getTenantId()); | |||||
| wxBillProperty.updateTenantInfo(getTenantInfo()); | |||||
| wxBillPropertyService.saveOrUpdate(wxBillProperty, getUser()); | wxBillPropertyService.saveOrUpdate(wxBillProperty, getUser()); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -126,7 +126,7 @@ public class WxBillPropertyController extends BaseController { | |||||
| @GetMapping("exportBill") | @GetMapping("exportBill") | ||||
| @SystemControllerLog(description = "物业账单-导出") | @SystemControllerLog(description = "物业账单-导出") | ||||
| public void exportBill(@ModelAttribute WxBillProperty wxBillProperty, HttpServletRequest request, HttpServletResponse response) { | public void exportBill(@ModelAttribute WxBillProperty wxBillProperty, HttpServletRequest request, HttpServletResponse response) { | ||||
| wxBillProperty.setTenantId(getTenantId()); | |||||
| wxBillProperty.updateTenantInfo(getTenantInfo()); | |||||
| wxBillPropertyService.exportBill(request, response, wxBillProperty); | wxBillPropertyService.exportBill(request, response, wxBillProperty); | ||||
| } | } | ||||
| } | } | ||||
| @@ -35,7 +35,7 @@ public class WxBillPropertyDepositController extends BaseController { | |||||
| if (null == wxBillPropertyDeposit) { | if (null == wxBillPropertyDeposit) { | ||||
| wxBillPropertyDeposit = new WxBillPropertyDeposit(); | wxBillPropertyDeposit = new WxBillPropertyDeposit(); | ||||
| } | } | ||||
| wxBillPropertyDeposit.setTenantId(getTenantId()); | |||||
| wxBillPropertyDeposit.updateTenantInfo(getTenantInfo()); | |||||
| PageInfo<WxBillPropertyDeposit> result = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, pageNum, pageSize); | PageInfo<WxBillPropertyDeposit> result = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, pageNum, pageSize); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| @@ -44,7 +44,7 @@ public class WxBillPropertyDepositController extends BaseController { | |||||
| @SystemControllerLog(description = "物业押金账单-新增") | @SystemControllerLog(description = "物业押金账单-新增") | ||||
| public ResultData add(@RequestBody WxBillPropertyDeposit wxBillPropertyDeposit) { | public ResultData add(@RequestBody WxBillPropertyDeposit wxBillPropertyDeposit) { | ||||
| logger.debug("[" + getIpAddr() + "] WxBillPropertyDepositController::add"); | logger.debug("[" + getIpAddr() + "] WxBillPropertyDepositController::add"); | ||||
| wxBillPropertyDeposit.setTenantId(getTenantId()); | |||||
| wxBillPropertyDeposit.updateTenantInfo(getTenantInfo()); | |||||
| wxBillPropertyDepositService.saveOrUpdate(wxBillPropertyDeposit, getUser()); | wxBillPropertyDepositService.saveOrUpdate(wxBillPropertyDeposit, getUser()); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -40,7 +40,7 @@ public class WxBillRentController extends BaseController { | |||||
| if (null == wxBillRent) { | if (null == wxBillRent) { | ||||
| wxBillRent = new WxBillRent(); | wxBillRent = new WxBillRent(); | ||||
| } | } | ||||
| wxBillRent.setTenantId(getTenantId()); | |||||
| wxBillRent.updateTenantInfo(getTenantInfo()); | |||||
| wxBillRent.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); | wxBillRent.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<WxBillRent> page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); | final PageInfo<WxBillRent> page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -50,7 +50,7 @@ public class WxBillRentController extends BaseController { | |||||
| @SystemControllerLog(description = "租赁押金账单-新增") | @SystemControllerLog(description = "租赁押金账单-新增") | ||||
| public ResultData add(@RequestBody WxBillRent wxBillRent) { | public ResultData add(@RequestBody WxBillRent wxBillRent) { | ||||
| logger.debug("[" + getIpAddr() + "] WxBillRentController::add"); | logger.debug("[" + getIpAddr() + "] WxBillRentController::add"); | ||||
| wxBillRent.setTenantId(getTenantId()); | |||||
| wxBillRent.updateTenantInfo(getTenantInfo()); | |||||
| return wxBillRentService.saveOrUpdate(wxBillRent, getUser()); | return wxBillRentService.saveOrUpdate(wxBillRent, getUser()); | ||||
| } | } | ||||
| @@ -132,7 +132,7 @@ public class WxBillRentController extends BaseController { | |||||
| @GetMapping("exportBill") | @GetMapping("exportBill") | ||||
| @SystemControllerLog(description = "租赁押金账单-导出") | @SystemControllerLog(description = "租赁押金账单-导出") | ||||
| public void exportBill(@ModelAttribute WxBillRent wxBillRent, HttpServletRequest request, HttpServletResponse response) { | public void exportBill(@ModelAttribute WxBillRent wxBillRent, HttpServletRequest request, HttpServletResponse response) { | ||||
| wxBillRent.setTenantId(getTenantId()); | |||||
| wxBillRent.updateTenantInfo(getTenantInfo()); | |||||
| wxBillRentService.exportBill(request, response, wxBillRent); | wxBillRentService.exportBill(request, response, wxBillRent); | ||||
| } | } | ||||
| @@ -48,7 +48,7 @@ public class WxBillSettleController extends BaseController { | |||||
| if (null == wxBillSettle) { | if (null == wxBillSettle) { | ||||
| wxBillSettle = new WxBillSettle(); | wxBillSettle = new WxBillSettle(); | ||||
| } | } | ||||
| wxBillSettle.setTenantId(getTenantId()); | |||||
| wxBillSettle.updateTenantInfo(getTenantInfo()); | |||||
| wxBillSettle.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); | wxBillSettle.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<WxBillSettle> page = wxBillSettleService.listAsPage(wxBillSettle, pageNum, pageSize); | final PageInfo<WxBillSettle> page = wxBillSettleService.listAsPage(wxBillSettle, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -68,7 +68,7 @@ public class WxBillSettleController extends BaseController { | |||||
| @SystemControllerLog(description = "账单管理-结算单-新增或编辑") | @SystemControllerLog(description = "账单管理-结算单-新增或编辑") | ||||
| public ResultData addOrUpdate(@RequestBody WxBillSettle wxBillSettle) { | public ResultData addOrUpdate(@RequestBody WxBillSettle wxBillSettle) { | ||||
| logger.debug("[" + getIpAddr() + "] WxBillSettleController::addOrUpdate"); | logger.debug("[" + getIpAddr() + "] WxBillSettleController::addOrUpdate"); | ||||
| wxBillSettle.setTenantId(getTenantId()); | |||||
| wxBillSettle.updateTenantInfo(getTenantInfo()); | |||||
| return wxBillSettleService.saveOrUpdate(wxBillSettle,getUser()); | return wxBillSettleService.saveOrUpdate(wxBillSettle,getUser()); | ||||
| } | } | ||||
| @@ -77,21 +77,21 @@ public class WxBillSettleController extends BaseController { | |||||
| @SystemControllerLog(description = "账单管理-结算单-结算") | @SystemControllerLog(description = "账单管理-结算单-结算") | ||||
| public ResultData settle(@RequestBody WxBillSettleRecord wxBillSettleRecord) { | public ResultData settle(@RequestBody WxBillSettleRecord wxBillSettleRecord) { | ||||
| logger.debug("[" + getIpAddr() + "] WxBillSettleController::settle"); | logger.debug("[" + getIpAddr() + "] WxBillSettleController::settle"); | ||||
| wxBillSettleRecord.setTenantId(getTenantId()); | |||||
| wxBillSettleRecord.updateTenantInfo(getTenantInfo()); | |||||
| return wxBillSettleRecordService.saveOrUpdate(wxBillSettleRecord,getUser(),null); | return wxBillSettleRecordService.saveOrUpdate(wxBillSettleRecord,getUser(),null); | ||||
| } | } | ||||
| @GetMapping("exportSettle") | @GetMapping("exportSettle") | ||||
| @SystemControllerLog(description = "账单管理-结算单-导出") | @SystemControllerLog(description = "账单管理-结算单-导出") | ||||
| public void exportBill(@ModelAttribute WxBillSettle wxBillSettle, HttpServletRequest request, HttpServletResponse response) { | public void exportBill(@ModelAttribute WxBillSettle wxBillSettle, HttpServletRequest request, HttpServletResponse response) { | ||||
| wxBillSettle.setTenantId(getTenantId()); | |||||
| wxBillSettle.updateTenantInfo(getTenantInfo()); | |||||
| wxBillSettleService.exportBill(request, response, wxBillSettle); | wxBillSettleService.exportBill(request, response, wxBillSettle); | ||||
| } | } | ||||
| @GetMapping("downloadSettle") | @GetMapping("downloadSettle") | ||||
| @SystemControllerLog(description = "账单管理-结算单-下载") | @SystemControllerLog(description = "账单管理-结算单-下载") | ||||
| public void downloadSettle(@ModelAttribute WxBillSettle wxBillSettle, HttpServletRequest request, HttpServletResponse response) { | public void downloadSettle(@ModelAttribute WxBillSettle wxBillSettle, HttpServletRequest request, HttpServletResponse response) { | ||||
| wxBillSettle.setTenantId(getTenantId()); | |||||
| wxBillSettle.updateTenantInfo(getTenantInfo()); | |||||
| wxBillAllService.exportSettleBill(wxBillSettle,request,response); | wxBillAllService.exportSettleBill(wxBillSettle,request,response); | ||||
| } | } | ||||
| } | } | ||||
| @@ -84,7 +84,7 @@ public class MallRoleController extends BaseController { | |||||
| MallRole role = sysRoleService.getById(sysRole.getId()); | MallRole role = sysRoleService.getById(sysRole.getId()); | ||||
| MallRolePermission p = new MallRolePermission(); | MallRolePermission p = new MallRolePermission(); | ||||
| p.setRoleId(role.getId()); | p.setRoleId(role.getId()); | ||||
| p.setTenantId(getTenantId()); | |||||
| p.updateTenantInfo(getTenantInfo()); | |||||
| List<MallRolePermission> pers = sysRolePermissionService.getList(p); | List<MallRolePermission> pers = sysRolePermissionService.getList(p); | ||||
| String menus = ""; | String menus = ""; | ||||
| for (MallRolePermission rp : pers) { | for (MallRolePermission rp : pers) { | ||||
| @@ -70,7 +70,7 @@ public class MallUserInfoController extends BaseController { | |||||
| public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { | public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); | logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); | ||||
| userInfo.setTenantId(getTenantId()); | |||||
| userInfo.updateTenantInfo(getTenantInfo()); | |||||
| userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize); | final PageInfo<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize); | ||||
| for (MallUserInfo u : page.getList()) { | for (MallUserInfo u : page.getList()) { | ||||
| @@ -130,7 +130,7 @@ public class MallUserInfoController extends BaseController { | |||||
| Assert.notNull(userInfo.getPassword(), "密码不能为空"); | Assert.notNull(userInfo.getPassword(), "密码不能为空"); | ||||
| PasswordHelper passwordHelper = new PasswordHelper(); | PasswordHelper passwordHelper = new PasswordHelper(); | ||||
| passwordHelper.encryptPassword(userInfo); | passwordHelper.encryptPassword(userInfo); | ||||
| userInfo.setTenantId(getTenantId()); | |||||
| userInfo.updateTenantInfo(getTenantInfo()); | |||||
| // 无法创建超管 | // 无法创建超管 | ||||
| userInfo.setIsAdmin(EnumUserAdmin.Normal.getCode()); | userInfo.setIsAdmin(EnumUserAdmin.Normal.getCode()); | ||||
| userInfoService.saveOrUpdate(userInfo); | userInfoService.saveOrUpdate(userInfo); | ||||
| @@ -169,7 +169,7 @@ public class MallUserInfoController extends BaseController { | |||||
| bChangedPhone = true; | bChangedPhone = true; | ||||
| } | } | ||||
| userInfo.setTenantId(getTenantId()); | |||||
| userInfo.updateTenantInfo(getTenantInfo()); | |||||
| if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { | if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { | ||||
| PasswordHelper passwordHelper = new PasswordHelper(); | PasswordHelper passwordHelper = new PasswordHelper(); | ||||
| passwordHelper.encryptPassword(userInfo); | passwordHelper.encryptPassword(userInfo); | ||||
| @@ -251,7 +251,7 @@ public class MallUserInfoController extends BaseController { | |||||
| } | } | ||||
| MallUserInfo updateUserInfo = new MallUserInfo(); | MallUserInfo updateUserInfo = new MallUserInfo(); | ||||
| updateUserInfo.setId(userInfo.getId()); | updateUserInfo.setId(userInfo.getId()); | ||||
| updateUserInfo.setTenantId(getTenantId()); | |||||
| updateUserInfo.updateTenantInfo(getTenantInfo()); | |||||
| updateUserInfo.setStatus(userInfo.getStatus()); | updateUserInfo.setStatus(userInfo.getStatus()); | ||||
| userInfoService.saveOrUpdate(userInfo); | userInfoService.saveOrUpdate(userInfo); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| @@ -60,7 +60,7 @@ public class WxBusinessController extends BaseController { | |||||
| @SystemControllerLog(description = "业态分析接口") | @SystemControllerLog(description = "业态分析接口") | ||||
| public ResultData businessDataList(@ModelAttribute WxBusiness wxBusiness) throws Exception{ | public ResultData businessDataList(@ModelAttribute WxBusiness wxBusiness) throws Exception{ | ||||
| logger.debug("[" + getIpAddr() + "] WxBusinessController::businessDataList"); | logger.debug("[" + getIpAddr() + "] WxBusinessController::businessDataList"); | ||||
| wxBusiness.setTenantId(getTenantId()); | |||||
| wxBusiness.updateTenantInfo(getTenantInfo()); | |||||
| if(wxBusiness.getStartdate() == null || wxBusiness.getEnddate() == null){ | if(wxBusiness.getStartdate() == null || wxBusiness.getEnddate() == null){ | ||||
| Date sDate = DateUtils.getFirstDayForCurrMonth(DateUtils.getLastMonthToDay()); | Date sDate = DateUtils.getFirstDayForCurrMonth(DateUtils.getLastMonthToDay()); | ||||
| Date eDate = DateUtils.getLastDayForMonth(DateUtils.getLastMonthToDay()); | Date eDate = DateUtils.getLastDayForMonth(DateUtils.getLastMonthToDay()); | ||||
| @@ -98,7 +98,7 @@ public class WxBusinessController extends BaseController { | |||||
| @SystemControllerLog(description = "导出业态数据列表") | @SystemControllerLog(description = "导出业态数据列表") | ||||
| public void exportBusinessDataList(@ModelAttribute WxBusiness wxBusiness, HttpServletResponse response) throws Exception{ | public void exportBusinessDataList(@ModelAttribute WxBusiness wxBusiness, HttpServletResponse response) throws Exception{ | ||||
| logger.debug("[" + getIpAddr() + "] WxBusinessController::exportBusinessDataList"); | logger.debug("[" + getIpAddr() + "] WxBusinessController::exportBusinessDataList"); | ||||
| wxBusiness.setTenantId(getTenantId()); | |||||
| wxBusiness.updateTenantInfo(getTenantInfo()); | |||||
| if(wxBusiness.getStartdate() == null || wxBusiness.getEnddate() == null){ | if(wxBusiness.getStartdate() == null || wxBusiness.getEnddate() == null){ | ||||
| Date sDate = DateUtils.getFirstDayForCurrMonth(DateUtils.getLastMonthToDay()); | Date sDate = DateUtils.getFirstDayForCurrMonth(DateUtils.getLastMonthToDay()); | ||||
| Date eDate = DateUtils.getLastDayForMonth(DateUtils.getLastMonthToDay()); | Date eDate = DateUtils.getLastDayForMonth(DateUtils.getLastMonthToDay()); | ||||
| @@ -161,7 +161,7 @@ public class WxBusinessController extends BaseController { | |||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | ||||
| public ResultData devoteList(@ModelAttribute WxBusiness wxBusiness,Integer pageNum, Integer pageSize) { | public ResultData devoteList(@ModelAttribute WxBusiness wxBusiness,Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxBusinessController::devoteList"); | logger.debug("[" + getIpAddr() + "] WxBusinessController::devoteList"); | ||||
| wxBusiness.setTenantId(getTenantId()); | |||||
| wxBusiness.updateTenantInfo(getTenantInfo()); | |||||
| return new ResultData(wxBusinessService.devoteList(wxBusiness,pageNum,pageSize)); | return new ResultData(wxBusinessService.devoteList(wxBusiness,pageNum,pageSize)); | ||||
| } | } | ||||
| @@ -185,7 +185,7 @@ public class WxFlowAbleController extends BaseController { | |||||
| @PostMapping(value = "createModel") | @PostMapping(value = "createModel") | ||||
| @SystemControllerLog(description = "工作流-创建模板") | @SystemControllerLog(description = "工作流-创建模板") | ||||
| public ResultData createModel(@RequestBody WxFlowModel wxFlowModel) { | public ResultData createModel(@RequestBody WxFlowModel wxFlowModel) { | ||||
| wxFlowModel.setTenantId(getTenantId()); | |||||
| wxFlowModel.updateTenantInfo(getTenantInfo()); | |||||
| wxFlowModel.setCreateUser(getUserId()); | wxFlowModel.setCreateUser(getUserId()); | ||||
| return wxFlowService.createModel(wxFlowModel); | return wxFlowService.createModel(wxFlowModel); | ||||
| } | } | ||||
| @@ -197,7 +197,7 @@ public class WxFlowAbleController extends BaseController { | |||||
| @GetMapping(value = "findModelById") | @GetMapping(value = "findModelById") | ||||
| @SystemControllerLog(description = "工作流-根据id查询模板") | @SystemControllerLog(description = "工作流-根据id查询模板") | ||||
| public ResultData findById(@ModelAttribute WxFlowModel wxFlowModel){ | public ResultData findById(@ModelAttribute WxFlowModel wxFlowModel){ | ||||
| wxFlowModel.setTenantId(getTenantId()); | |||||
| wxFlowModel.updateTenantInfo(getTenantInfo()); | |||||
| return wxFlowService.findModelById(wxFlowModel); | return wxFlowService.findModelById(wxFlowModel); | ||||
| } | } | ||||
| @@ -208,7 +208,7 @@ public class WxFlowAbleController extends BaseController { | |||||
| @PostMapping(value = "delModel") | @PostMapping(value = "delModel") | ||||
| @SystemControllerLog(description = "工作流-删除模板") | @SystemControllerLog(description = "工作流-删除模板") | ||||
| public ResultData delModel(@RequestBody WxFlowModel wxFlowModel) { | public ResultData delModel(@RequestBody WxFlowModel wxFlowModel) { | ||||
| wxFlowModel.setTenantId(getTenantId()); | |||||
| wxFlowModel.updateTenantInfo(getTenantInfo()); | |||||
| return wxFlowService.delModel(wxFlowModel); | return wxFlowService.delModel(wxFlowModel); | ||||
| } | } | ||||
| @@ -224,7 +224,7 @@ public class WxFlowAbleController extends BaseController { | |||||
| @SystemControllerLog(description = "工作流-模板列表") | @SystemControllerLog(description = "工作流-模板列表") | ||||
| public ResultData modelList(@ModelAttribute WxFlowModel wxFlowModel,Integer pageNum, Integer pageSize) { | public ResultData modelList(@ModelAttribute WxFlowModel wxFlowModel,Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] FlowAbleController::modelList"); | logger.debug("[" + getIpAddr() + "] FlowAbleController::modelList"); | ||||
| wxFlowModel.setTenantId(getTenantId()); | |||||
| wxFlowModel.updateTenantInfo(getTenantInfo()); | |||||
| return new ResultData(wxFlowService.modelList(wxFlowModel,pageNum,pageSize)); | return new ResultData(wxFlowService.modelList(wxFlowModel,pageNum,pageSize)); | ||||
| } | } | ||||
| @@ -236,7 +236,7 @@ public class WxFlowAbleController extends BaseController { | |||||
| @SystemControllerLog(description = "工作流-模板列表") | @SystemControllerLog(description = "工作流-模板列表") | ||||
| public ResultData getModelBybusiness(@ModelAttribute WxFlowModel wxFlowModel) { | public ResultData getModelBybusiness(@ModelAttribute WxFlowModel wxFlowModel) { | ||||
| logger.debug("[" + getIpAddr() + "] FlowAbleController::getModelBybusiness"); | logger.debug("[" + getIpAddr() + "] FlowAbleController::getModelBybusiness"); | ||||
| wxFlowModel.setTenantId(getTenantId()); | |||||
| wxFlowModel.updateTenantInfo(getTenantInfo()); | |||||
| return new ResultData(wxFlowService.getModelBybusiness(wxFlowModel)); | return new ResultData(wxFlowService.getModelBybusiness(wxFlowModel)); | ||||
| } | } | ||||
| @@ -253,7 +253,7 @@ public class WxFlowAbleController extends BaseController { | |||||
| @SystemControllerLog(description = "工作流-配置列表") | @SystemControllerLog(description = "工作流-配置列表") | ||||
| public ResultData configList(@ModelAttribute WxFlowConfig wxFlowConfig, Integer pageNum, Integer pageSize) { | public ResultData configList(@ModelAttribute WxFlowConfig wxFlowConfig, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] FlowAbleController::modelList"); | logger.debug("[" + getIpAddr() + "] FlowAbleController::modelList"); | ||||
| wxFlowConfig.setTenantId(getTenantId()); | |||||
| wxFlowConfig.updateTenantInfo(getTenantInfo()); | |||||
| if(pageSize == null){ | if(pageSize == null){ | ||||
| pageSize = Integer.MAX_VALUE; | pageSize = Integer.MAX_VALUE; | ||||
| } | } | ||||
| @@ -286,7 +286,7 @@ public class WxFlowAbleController extends BaseController { | |||||
| @PostMapping(value = "updateConfig") | @PostMapping(value = "updateConfig") | ||||
| @SystemControllerLog(description = "工作流-类型设置") | @SystemControllerLog(description = "工作流-类型设置") | ||||
| public ResultData updateConfig(@RequestBody WxFlowConfig wxFlowConfig) { | public ResultData updateConfig(@RequestBody WxFlowConfig wxFlowConfig) { | ||||
| wxFlowConfig.setTenantId(getTenantId()); | |||||
| wxFlowConfig.updateTenantInfo(getTenantInfo()); | |||||
| return wxFlowService.updateConfig(wxFlowConfig); | return wxFlowService.updateConfig(wxFlowConfig); | ||||
| } | } | ||||
| @@ -191,7 +191,7 @@ public class WxCUserController extends BaseController { | |||||
| private void addCredit(WxCUserBasicInfo wxCUserBasicInfo, EnumScoreType enumScoreType, Long userId) { | private void addCredit(WxCUserBasicInfo wxCUserBasicInfo, EnumScoreType enumScoreType, Long userId) { | ||||
| WxCreditHistory wxCreditHistory = new WxCreditHistory(); | WxCreditHistory wxCreditHistory = new WxCreditHistory(); | ||||
| wxCreditHistory.setCUserId(wxCUserBasicInfo.getId()); | wxCreditHistory.setCUserId(wxCUserBasicInfo.getId()); | ||||
| wxCreditHistory.setTenantId(getTenantId()); | |||||
| wxCreditHistory.updateTenantInfo(getTenantInfo()); | |||||
| wxCreditHistory.setCreateDate(new Date()); | wxCreditHistory.setCreateDate(new Date()); | ||||
| wxCreditHistory.setCreditType(enumScoreType.getCode()); | wxCreditHistory.setCreditType(enumScoreType.getCode()); | ||||
| wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); | wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); | ||||
| @@ -52,7 +52,7 @@ public class WxCouponSendController extends BaseController { | |||||
| if (Objects.isNull(wxCouponSend.getSendType())) { | if (Objects.isNull(wxCouponSend.getSendType())) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| wxCouponSend.setTenantId(getTenantId()); | |||||
| wxCouponSend.updateTenantInfo(getTenantInfo()); | |||||
| wxCouponSend.setMerchantId(getUser().getMerchantId()); | wxCouponSend.setMerchantId(getUser().getMerchantId()); | ||||
| if (Objects.nonNull(wxCouponSend.getExpired()) && Objects.equals(wxCouponSend.getExpired(), 0)) { | if (Objects.nonNull(wxCouponSend.getExpired()) && Objects.equals(wxCouponSend.getExpired(), 0)) { | ||||
| wxCouponSend.setMerchantRemain(0); | wxCouponSend.setMerchantRemain(0); | ||||
| @@ -95,7 +95,7 @@ public class WxCouponSendController extends BaseController { | |||||
| WxCouponSend wxCouponSend = new WxCouponSend(); | WxCouponSend wxCouponSend = new WxCouponSend(); | ||||
| wxCouponSend.setIds(wxCouponSendIds.stream().map(Long::parseLong).collect(Collectors.toList())); | wxCouponSend.setIds(wxCouponSendIds.stream().map(Long::parseLong).collect(Collectors.toList())); | ||||
| wxCouponSend.setTenantId(getTenantId()); | |||||
| wxCouponSend.updateTenantInfo(getTenantInfo()); | |||||
| wxCouponSend.setSendType(EnumCouponSendSendType.MERCHANT.getCode()); | wxCouponSend.setSendType(EnumCouponSendSendType.MERCHANT.getCode()); | ||||
| wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); | wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); | ||||
| try { | try { | ||||
| @@ -97,7 +97,7 @@ public class WxCreditHistoryController extends BaseController { | |||||
| @PostMapping("/add") | @PostMapping("/add") | ||||
| public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) { | public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) { | ||||
| log.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); | log.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); | ||||
| wxCreditHistory.setTenantId(getTenantId()); | |||||
| wxCreditHistory.updateTenantInfo(getTenantInfo()); | |||||
| wxCreditHistory.setOperatorId(getUser().getId()); | wxCreditHistory.setOperatorId(getUser().getId()); | ||||
| WxMerchant wxMerchant = new WxMerchant(); | WxMerchant wxMerchant = new WxMerchant(); | ||||
| wxMerchant.setId(getUser().getMerchantId()); | wxMerchant.setId(getUser().getMerchantId()); | ||||
| @@ -44,7 +44,7 @@ public class WxMerchantController extends BaseController { | |||||
| if (wxMerchant.getId() == null) { | if (wxMerchant.getId() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空"); | ||||
| } | } | ||||
| wxMerchant.setTenantId(getTenantId()); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| return new ResultData(wxProfitSharingReceiverService.findReceiver(wxMerchant)); | return new ResultData(wxProfitSharingReceiverService.findReceiver(wxMerchant)); | ||||
| } | } | ||||
| @@ -70,7 +70,7 @@ public class WxMerchantController extends BaseController { | |||||
| if (StringUtils.isEmpty(wxMerchant.getAccountName())) { | if (StringUtils.isEmpty(wxMerchant.getAccountName())) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "账号名称不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "账号名称不能为空"); | ||||
| } | } | ||||
| wxMerchant.setTenantId(getTenantId()); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| return wxMerchantService.updateMerchantAccount(wxMerchant); | return wxMerchantService.updateMerchantAccount(wxMerchant); | ||||
| } | } | ||||
| @@ -85,7 +85,7 @@ public class WxMerchantController extends BaseController { | |||||
| if (receiver.getId() == null) { | if (receiver.getId() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户分账账户ID不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户分账账户ID不能为空"); | ||||
| } | } | ||||
| receiver.setTenantId(getTenantId()); | |||||
| receiver.updateTenantInfo(getTenantInfo()); | |||||
| return wxProfitSharingReceiverService.delReceiver(receiver, EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode()); | return wxProfitSharingReceiverService.delReceiver(receiver, EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode()); | ||||
| } | } | ||||
| @@ -38,7 +38,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||||
| @ApiOperation("获得指定日期的解单,默认不传reportDate为当天") | @ApiOperation("获得指定日期的解单,默认不传reportDate为当天") | ||||
| @GetMapping("/getVolume") | @GetMapping("/getVolume") | ||||
| public ResultData getVolume(WxMerchantTradeDaily wxMerchantTradeDaily) { | public ResultData getVolume(WxMerchantTradeDaily wxMerchantTradeDaily) { | ||||
| wxMerchantTradeDaily.setTenantId(getTenantId()); | |||||
| wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); | |||||
| return wxMerchantTradeDailyService.getVolume(wxMerchantTradeDaily,getUser().getId()); | return wxMerchantTradeDailyService.getVolume(wxMerchantTradeDaily,getUser().getId()); | ||||
| } | } | ||||
| @@ -204,7 +204,7 @@ public class WxMicroPayController extends BaseController { | |||||
| } | } | ||||
| WxPayOrder record = new WxPayOrder(); | WxPayOrder record = new WxPayOrder(); | ||||
| record.setTenantId(getTenantId()); | |||||
| record.updateTenantInfo(getTenantInfo()); | |||||
| record.setId(payOrderId); | record.setId(payOrderId); | ||||
| record.setPayOrderNo(payOrderIdStr); | record.setPayOrderNo(payOrderIdStr); | ||||
| record.setBUserId(getUser().getId()); | record.setBUserId(getUser().getId()); | ||||
| @@ -43,7 +43,7 @@ public class WxActivityJoinController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxActivityJoin wxActivityJoin, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxActivityJoin wxActivityJoin, Integer pageNum, Integer pageSize) { | ||||
| if (null == wxActivityJoin) wxActivityJoin = new WxActivityJoin(); | if (null == wxActivityJoin) wxActivityJoin = new WxActivityJoin(); | ||||
| wxActivityJoin.setUserId(getUserId()); | wxActivityJoin.setUserId(getUserId()); | ||||
| wxActivityJoin.setTenantId(getTenantId()); | |||||
| wxActivityJoin.updateTenantInfo(getTenantInfo()); | |||||
| wxActivityJoin.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | wxActivityJoin.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | ||||
| final PageInfo<WxActivity> page = wxActivityJoinService.clistAsPage(wxActivityJoin, pageNum, pageSize); | final PageInfo<WxActivity> page = wxActivityJoinService.clistAsPage(wxActivityJoin, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -55,7 +55,7 @@ public class WxActivityJoinController extends BaseController { | |||||
| if (wxActivityJoin.getActivityId() == null) { | if (wxActivityJoin.getActivityId() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); | ||||
| } | } | ||||
| wxActivityJoin.setTenantId(getTenantId()); | |||||
| wxActivityJoin.updateTenantInfo(getTenantInfo()); | |||||
| wxActivityJoin.setUserId(getUserId()); | wxActivityJoin.setUserId(getUserId()); | ||||
| wxActivityJoin.setNickName(getUser().getNickName()); | wxActivityJoin.setNickName(getUser().getNickName()); | ||||
| if (StringUtils.isNotEmpty(wxActivityJoin.getAnswer())) { | if (StringUtils.isNotEmpty(wxActivityJoin.getAnswer())) { | ||||
| @@ -77,7 +77,7 @@ public class WxActivityJoinController extends BaseController { | |||||
| if (wxActivityJoin.getActivityId() == null) { | if (wxActivityJoin.getActivityId() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); | ||||
| } | } | ||||
| wxActivityJoin.setTenantId(getTenantId()); | |||||
| wxActivityJoin.updateTenantInfo(getTenantInfo()); | |||||
| wxActivityJoin.setUserId(getUserId()); | wxActivityJoin.setUserId(getUserId()); | ||||
| return wxActivityJoinService.sign(wxActivityJoin); | return wxActivityJoinService.sign(wxActivityJoin); | ||||
| } | } | ||||
| @@ -47,7 +47,7 @@ public class WxCampaignController extends BaseController { | |||||
| if (null == wxCampaign) wxCampaign = new WxCampaign(); | if (null == wxCampaign) wxCampaign = new WxCampaign(); | ||||
| wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); | wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); | ||||
| wxCampaign.setTenantId(getTenantId()); | |||||
| wxCampaign.updateTenantInfo(getTenantInfo()); | |||||
| wxCampaign.setSortColumns(BaseEntity.SortField.SortNum_ASC, BaseEntity.SortField.CreateTime_ASC); | wxCampaign.setSortColumns(BaseEntity.SortField.SortNum_ASC, BaseEntity.SortField.CreateTime_ASC); | ||||
| final PageInfo<WxCampaign> page = wxCampaignService.clistAsPage(wxCampaign, pageNum, pageSize); | final PageInfo<WxCampaign> page = wxCampaignService.clistAsPage(wxCampaign, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -60,7 +60,7 @@ public class WxCampaignController extends BaseController { | |||||
| WxCampaign wxCampaign = wxCampaignService.getById(id); | WxCampaign wxCampaign = wxCampaignService.getById(id); | ||||
| if (wxCampaign != null) { | if (wxCampaign != null) { | ||||
| WxCouponChannel wxCouponChannel = new WxCouponChannel(); | WxCouponChannel wxCouponChannel = new WxCouponChannel(); | ||||
| wxCouponChannel.setTenantId(getTenantId()); | |||||
| wxCouponChannel.updateTenantInfo(getTenantInfo()); | |||||
| wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); | wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); | ||||
| wxCouponChannel.setSubTargetId(wxCampaign.getId()); | wxCouponChannel.setSubTargetId(wxCampaign.getId()); | ||||
| wxCouponChannel.setStatus(0); | wxCouponChannel.setStatus(0); | ||||
| @@ -326,7 +326,7 @@ public class WxCarController extends BaseController { | |||||
| Date curr = new Date(); | Date curr = new Date(); | ||||
| WxCUserCar userCar = new WxCUserCar(); | WxCUserCar userCar = new WxCUserCar(); | ||||
| userCar.setCUserId(getUserId()); | userCar.setCUserId(getUserId()); | ||||
| userCar.setTenantId(getTenantId()); | |||||
| userCar.updateTenantInfo(getTenantInfo()); | |||||
| userCar.setCarNumber(carNumber); | userCar.setCarNumber(carNumber); | ||||
| userCar.setVendorType(carVendor.getCode()); | userCar.setVendorType(carVendor.getCode()); | ||||
| userCar.setCreateDate(curr); | userCar.setCreateDate(curr); | ||||
| @@ -384,7 +384,7 @@ public class WxCarController extends BaseController { | |||||
| WxCUserCar userCar = new WxCUserCar(); | WxCUserCar userCar = new WxCUserCar(); | ||||
| userCar.setId(newCarId); | userCar.setId(newCarId); | ||||
| userCar.setCUserId(getUserId()); | userCar.setCUserId(getUserId()); | ||||
| userCar.setTenantId(getTenantId()); | |||||
| userCar.updateTenantInfo(getTenantInfo()); | |||||
| userCar.setCarNumber(carNumber); | userCar.setCarNumber(carNumber); | ||||
| userCar.setVendorType(EnumCarVendor.CAR_TJD.getCode()); | userCar.setVendorType(EnumCarVendor.CAR_TJD.getCode()); | ||||
| JSONObject jo = new JSONObject(); | JSONObject jo = new JSONObject(); | ||||
| @@ -410,7 +410,7 @@ public class WxCarController extends BaseController { | |||||
| private void addCredit() { | private void addCredit() { | ||||
| WxCreditHistory wxCreditHistory = new WxCreditHistory(); | WxCreditHistory wxCreditHistory = new WxCreditHistory(); | ||||
| wxCreditHistory.setCUserId(getUserId()); | wxCreditHistory.setCUserId(getUserId()); | ||||
| wxCreditHistory.setTenantId(getTenantId()); | |||||
| wxCreditHistory.updateTenantInfo(getTenantInfo()); | |||||
| wxCreditHistory.setCreateDate(new Date()); | wxCreditHistory.setCreateDate(new Date()); | ||||
| wxCreditHistory.setCreditType(EnumScoreType.BIND_CAR.getCode()); | wxCreditHistory.setCreditType(EnumScoreType.BIND_CAR.getCode()); | ||||
| wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); | wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); | ||||
| @@ -472,7 +472,7 @@ public class WxCarController extends BaseController { | |||||
| try { | try { | ||||
| WxCUserCar userCar = new WxCUserCar(); | WxCUserCar userCar = new WxCUserCar(); | ||||
| userCar.setCUserId(getUserId()); | userCar.setCUserId(getUserId()); | ||||
| userCar.setTenantId(getTenantId()); | |||||
| userCar.updateTenantInfo(getTenantInfo()); | |||||
| userCar.setCarNumber(carNumber); | userCar.setCarNumber(carNumber); | ||||
| wxCUserCarService.deleteByObj(userCar); | wxCUserCarService.deleteByObj(userCar); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -496,7 +496,7 @@ public class WxCarController extends BaseController { | |||||
| } | } | ||||
| try { | try { | ||||
| WxCUserCar userCar = new WxCUserCar(); | WxCUserCar userCar = new WxCUserCar(); | ||||
| userCar.setTenantId(getTenantId()); | |||||
| userCar.updateTenantInfo(getTenantInfo()); | |||||
| userCar.setCUserId(getUserId()); | userCar.setCUserId(getUserId()); | ||||
| userCar.setCarNumber(carNumber); | userCar.setCarNumber(carNumber); | ||||
| wxCUserCarService.deleteByObj(userCar); | wxCUserCarService.deleteByObj(userCar); | ||||
| @@ -515,7 +515,7 @@ public class WxCarController extends BaseController { | |||||
| } | } | ||||
| WxCUserCar queryOne = new WxCUserCar(); | WxCUserCar queryOne = new WxCUserCar(); | ||||
| queryOne.setCarNumber(carNumber); | queryOne.setCarNumber(carNumber); | ||||
| queryOne.setTenantId(getTenantId()); | |||||
| queryOne.updateTenantInfo(getTenantInfo()); | |||||
| queryOne.setCUserId(getUserId()); | queryOne.setCUserId(getUserId()); | ||||
| WxCUserCar userCar = wxCUserCarService.getOne(queryOne); | WxCUserCar userCar = wxCUserCarService.getOne(queryOne); | ||||
| if (userCar != null) { | if (userCar != null) { | ||||
| @@ -726,7 +726,7 @@ public class WxCarController extends BaseController { | |||||
| WxCouponOrderCarCVo userCar = null; | WxCouponOrderCarCVo userCar = null; | ||||
| WxCouponOrder userCarQ = new WxCouponOrder(); | WxCouponOrder userCarQ = new WxCouponOrder(); | ||||
| userCarQ.setTenantId(getTenantId()); | |||||
| userCarQ.updateTenantInfo(getTenantInfo()); | |||||
| userCarQ.setCUserId(getUserId()); | userCarQ.setCUserId(getUserId()); | ||||
| userCarQ.setId(couponOrderId); | userCarQ.setId(couponOrderId); | ||||
| userCarQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); | userCarQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); | ||||
| @@ -774,7 +774,7 @@ public class WxCarController extends BaseController { | |||||
| // 券状态设为已使用 | // 券状态设为已使用 | ||||
| WxCouponOrder couponOrder = new WxCouponOrder(); | WxCouponOrder couponOrder = new WxCouponOrder(); | ||||
| couponOrder.setId(userCar.getId()); | couponOrder.setId(userCar.getId()); | ||||
| couponOrder.setTenantId(getTenantId()); | |||||
| couponOrder.updateTenantInfo(getTenantInfo()); | |||||
| couponOrder.setUpdateDate(new Date()); | couponOrder.setUpdateDate(new Date()); | ||||
| couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); | couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); | ||||
| try { | try { | ||||
| @@ -865,7 +865,7 @@ public class WxCarController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCarCVo(); | if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCarCVo(); | ||||
| wxCouponOrder.setTenantId(getTenantId()); | |||||
| wxCouponOrder.updateTenantInfo(getTenantInfo()); | |||||
| wxCouponOrder.setCUserId(getUserId()); | wxCouponOrder.setCUserId(getUserId()); | ||||
| if (wxCouponOrder.getCouponOrderStatus() == null) | if (wxCouponOrder.getCouponOrderStatus() == null) | ||||
| wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | ||||
| @@ -171,7 +171,7 @@ public class WxCardPayController extends BaseController { | |||||
| String ipStr = getIpAddr(); | String ipStr = getIpAddr(); | ||||
| logger.info("saveCardPayOrder: " + ipStr + " :" + wxCardSpend.toString()); | logger.info("saveCardPayOrder: " + ipStr + " :" + wxCardSpend.toString()); | ||||
| if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); | if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); | ||||
| wxCardSpend.setTenantId(getTenantId()); | |||||
| wxCardSpend.updateTenantInfo(getTenantInfo()); | |||||
| wxCardSpend.setOwnerId(getUserId()); | wxCardSpend.setOwnerId(getUserId()); | ||||
| final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); | final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -183,7 +183,7 @@ public class WxCardPayController extends BaseController { | |||||
| String ipStr = getIpAddr(); | String ipStr = getIpAddr(); | ||||
| logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); | logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); | ||||
| if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); | if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); | ||||
| wxCardSpend.setTenantId(getTenantId()); | |||||
| wxCardSpend.updateTenantInfo(getTenantInfo()); | |||||
| wxCardSpend.setOwnerId(getUserId()); | wxCardSpend.setOwnerId(getUserId()); | ||||
| final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForOwner(wxCardSpend); | final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForOwner(wxCardSpend); | ||||
| return new ResultData(mapList); | return new ResultData(mapList); | ||||
| @@ -47,7 +47,7 @@ public class WxCouponChannelController extends BaseController { | |||||
| @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) | @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) | ||||
| public ResultData list(@ModelAttribute WxCouponChannel wxCouponChannel,Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxCouponChannel wxCouponChannel,Integer pageNum, Integer pageSize) { | ||||
| if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); | if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); | ||||
| wxCouponChannel.setTenantId(getTenantId()); | |||||
| wxCouponChannel.updateTenantInfo(getTenantInfo()); | |||||
| wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | ||||
| wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); | wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); | ||||
| @@ -64,7 +64,7 @@ public class WxCouponChannelController extends BaseController { | |||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | ||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | ||||
| public ResultData listByMerchant(@ModelAttribute WxCouponChannel wxCouponChannel, Integer pageNum, Integer pageSize) { | public ResultData listByMerchant(@ModelAttribute WxCouponChannel wxCouponChannel, Integer pageNum, Integer pageSize) { | ||||
| wxCouponChannel.setTenantId(getTenantId()); | |||||
| wxCouponChannel.updateTenantInfo(getTenantInfo()); | |||||
| wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | ||||
| wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); | wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); | ||||
| @@ -102,7 +102,7 @@ public class WxCouponChannelController extends BaseController { | |||||
| @GetMapping("change") | @GetMapping("change") | ||||
| public ResultData change(@ModelAttribute WxCouponChannel wxCouponChannel) { | public ResultData change(@ModelAttribute WxCouponChannel wxCouponChannel) { | ||||
| if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); | if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); | ||||
| wxCouponChannel.setTenantId(getTenantId()); | |||||
| wxCouponChannel.updateTenantInfo(getTenantInfo()); | |||||
| wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | ||||
| wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); | wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); | ||||
| wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); | wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); | ||||
| @@ -140,7 +140,7 @@ public class WxCouponOrderController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| if (cardCVo == null) cardCVo = new WxCardCVo(); | if (cardCVo == null) cardCVo = new WxCardCVo(); | ||||
| cardCVo.setTenantId(getTenantId()); | |||||
| cardCVo.updateTenantInfo(getTenantInfo()); | |||||
| cardCVo.setOwnerId(getUserId()); | cardCVo.setOwnerId(getUserId()); | ||||
| if(StringUtils.isNotBlank(cardCVo.getStatusStr())) { | if(StringUtils.isNotBlank(cardCVo.getStatusStr())) { | ||||
| String [] statusAttr = cardCVo.getStatusStr().split(","); | String [] statusAttr = cardCVo.getStatusStr().split(","); | ||||
| @@ -44,7 +44,7 @@ public class WxCouponPasswordController extends BaseController { | |||||
| } | } | ||||
| // 1. 根据password获取领取的couponId | // 1. 根据password获取领取的couponId | ||||
| WxCouponPassword couponPasswordQ = new WxCouponPassword(); | WxCouponPassword couponPasswordQ = new WxCouponPassword(); | ||||
| couponPasswordQ.setTenantId(getTenantId()); | |||||
| couponPasswordQ.updateTenantInfo(getTenantInfo()); | |||||
| couponPasswordQ.setPassword(password); | couponPasswordQ.setPassword(password); | ||||
| couponPasswordQ.setExpireDate(new Date()); | couponPasswordQ.setExpireDate(new Date()); | ||||
| WxCouponPassword couponPassword = null; | WxCouponPassword couponPassword = null; | ||||
| @@ -39,7 +39,7 @@ public class WxGameController extends BaseController { | |||||
| @GetMapping("getOne") | @GetMapping("getOne") | ||||
| public ResultData getOne(@ModelAttribute WxGame wxGame) { | public ResultData getOne(@ModelAttribute WxGame wxGame) { | ||||
| if (wxGame == null) wxGame = new WxGame(); | if (wxGame == null) wxGame = new WxGame(); | ||||
| wxGame.setTenantId(getTenantId()); | |||||
| wxGame.updateTenantInfo(getTenantInfo()); | |||||
| wxGame.setStatus(EnumGameStatus.STATUS_THROW_IN.getCode()); | wxGame.setStatus(EnumGameStatus.STATUS_THROW_IN.getCode()); | ||||
| // 因为有算法要求,分成两步获取 | // 因为有算法要求,分成两步获取 | ||||
| WxGame record = wxGameService.getOne(wxGame); | WxGame record = wxGameService.getOne(wxGame); | ||||
| @@ -54,7 +54,7 @@ public class WxGameController extends BaseController { | |||||
| @GetMapping("getOneGame") | @GetMapping("getOneGame") | ||||
| public ResultData getOneGame(@ModelAttribute WxGame wxGame) { | public ResultData getOneGame(@ModelAttribute WxGame wxGame) { | ||||
| if (wxGame == null) wxGame = new WxGame(); | if (wxGame == null) wxGame = new WxGame(); | ||||
| wxGame.setTenantId(getTenantId()); | |||||
| wxGame.updateTenantInfo(getTenantInfo()); | |||||
| wxGame.setStatus(EnumGameStatus.STATUS_THROW_IN.getCode()); | wxGame.setStatus(EnumGameStatus.STATUS_THROW_IN.getCode()); | ||||
| // 因为有算法要求,分成两步获取 | // 因为有算法要求,分成两步获取 | ||||
| WxGame record = wxGameService.getOne(wxGame); | WxGame record = wxGameService.getOne(wxGame); | ||||
| @@ -48,7 +48,7 @@ public class WxOrderGroupController extends BaseController { | |||||
| } | } | ||||
| wxOrderGroup.setRemainPeople(1); | wxOrderGroup.setRemainPeople(1); | ||||
| wxOrderGroup.setStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()); | wxOrderGroup.setStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()); | ||||
| wxOrderGroup.setTenantId(getTenantId()); | |||||
| wxOrderGroup.updateTenantInfo(getTenantInfo()); | |||||
| return wxOrderGroupService.queryRemainOne(wxOrderGroup, getUserId()); | return wxOrderGroupService.queryRemainOne(wxOrderGroup, getUserId()); | ||||
| } | } | ||||
| @@ -62,7 +62,7 @@ public class WxOrderGroupController extends BaseController { | |||||
| public ResultData queryOrderGroup(Integer pageNum, Integer pageSize) { | public ResultData queryOrderGroup(Integer pageNum, Integer pageSize) { | ||||
| WxOrder wxOrder = new WxOrder(); | WxOrder wxOrder = new WxOrder(); | ||||
| wxOrder.setCUserId(getUserId()); | wxOrder.setCUserId(getUserId()); | ||||
| wxOrder.setTenantId(getTenantId()); | |||||
| wxOrder.updateTenantInfo(getTenantInfo()); | |||||
| final PageInfo<Map<String, Object>> page = wxOrderGroupService.queryOrderGroup(wxOrder, pageNum, pageSize); | final PageInfo<Map<String, Object>> page = wxOrderGroupService.queryOrderGroup(wxOrder, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -84,7 +84,7 @@ public class WxOrderGroupController extends BaseController { | |||||
| if (wxOrderGroup.getOrderId() == null) { | if (wxOrderGroup.getOrderId() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); | ||||
| } | } | ||||
| wxOrderGroup.setTenantId(getTenantId()); | |||||
| wxOrderGroup.updateTenantInfo(getTenantInfo()); | |||||
| return wxOrderGroupService.toOrderGroup(wxOrderGroup); | return wxOrderGroupService.toOrderGroup(wxOrderGroup); | ||||
| } | } | ||||
| @@ -105,7 +105,7 @@ public class WxOrderGroupController extends BaseController { | |||||
| if (wxOrderGroup.getOrderId() == null) { | if (wxOrderGroup.getOrderId() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); | ||||
| } | } | ||||
| wxOrderGroup.setTenantId(getTenantId()); | |||||
| wxOrderGroup.updateTenantInfo(getTenantInfo()); | |||||
| return wxOrderGroupService.queryOrderGroupStatus(wxOrderGroup); | return wxOrderGroupService.queryOrderGroupStatus(wxOrderGroup); | ||||
| } | } | ||||
| @@ -119,7 +119,7 @@ public class WxOrderGroupController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空"); | ||||
| } | } | ||||
| wxOrderGroup.setUserId(getUserId()); | wxOrderGroup.setUserId(getUserId()); | ||||
| wxOrderGroup.setTenantId(getTenantId()); | |||||
| wxOrderGroup.updateTenantInfo(getTenantInfo()); | |||||
| return wxOrderGroupService.queryAttendStatus(wxOrderGroup); | return wxOrderGroupService.queryAttendStatus(wxOrderGroup); | ||||
| } | } | ||||
| @@ -28,7 +28,7 @@ public class WxParkController extends BaseController { | |||||
| @GetMapping("/info") | @GetMapping("/info") | ||||
| public ResultData findById() { | public ResultData findById() { | ||||
| WxPark parkQ = new WxPark(); | WxPark parkQ = new WxPark(); | ||||
| parkQ.setTenantId(getTenantId()); | |||||
| parkQ.updateTenantInfo(getTenantInfo()); | |||||
| WxPark park = wxParkService.getByObj(parkQ); | WxPark park = wxParkService.getByObj(parkQ); | ||||
| if (park == null) { | if (park == null) { | ||||
| logger.error("车场未取到"); | logger.error("车场未取到"); | ||||
| @@ -44,7 +44,7 @@ public class WxQuestionController extends BaseController { | |||||
| @GetMapping("getQuestion") | @GetMapping("getQuestion") | ||||
| public Result getQuestion(@RequestParam("couponType") String couponType) { | public Result getQuestion(@RequestParam("couponType") String couponType) { | ||||
| WxQuestionConfig wxQuestionConfig = new WxQuestionConfig(); | WxQuestionConfig wxQuestionConfig = new WxQuestionConfig(); | ||||
| wxQuestionConfig.setTenantId(getTenantId()); | |||||
| wxQuestionConfig.updateTenantInfo(getTenantInfo()); | |||||
| JSONArray ct = new JSONArray(); | JSONArray ct = new JSONArray(); | ||||
| try { | try { | ||||
| ct.put(Integer.valueOf(couponType)); | ct.put(Integer.valueOf(couponType)); | ||||
| @@ -59,7 +59,7 @@ public class WxQuestionController extends BaseController { | |||||
| if (wxQuestionConfig.getStatus().equals(EnumQuestionConfigStatus.ON.getCode()) | if (wxQuestionConfig.getStatus().equals(EnumQuestionConfigStatus.ON.getCode()) | ||||
| && questionIds.size() > 0) { | && questionIds.size() > 0) { | ||||
| WxQuestion wxQuestion = new WxQuestion(); | WxQuestion wxQuestion = new WxQuestion(); | ||||
| wxQuestion.setTenantId(getTenantId()); | |||||
| wxQuestion.updateTenantInfo(getTenantInfo()); | |||||
| wxQuestion.setIds(questionIds); | wxQuestion.setIds(questionIds); | ||||
| List<WxQuestion> listQuestion = wxQuestionService.findList(wxQuestion); | List<WxQuestion> listQuestion = wxQuestionService.findList(wxQuestion); | ||||
| if (listQuestion.size() > 0) { | if (listQuestion.size() > 0) { | ||||
| @@ -69,7 +69,7 @@ public class WxQuestionController extends BaseController { | |||||
| WxQuestion x = q.next(); | WxQuestion x = q.next(); | ||||
| wxQuestionLog.setQuestionId(x.getId()); | wxQuestionLog.setQuestionId(x.getId()); | ||||
| wxQuestionLog.setUserId(getUserId()); | wxQuestionLog.setUserId(getUserId()); | ||||
| wxQuestionLog.setTenantId(getTenantId()); | |||||
| wxQuestionLog.updateTenantInfo(getTenantInfo()); | |||||
| if(wxQuestionService.findLogList(wxQuestionLog).size()>0){ | if(wxQuestionService.findLogList(wxQuestionLog).size()>0){ | ||||
| q.remove(); | q.remove(); | ||||
| @@ -28,7 +28,7 @@ public class WxScoreHistoryController extends BaseController { | |||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | ||||
| public ResultData list(Integer pageNum, Integer pageSize) { | public ResultData list(Integer pageNum, Integer pageSize) { | ||||
| WxScoreHistory wxScoreHistory = new WxScoreHistory(); | WxScoreHistory wxScoreHistory = new WxScoreHistory(); | ||||
| wxScoreHistory.setTenantId(getTenantId()); | |||||
| wxScoreHistory.updateTenantInfo(getTenantInfo()); | |||||
| wxScoreHistory.setCUserId(getUserId()); | wxScoreHistory.setCUserId(getUserId()); | ||||
| wxScoreHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | wxScoreHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | ||||
| final PageInfo<WxScoreHistory> page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); | final PageInfo<WxScoreHistory> page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); | ||||
| @@ -701,7 +701,7 @@ public class WxUserGrantController extends BaseController { | |||||
| @GetMapping("/carList") | @GetMapping("/carList") | ||||
| public ResultData getCarList() { | public ResultData getCarList() { | ||||
| WxCUserCar userCar = new WxCUserCar(); | WxCUserCar userCar = new WxCUserCar(); | ||||
| userCar.setTenantId(getTenantId()); | |||||
| userCar.updateTenantInfo(getTenantInfo()); | |||||
| userCar.setCUserId(getUserId()); | userCar.setCUserId(getUserId()); | ||||
| List<WxCUserCar> list = wxCUserCarService.getList(userCar); | List<WxCUserCar> list = wxCUserCarService.getList(userCar); | ||||
| return new ResultData(Result.SUCCESS, "获取查询成功", list); | return new ResultData(Result.SUCCESS, "获取查询成功", list); | ||||
| @@ -775,7 +775,7 @@ public class WxUserGrantController extends BaseController { | |||||
| //增加积分 | //增加积分 | ||||
| WxCreditHistory wxCreditHistory = new WxCreditHistory(); | WxCreditHistory wxCreditHistory = new WxCreditHistory(); | ||||
| wxCreditHistory.setCUserId(record.getId()); | wxCreditHistory.setCUserId(record.getId()); | ||||
| wxCreditHistory.setTenantId(getTenantId()); | |||||
| wxCreditHistory.updateTenantInfo(getTenantInfo()); | |||||
| wxCreditHistory.setCreateDate(new Date()); | wxCreditHistory.setCreateDate(new Date()); | ||||
| wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode()); | wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode()); | ||||
| wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); | wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); | ||||
| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.controller.base; | package com.iformall.controller.base; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.utils.IPUtil; | import com.iformall.utils.IPUtil; | ||||
| import org.springframework.web.bind.WebDataBinder; | import org.springframework.web.bind.WebDataBinder; | ||||
| import org.springframework.web.bind.annotation.InitBinder; | import org.springframework.web.bind.annotation.InitBinder; | ||||
| @@ -38,6 +39,10 @@ public class BaseController { | |||||
| }); | }); | ||||
| } | } | ||||
| public void setTenantInfo(TenantEntity dest, TenantEntity source) { | |||||
| dest.setTenantId(source.getTenantId()); | |||||
| } | |||||
| public String getIpAddr() { | public String getIpAddr() { | ||||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | ||||
| String ipaddress = IPUtil.getIpAddr(request); | String ipaddress = IPUtil.getIpAddr(request); | ||||
| @@ -3,6 +3,7 @@ package com.iformall.domain.po; | |||||
| import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.BaseEntity; | import com.iformall.domain.po.base.BaseEntity; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @@ -32,11 +33,16 @@ public class WxBusiness extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") | @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") | ||||
| private Date enddate; | private Date enddate; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||||
| private String tenantId; | private String tenantId; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Integer limitStart; | private Integer limitStart; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Integer limitEnd; | private Integer limitEnd; | ||||
| public void updateTenantInfo(TenantEntity tenantEntity) { | |||||
| setTenantId(tenantEntity.getTenantId()); | |||||
| } | |||||
| } | } | ||||
| @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; | import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; | ||||
| import com.iformall.domain.po.WxCouponInject; | import com.iformall.domain.po.WxCouponInject; | ||||
| import com.iformall.domain.po.WxMsgConfig; | import com.iformall.domain.po.WxMsgConfig; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import lombok.ToString; | import lombok.ToString; | ||||
| @@ -15,11 +16,10 @@ import java.util.List; | |||||
| @Data | @Data | ||||
| @ToString(callSuper = true) | @ToString(callSuper = true) | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxMsg extends BaseMsg{ | |||||
| public class WxMsg extends BaseMsg { | |||||
| protected Long id; | protected Long id; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") | @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "模板id", name = "modelId") | @io.swagger.annotations.ApiModelProperty(value = "模板id", name = "modelId") | ||||
| @@ -78,4 +78,8 @@ public class WxMsg extends BaseMsg{ | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @io.swagger.annotations.ApiModelProperty(value = "", name = "filterList") | @io.swagger.annotations.ApiModelProperty(value = "", name = "filterList") | ||||
| List<WxCUserBasicInfoFilterListDto> filterList; | List<WxCUserBasicInfoFilterListDto> filterList; | ||||
| public void updateTenantInfo(TenantEntity tenantEntity) { | |||||
| setTenantId(tenantEntity.getTenantId()); | |||||
| } | |||||
| } | } | ||||
| @@ -1,6 +1,7 @@ | |||||
| package com.iformall.domain.po.msg; | package com.iformall.domain.po.msg; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import lombok.ToString; | import lombok.ToString; | ||||
| @@ -14,6 +15,8 @@ import java.util.Map; | |||||
| public class WxMsgRecord extends BaseMsg { | public class WxMsgRecord extends BaseMsg { | ||||
| protected Long id; | protected Long id; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") | |||||
| private String tenantId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="消息类型 1短信 2回调短信 3邮件 4微信小程序模板 5微信公众号模板 6系统通知 7websocket",name="msg") | @io.swagger.annotations.ApiModelProperty(value="消息类型 1短信 2回调短信 3邮件 4微信小程序模板 5微信公众号模板 6系统通知 7websocket",name="msg") | ||||
| private String msg; | private String msg; | ||||
| @io.swagger.annotations.ApiModelProperty(value="发送时间",name="sendTime") | @io.swagger.annotations.ApiModelProperty(value="发送时间",name="sendTime") | ||||
| @@ -50,5 +53,7 @@ public class WxMsgRecord extends BaseMsg { | |||||
| @io.swagger.annotations.ApiModelProperty(value="动态替换内容",name="dynamicContentMap") | @io.swagger.annotations.ApiModelProperty(value="动态替换内容",name="dynamicContentMap") | ||||
| private Map<String,String> dynamicContentMap; | private Map<String,String> dynamicContentMap; | ||||
| public void updateTenantInfo(TenantEntity tenantEntity) { | |||||
| setTenantId(tenantEntity.getTenantId()); | |||||
| } | |||||
| } | } | ||||
| @@ -6,9 +6,11 @@ import java.text.SimpleDateFormat; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import com.iformall.domain.po.MallUserInfo; | import com.iformall.domain.po.MallUserInfo; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.shiro.UserSession; | import com.iformall.shiro.UserSession; | ||||
| import com.iformall.utils.IPUtil; | import com.iformall.utils.IPUtil; | ||||
| import org.apache.shiro.SecurityUtils; | import org.apache.shiro.SecurityUtils; | ||||
| import org.apache.shiro.session.Session; | |||||
| import org.springframework.web.bind.WebDataBinder; | import org.springframework.web.bind.WebDataBinder; | ||||
| import org.springframework.web.bind.annotation.InitBinder; | import org.springframework.web.bind.annotation.InitBinder; | ||||
| import org.springframework.web.bind.annotation.RestController; | import org.springframework.web.bind.annotation.RestController; | ||||
| @@ -50,12 +52,31 @@ public class BaseController { | |||||
| Long userId = (Long) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userId); | Long userId = (Long) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userId); | ||||
| return userId; | return userId; | ||||
| } | } | ||||
| @Deprecated | |||||
| public String getTenantId(){ | public String getTenantId(){ | ||||
| String tenantId = (String)SecurityUtils.getSubject().getSession().getAttribute(UserSession.tenantId); | String tenantId = (String)SecurityUtils.getSubject().getSession().getAttribute(UserSession.tenantId); | ||||
| return tenantId; | return tenantId; | ||||
| } | } | ||||
| /** | |||||
| * 返回租户信息 | |||||
| * @return | |||||
| */ | |||||
| public TenantEntity getTenantInfo(){ | |||||
| Session session = SecurityUtils.getSubject().getSession(); | |||||
| String tenantId = (String)session.getAttribute(UserSession.tenantId); | |||||
| TenantEntity tenantEntity = new TenantEntity(){{ | |||||
| setTenantId(tenantId); | |||||
| }}; | |||||
| return tenantEntity; | |||||
| } | |||||
| public void setTenantInfo(TenantEntity dest, TenantEntity source) { | |||||
| dest.setTenantId(source.getTenantId()); | |||||
| } | |||||
| public String getIpAddr() { | public String getIpAddr() { | ||||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | ||||
| String ipaddress = IPUtil.getIpAddr(request); | String ipaddress = IPUtil.getIpAddr(request); | ||||
| @@ -50,7 +50,7 @@ public class WxBrandController extends BaseController { | |||||
| @SystemControllerLog(description = "品牌-增加") | @SystemControllerLog(description = "品牌-增加") | ||||
| public ResultData add(@RequestBody WxBrand wxBrand) { | public ResultData add(@RequestBody WxBrand wxBrand) { | ||||
| logger.debug("[" + getIpAddr() + "] WxBrandController::add"); | logger.debug("[" + getIpAddr() + "] WxBrandController::add"); | ||||
| wxBrand.setTenantId(getTenantId()); | |||||
| wxBrand.updateTenantInfo(getTenantInfo()); | |||||
| return wxBrandService.save(wxBrand); | return wxBrandService.save(wxBrand); | ||||
| } | } | ||||
| @@ -58,7 +58,7 @@ public class WxBrandController extends BaseController { | |||||
| @SystemControllerLog(description = "品牌-更新") | @SystemControllerLog(description = "品牌-更新") | ||||
| public ResultData update(@RequestBody WxBrand wxBrand) { | public ResultData update(@RequestBody WxBrand wxBrand) { | ||||
| logger.debug("[" + getIpAddr() + "] WxBrandController::update"); | logger.debug("[" + getIpAddr() + "] WxBrandController::update"); | ||||
| wxBrand.setTenantId(getTenantId()); | |||||
| wxBrand.updateTenantInfo(getTenantInfo()); | |||||
| return wxBrandService.update(wxBrand); | return wxBrandService.update(wxBrand); | ||||
| } | } | ||||
| @@ -131,7 +131,7 @@ public class WxMallBuildingController extends BaseController { | |||||
| if (record.getTotalArea() == null && record.getOperatingArea() == null) { | if (record.getTotalArea() == null && record.getOperatingArea() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| record.setTenantId(getTenantId()); | |||||
| record.updateTenantInfo(getTenantInfo()); | |||||
| wxMallBuildingService.saveFloorArea(record); | wxMallBuildingService.saveFloorArea(record); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -41,7 +41,7 @@ public class WxMerchantController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); | logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); | ||||
| if (null == wxMerchant) wxMerchant = new WxMerchant(); | if (null == wxMerchant) wxMerchant = new WxMerchant(); | ||||
| wxMerchant.setTenantId(getTenantId()); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); | wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); | ||||
| final PageInfo<WxMerchant> page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); | final PageInfo<WxMerchant> page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -56,7 +56,7 @@ public class WxMerchantController extends BaseController { | |||||
| public ResultData listVo(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { | public ResultData listVo(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); | logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); | ||||
| if (null == wxMerchant) wxMerchant = new WxMerchant(); | if (null == wxMerchant) wxMerchant = new WxMerchant(); | ||||
| wxMerchant.setTenantId(getTenantId()); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); | wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); | ||||
| final PageInfo<WxMerchant> page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize); | final PageInfo<WxMerchant> page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -68,7 +68,7 @@ public class WxMerchantController extends BaseController { | |||||
| public ResultData etcpList(@ModelAttribute WxMerchant wxMerchant) { | public ResultData etcpList(@ModelAttribute WxMerchant wxMerchant) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantController::etcpList"); | logger.debug("[" + getIpAddr() + "] WxMerchantController::etcpList"); | ||||
| if (null == wxMerchant) wxMerchant = new WxMerchant(); | if (null == wxMerchant) wxMerchant = new WxMerchant(); | ||||
| wxMerchant.setTenantId(getTenantId()); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| final List<WxMerchant> merchantList = wxMerchantService.etcpList(wxMerchant); | final List<WxMerchant> merchantList = wxMerchantService.etcpList(wxMerchant); | ||||
| return new ResultData(merchantList); | return new ResultData(merchantList); | ||||
| } | } | ||||
| @@ -109,7 +109,7 @@ public class WxMerchantController extends BaseController { | |||||
| @SystemControllerLog(description = "商户-新增") | @SystemControllerLog(description = "商户-新增") | ||||
| public ResultData addMerchant(@RequestBody WxMerchant wxMerchant) { | public ResultData addMerchant(@RequestBody WxMerchant wxMerchant) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantController::addMerchant"); | logger.debug("[" + getIpAddr() + "] WxMerchantController::addMerchant"); | ||||
| wxMerchant.setTenantId(getTenantId()); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| return wxMerchantService.addMerchant(wxMerchant, getUserId()); | return wxMerchantService.addMerchant(wxMerchant, getUserId()); | ||||
| } | } | ||||
| @@ -118,7 +118,7 @@ public class WxMerchantController extends BaseController { | |||||
| @SystemControllerLog(description = "商户-更新") | @SystemControllerLog(description = "商户-更新") | ||||
| public ResultData updateMerchant(@RequestBody WxMerchant wxMerchant) { | public ResultData updateMerchant(@RequestBody WxMerchant wxMerchant) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchant"); | logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchant"); | ||||
| wxMerchant.setTenantId(getTenantId()); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| return wxMerchantService.updateMerchant(wxMerchant); | return wxMerchantService.updateMerchant(wxMerchant); | ||||
| } | } | ||||
| @@ -127,7 +127,7 @@ public class WxMerchantController extends BaseController { | |||||
| @SystemControllerLog(description = "商户-更新账户") | @SystemControllerLog(description = "商户-更新账户") | ||||
| public ResultData updateMerchantAccount(@RequestBody WxMerchant wxMerchant) { | public ResultData updateMerchantAccount(@RequestBody WxMerchant wxMerchant) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantAccount"); | logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantAccount"); | ||||
| wxMerchant.setTenantId(getTenantId()); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| return wxMerchantService.updateMerchantAccount(wxMerchant); | return wxMerchantService.updateMerchantAccount(wxMerchant); | ||||
| } | } | ||||
| @@ -136,7 +136,7 @@ public class WxMerchantController extends BaseController { | |||||
| @SystemControllerLog(description = "商户-更新管理员") | @SystemControllerLog(description = "商户-更新管理员") | ||||
| public ResultData updateMerchantAdmin(@RequestBody WxMerchant wxMerchant) { | public ResultData updateMerchantAdmin(@RequestBody WxMerchant wxMerchant) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantAdmin"); | logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantAdmin"); | ||||
| wxMerchant.setTenantId(getTenantId()); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| return wxMerchantService.updateMerchantAdmin(wxMerchant); | return wxMerchantService.updateMerchantAdmin(wxMerchant); | ||||
| } | } | ||||
| @@ -145,7 +145,7 @@ public class WxMerchantController extends BaseController { | |||||
| @SystemControllerLog(description = "商户-更新法人") | @SystemControllerLog(description = "商户-更新法人") | ||||
| public ResultData updateMerchantCopr(@RequestBody WxMerchant wxMerchant) { | public ResultData updateMerchantCopr(@RequestBody WxMerchant wxMerchant) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantCorp"); | logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantCorp"); | ||||
| wxMerchant.setTenantId(getTenantId()); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| return wxMerchantService.updateMerchantCorp(wxMerchant); | return wxMerchantService.updateMerchantCorp(wxMerchant); | ||||
| } | } | ||||
| @@ -154,7 +154,7 @@ public class WxMerchantController extends BaseController { | |||||
| @SystemControllerLog(description = "商户-更新税务") | @SystemControllerLog(description = "商户-更新税务") | ||||
| public ResultData updateMerchantTax(@RequestBody WxMerchant wxMerchant) { | public ResultData updateMerchantTax(@RequestBody WxMerchant wxMerchant) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantTax"); | logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantTax"); | ||||
| wxMerchant.setTenantId(getTenantId()); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| return wxMerchantService.updateMerchantTax(wxMerchant); | return wxMerchantService.updateMerchantTax(wxMerchant); | ||||
| } | } | ||||
| @@ -163,7 +163,7 @@ public class WxMerchantController extends BaseController { | |||||
| @SystemControllerLog(description = "商户-更新会员等级权益") | @SystemControllerLog(description = "商户-更新会员等级权益") | ||||
| public ResultData updateMerchantLevel(@RequestBody WxMerchant wxMerchant) { | public ResultData updateMerchantLevel(@RequestBody WxMerchant wxMerchant) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantLevel"); | logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantLevel"); | ||||
| wxMerchant.setTenantId(getTenantId()); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| return wxMerchantService.updateMerchantLevel(wxMerchant); | return wxMerchantService.updateMerchantLevel(wxMerchant); | ||||
| } | } | ||||
| @@ -189,7 +189,7 @@ public class WxMerchantController extends BaseController { | |||||
| @GetMapping("/exportData") | @GetMapping("/exportData") | ||||
| @SystemControllerLog(description = "商户-商户数据导出") | @SystemControllerLog(description = "商户-商户数据导出") | ||||
| public void exportData(@ModelAttribute WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response) { | public void exportData(@ModelAttribute WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response) { | ||||
| wxMerchant.setTenantId(getTenantId()); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| wxMerchantService.exportData(wxMerchant,request,response); | wxMerchantService.exportData(wxMerchant,request,response); | ||||
| } | } | ||||
| @@ -198,7 +198,7 @@ public class WxMerchantController extends BaseController { | |||||
| @SystemControllerLog(description = "商户-置顶") | @SystemControllerLog(description = "商户-置顶") | ||||
| public ResultData top(@RequestBody WxMerchant wxMerchant) { | public ResultData top(@RequestBody WxMerchant wxMerchant) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantController::top"); | logger.debug("[" + getIpAddr() + "] WxMerchantController::top"); | ||||
| wxMerchant.setTenantId(getTenantId()); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| return wxMerchantService.top(wxMerchant); | return wxMerchantService.top(wxMerchant); | ||||
| } | } | ||||
| @@ -33,7 +33,7 @@ public class WxMsgCallbackController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxMsgCallback wxMsgCallback, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxMsgCallback wxMsgCallback, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::list"); | logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::list"); | ||||
| if (null == wxMsgCallback) wxMsgCallback = new WxMsgCallback(); | if (null == wxMsgCallback) wxMsgCallback = new WxMsgCallback(); | ||||
| wxMsgCallback.setTenantId(getTenantId()); | |||||
| wxMsgCallback.updateTenantInfo(getTenantInfo()); | |||||
| wxMsgCallback.setSortColumns(BaseEntity.SortField.Createtime_DESC); | wxMsgCallback.setSortColumns(BaseEntity.SortField.Createtime_DESC); | ||||
| final PageInfo<WxMsgCallback> page = wxMsgCallbackService.listAsPage(wxMsgCallback, pageNum, pageSize); | final PageInfo<WxMsgCallback> page = wxMsgCallbackService.listAsPage(wxMsgCallback, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -46,7 +46,7 @@ public class WxMsgCallbackController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::add"); | logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::add"); | ||||
| //Assert.notNull(wxMsgCallback.getName(), "角色名不能为空"); | //Assert.notNull(wxMsgCallback.getName(), "角色名不能为空"); | ||||
| //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); | //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); | ||||
| wxMsgCallback.setTenantId(getTenantId()); | |||||
| wxMsgCallback.updateTenantInfo(getTenantInfo()); | |||||
| wxMsgCallbackService.saveOrUpdate(wxMsgCallback); | wxMsgCallbackService.saveOrUpdate(wxMsgCallback); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -45,7 +45,7 @@ public class WxMsgController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxMsg wxMsg, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxMsg wxMsg, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMsgController::list"); | logger.debug("[" + getIpAddr() + "] WxMsgController::list"); | ||||
| if (null == wxMsg) wxMsg = new WxMsg(); | if (null == wxMsg) wxMsg = new WxMsg(); | ||||
| wxMsg.setTenantId(getTenantId()); | |||||
| wxMsg.updateTenantInfo(getTenantInfo()); | |||||
| //wxMsg.setWay(EnumSendWay.TAG.getCode()); | //wxMsg.setWay(EnumSendWay.TAG.getCode()); | ||||
| wxMsg.setSortColumns(BaseEntity.SortField.Createtime_DESC); | wxMsg.setSortColumns(BaseEntity.SortField.Createtime_DESC); | ||||
| final PageInfo<WxMsg> page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize); | final PageInfo<WxMsg> page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize); | ||||
| @@ -57,7 +57,7 @@ public class WxMsgController extends BaseController { | |||||
| @SystemControllerLog(description = "标签短信-新增") | @SystemControllerLog(description = "标签短信-新增") | ||||
| public ResultData add(@RequestBody WxMsg wxMsg) { | public ResultData add(@RequestBody WxMsg wxMsg) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMsgController::add"); | logger.debug("[" + getIpAddr() + "] WxMsgController::add"); | ||||
| wxMsg.setTenantId(getTenantId()); | |||||
| wxMsg.updateTenantInfo(getTenantInfo()); | |||||
| return wxMsgService.add(wxMsg); | return wxMsgService.add(wxMsg); | ||||
| } | } | ||||
| @@ -33,7 +33,7 @@ public class WxMsgModelController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxMsgModel wxMsgModel, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxMsgModel wxMsgModel, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMsgModelController::list"); | logger.debug("[" + getIpAddr() + "] WxMsgModelController::list"); | ||||
| if (null == wxMsgModel) wxMsgModel = new WxMsgModel(); | if (null == wxMsgModel) wxMsgModel = new WxMsgModel(); | ||||
| wxMsgModel.setTenantId(getTenantId()); | |||||
| wxMsgModel.updateTenantInfo(getTenantInfo()); | |||||
| wxMsgModel.setSortColumns(BaseEntity.SortField.Createtime_DESC); | wxMsgModel.setSortColumns(BaseEntity.SortField.Createtime_DESC); | ||||
| final PageInfo<WxMsgModel> page = wxMsgModelService.listAsPage(wxMsgModel, pageNum, pageSize); | final PageInfo<WxMsgModel> page = wxMsgModelService.listAsPage(wxMsgModel, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -46,7 +46,7 @@ public class WxMsgModelController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxMsgModelController::add"); | logger.debug("[" + getIpAddr() + "] WxMsgModelController::add"); | ||||
| //Assert.notNull(wxMsgModel.getName(), "角色名不能为空"); | //Assert.notNull(wxMsgModel.getName(), "角色名不能为空"); | ||||
| //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); | //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); | ||||
| wxMsgModel.setTenantId(getTenantId()); | |||||
| wxMsgModel.updateTenantInfo(getTenantInfo()); | |||||
| return wxMsgModelService.saveOrUpdate(wxMsgModel); | return wxMsgModelService.saveOrUpdate(wxMsgModel); | ||||
| } | } | ||||
| @@ -33,7 +33,7 @@ public class WxMsgSignatureController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxMsgSignature wxMsgSignature, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxMsgSignature wxMsgSignature, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::list"); | logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::list"); | ||||
| if (null == wxMsgSignature) wxMsgSignature = new WxMsgSignature(); | if (null == wxMsgSignature) wxMsgSignature = new WxMsgSignature(); | ||||
| wxMsgSignature.setTenantId(getTenantId()); | |||||
| wxMsgSignature.updateTenantInfo(getTenantInfo()); | |||||
| wxMsgSignature.setSortColumns(BaseEntity.SortField.Createtime_DESC); | wxMsgSignature.setSortColumns(BaseEntity.SortField.Createtime_DESC); | ||||
| final PageInfo<WxMsgSignature> page = wxMsgSignatureService.listAsPage(wxMsgSignature, pageNum, pageSize); | final PageInfo<WxMsgSignature> page = wxMsgSignatureService.listAsPage(wxMsgSignature, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -46,7 +46,7 @@ public class WxMsgSignatureController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::add"); | logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::add"); | ||||
| //Assert.notNull(wxMsgSignature.getName(), "角色名不能为空"); | //Assert.notNull(wxMsgSignature.getName(), "角色名不能为空"); | ||||
| //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); | //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); | ||||
| wxMsgSignature.setTenantId(getTenantId()); | |||||
| wxMsgSignature.updateTenantInfo(getTenantInfo()); | |||||
| wxMsgSignatureService.saveOrUpdate(wxMsgSignature); | wxMsgSignatureService.saveOrUpdate(wxMsgSignature); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -30,7 +30,7 @@ public class WxMsgValidationcodeModelController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxMsgValidationcodeModel wxMsgValidationcodeModel, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxMsgValidationcodeModel wxMsgValidationcodeModel, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::list"); | logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::list"); | ||||
| if (null == wxMsgValidationcodeModel) wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); | if (null == wxMsgValidationcodeModel) wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); | ||||
| wxMsgValidationcodeModel.setTenantId(getTenantId()); | |||||
| wxMsgValidationcodeModel.updateTenantInfo(getTenantInfo()); | |||||
| final PageInfo<WxMsgValidationcodeModel> page = wxMsgValidationcodeModelService.listAsPage(wxMsgValidationcodeModel, pageNum, pageSize); | final PageInfo<WxMsgValidationcodeModel> page = wxMsgValidationcodeModelService.listAsPage(wxMsgValidationcodeModel, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -41,7 +41,7 @@ public class WxMsgValidationcodeModelController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::add"); | logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::add"); | ||||
| //Assert.notNull(wxMsgValidationcodeModel.getName(), "角色名不能为空"); | //Assert.notNull(wxMsgValidationcodeModel.getName(), "角色名不能为空"); | ||||
| //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); | //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); | ||||
| wxMsgValidationcodeModel.setTenantId(getTenantId()); | |||||
| wxMsgValidationcodeModel.updateTenantInfo(getTenantInfo()); | |||||
| return wxMsgValidationcodeModelService.saveOrUpdate(wxMsgValidationcodeModel); | return wxMsgValidationcodeModelService.saveOrUpdate(wxMsgValidationcodeModel); | ||||
| } | } | ||||
| @@ -87,7 +87,7 @@ public class MallRoleController extends BaseController { | |||||
| MallRole role = sysRoleService.getById(sysRole.getId()); | MallRole role = sysRoleService.getById(sysRole.getId()); | ||||
| MallRolePermission p = new MallRolePermission(); | MallRolePermission p = new MallRolePermission(); | ||||
| p.setRoleId(role.getId()); | p.setRoleId(role.getId()); | ||||
| p.setTenantId(getTenantId()); | |||||
| p.updateTenantInfo(getTenantInfo()); | |||||
| List<MallRolePermission> pers = sysRolePermissionService.getList(p); | List<MallRolePermission> pers = sysRolePermissionService.getList(p); | ||||
| String menus = ""; | String menus = ""; | ||||
| for (MallRolePermission rp : pers) { | for (MallRolePermission rp : pers) { | ||||
| @@ -70,7 +70,7 @@ public class MallUserInfoController extends BaseController { | |||||
| @SystemControllerLog(description = "用户管理-列表") | @SystemControllerLog(description = "用户管理-列表") | ||||
| public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { | public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); | logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); | ||||
| userInfo.setTenantId(getTenantId()); | |||||
| userInfo.updateTenantInfo(getTenantInfo()); | |||||
| userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize); | final PageInfo<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize); | ||||
| for (MallUserInfo u : page.getList()) { | for (MallUserInfo u : page.getList()) { | ||||
| @@ -130,7 +130,7 @@ public class MallUserInfoController extends BaseController { | |||||
| Assert.notNull(userInfo.getPassword(), "密码不能为空"); | Assert.notNull(userInfo.getPassword(), "密码不能为空"); | ||||
| PasswordHelper passwordHelper = new PasswordHelper(); | PasswordHelper passwordHelper = new PasswordHelper(); | ||||
| passwordHelper.encryptPassword(userInfo); | passwordHelper.encryptPassword(userInfo); | ||||
| userInfo.setTenantId(getTenantId()); | |||||
| userInfo.updateTenantInfo(getTenantInfo()); | |||||
| // 无法创建超管 | // 无法创建超管 | ||||
| userInfo.setIsAdmin(EnumUserAdmin.Normal.getCode()); | userInfo.setIsAdmin(EnumUserAdmin.Normal.getCode()); | ||||
| userInfoService.saveOrUpdate(userInfo); | userInfoService.saveOrUpdate(userInfo); | ||||
| @@ -169,7 +169,7 @@ public class MallUserInfoController extends BaseController { | |||||
| bChangedPhone = true; | bChangedPhone = true; | ||||
| } | } | ||||
| userInfo.setTenantId(getTenantId()); | |||||
| userInfo.updateTenantInfo(getTenantInfo()); | |||||
| if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { | if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { | ||||
| PasswordHelper passwordHelper = new PasswordHelper(); | PasswordHelper passwordHelper = new PasswordHelper(); | ||||
| passwordHelper.encryptPassword(userInfo); | passwordHelper.encryptPassword(userInfo); | ||||
| @@ -250,7 +250,7 @@ public class MallUserInfoController extends BaseController { | |||||
| } | } | ||||
| MallUserInfo updateUserInfo = new MallUserInfo(); | MallUserInfo updateUserInfo = new MallUserInfo(); | ||||
| updateUserInfo.setId(userInfo.getId()); | updateUserInfo.setId(userInfo.getId()); | ||||
| updateUserInfo.setTenantId(getTenantId()); | |||||
| updateUserInfo.updateTenantInfo(getTenantInfo()); | |||||
| updateUserInfo.setStatus(userInfo.getStatus()); | updateUserInfo.setStatus(userInfo.getStatus()); | ||||
| userInfoService.saveOrUpdate(userInfo); | userInfoService.saveOrUpdate(userInfo); | ||||
| return new ResultData(); | return new ResultData(); | ||||