From 2d39d395b1a1de226a2ce4756a44833f7ac513fd Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 1 Nov 2019 13:08:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=9B=86=E5=9B=A2=E7=89=88][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E9=9B=86=E5=9B=A2=E7=89=88=E9=A2=84=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxMsgValidationcodeController.java | 4 +- .../controller/WxTopicController.java | 6 +- .../controller/WxUserGrantController.java | 8 +-- .../iformall/schedule/ActivitySchedule.java | 4 +- .../schedule/BillNotificationSchedule.java | 9 ++- .../iformall/schedule/BillStatusSchedule.java | 5 +- .../iformall/schedule/ChartDataSchedule.java | 69 ++++++++++--------- 7 files changed, 55 insertions(+), 50 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index e61ab86cb..3f0116bc7 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -46,7 +46,7 @@ public class WxMsgValidationcodeController extends BaseController { public ResultData sendvalidationcode(String phone, Integer type) { WxCUser user = getUser(); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(user.getTenantId()); + wxMsgValidationcode.updateTenantInfo(getTenantInfo()); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); wxMsgValidationcode.setAppid(user.getAppId()); @@ -61,7 +61,7 @@ public class WxMsgValidationcodeController extends BaseController { public ResultData hasvalidationcode(String phone, Integer type, String code) { WxCUser user = getUser(); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(user.getTenantId()); + wxMsgValidationcode.updateTenantInfo(getTenantInfo()); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); wxMsgValidationcode.setCode(code); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java index 4bd3ad547..c74f5cb60 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java @@ -22,16 +22,14 @@ public class WxTopicController extends BaseController { public ResultData show() { logger.debug("[" + getIpAddr() + "] WxTopicController::show"); WxTopic wxTopic = new WxTopic(); - String tenantId = getTenantId(); - wxTopic.setTenantId(tenantId); + wxTopic.updateTenantInfo(getTenantInfo()); return new ResultData(wxTopicService.show(wxTopic)); } @GetMapping("findById") public ResultData findById(WxTopic wxTopic) { logger.debug("[" + getIpAddr() + "] WxTopicController::findById"); - String tenantId = getTenantId(); - wxTopic.setTenantId(tenantId); + wxTopic.updateTenantInfo(getTenantInfo()); WxTopic queryTopic = wxTopicService.findById(wxTopic); return new ResultData(queryTopic); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 31f1dba78..b2ee23a45 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -213,7 +213,7 @@ public class WxUserGrantController extends BaseController { String ipaddress = IPUtil.getIpAddr(request); WxCUser newUser = new WxCUser(); - newUser.setTenantId(wxAuthorizerInfo.getTenantId()); + newUser.updateTenantInfo(wxAuthorizerInfo); newUser.setAppId(appId); newUser.setOpenId(openId); if (boolHaveUnionId) { @@ -224,7 +224,7 @@ public class WxUserGrantController extends BaseController { if (boolHaveUnionId) { // 优先根据unionId查询 WxCUser userQ = new WxCUser(); - userQ.setTenantId(wxAuthorizerInfo.getTenantId()); + userQ.updateTenantInfo(wxAuthorizerInfo); userQ.setUnionId(unionId); oldUser = wxCUserService.getByObject(userQ); if(oldUser != null) { @@ -281,7 +281,7 @@ public class WxUserGrantController extends BaseController { resultMap.put("score", score); } else { // 新用户 - newUser.setTenantId(wxAuthorizerInfo.getTenantId()); + newUser.updateTenantInfo(wxAuthorizerInfo); token = newUser.createToken(new Date()); newUser.setRegisterIp(ipaddress); @@ -679,7 +679,7 @@ public class WxUserGrantController extends BaseController { public ResultData carCount() { WxCUser user = getUser(); WxCUserCar userCar = new WxCUserCar(); - userCar.setTenantId(user.getTenantId()); + userCar.updateTenantInfo(getTenantInfo()); userCar.setCUserId(user.getId()); Integer count = wxCUserCarService.countUserCar(userCar); if (count > 0) { diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java index 9774b7fba..3d8024f43 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java @@ -56,7 +56,7 @@ public class ActivitySchedule { WxActivityJoin wxActivityJoin; for (WxActivity activity : wxActivitys) { wxActivityJoin = new WxActivityJoin(); - wxActivityJoin.setTenantId(activity.getTenantId()); + wxActivityJoin.updateTenantInfo(activity); wxActivityJoin.setActivityId(activity.getId()); wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); List list = wxActivityJoinMapper.findList(wxActivityJoin); @@ -77,7 +77,7 @@ public class ActivitySchedule { wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.TIME_LIMIT_CAMPAIGN_NOTIFY.getCode()); wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(activityJoin.getTenantId()); + wxMsgRecord.updateTenantInfo(activityJoin); Map map = new HashedMap(); map.put("person", person); map.put("party", party); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java index c0566335c..f9385cab2 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java @@ -1,6 +1,7 @@ package com.iformall.schedule; import com.alibaba.fastjson.JSONObject; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.enums.*; import com.iformall.mapper.WxBillAllMapper; @@ -66,7 +67,9 @@ public class BillNotificationSchedule { wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.BILL_OWE.getCode()); wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.updateTenantInfo(new TenantEntity(){{ + setTenantId(tenantId); + }}); Map map = new HashedMap(); map.put("price", price.toString()); map.put("app", appname); @@ -95,7 +98,9 @@ public class BillNotificationSchedule { wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.BILL_WAIT_PAY.getCode()); wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.updateTenantInfo(new TenantEntity(){{ + setTenantId(tenantId); + }}); Map map = new HashedMap(); map.put("price", price.toString()); map.put("app", appname); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java index 962b9a7db..f1b713ba6 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java @@ -1,6 +1,7 @@ package com.iformall.schedule; import com.iformall.domain.po.WxMall; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillAll; import com.iformall.mapper.WxMallMapper; import com.iformall.service.WxBillAllService; @@ -35,9 +36,9 @@ public class BillStatusSchedule { List wxMalls = wxMallMapper.findList(null); for (WxMall wxMall : wxMalls) { - String tenantId = wxMall.getTenantId(); + TenantEntity tenantEntity = wxMall.getTenantInfo(); WxBillAll wxBillAll = new WxBillAll(); - wxBillAll.setTenantId(tenantId); + wxBillAll.updateTenantInfo(tenantEntity); wxBillAllService.updateBillStatus(wxBillAll); } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java index fee8c8d73..ccf1949d4 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java @@ -7,6 +7,7 @@ import com.iformall.domain.po.WxChartDataEntity; import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxMerchantTradeDaily; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumCarCmd; import com.iformall.enums.EnumChartType; import com.iformall.mapper.*; @@ -77,45 +78,45 @@ public class ChartDataSchedule { List wxMalls = wxMallMapper.findList(null); for (WxMall wxMall : wxMalls) { - String tenantId = wxMall.getTenantId(); - params.put("tenantId", tenantId); - wxChartDataEntity.setTenantId(tenantId); + TenantEntity tenantEntity = wxMall.getTenantInfo(); + params.put("tenantId", tenantEntity.getTenantId()); + wxChartDataEntity.updateTenantInfo(tenantEntity); wxChartDataEntity.setType(EnumChartType.CAR_OUT.getCode()); int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("出场车数>>>>>>>>>>>>>>>>>>>>>>>>>>"); - carOutData(params, createtime, date, tenantId); + carOutData(params, createtime, date, tenantEntity); } wxChartDataEntity.setType(EnumChartType.CAR_PAID.getCode()); count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); logger.info("缴费车辆>>>>>>>>>>>>>>>>>>>>>>>>>>"); - carPaidData(params, createtime, date, tenantId); + carPaidData(params, createtime, date, tenantEntity); } wxChartDataEntity.setType(EnumChartType.CAR_PAY_FEE.getCode()); count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("缴费金额>>>>>>>>>>>>>>>>>>>>>>>>>>"); - carPayFeeData(params, createtime, date, tenantId); + carPayFeeData(params, createtime, date, tenantEntity); } wxChartDataEntity.setType(EnumChartType.CAR_MEMBER.getCode()); count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("新增会员>>>>>>>>>>>>>>>>>>>>>>>>>>"); - carMemberData(params, createtime, date, tenantId); + carMemberData(params, createtime, date, tenantEntity); } wxChartDataEntity.setType(EnumChartType.CAR_NEW_MEMBER.getCode()); count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("新增停车会员>>>>>>>>>>>>>>>>>>>>>>>>>>"); - carNewMemberData(createtime, date, tenantId); + carNewMemberData(createtime, date, tenantEntity); } wxChartDataEntity.setType(EnumChartType.CAR_BIND.getCode()); count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("已绑车辆>>>>>>>>>>>>>>>>>>>>>>>>>>"); - carBindData(params, createtime, date, tenantId); + carBindData(params, createtime, date, tenantEntity); } } } @@ -136,19 +137,19 @@ public class ChartDataSchedule { List wxMalls = wxMallMapper.findList(null); for (WxMall wxMall : wxMalls) { - String tenantId = wxMall.getTenantId(); - params.put("tenantId", tenantId); - wxChartDataEntity.setTenantId(tenantId); + TenantEntity tenantEntity = wxMall.getTenantInfo(); + params.put("tenantId", tenantEntity.getTenantId()); + wxChartDataEntity.updateTenantInfo(tenantEntity); wxChartDataEntity.setType(EnumChartType.SALE_COUPON_PRICE.getCode()); int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("销售总交易额>>>>>>>>>>>>>>>>>>>>>>>>>>"); WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setTenantId(tenantId); + wxCouponOrder.updateTenantInfo(tenantEntity); wxCouponOrder.setStartTime(startdate); wxCouponOrder.setEndTime(enddate); Integer price = wxCouponOrderMapper.queryPriceTotal(wxCouponOrder); - addChartData(tenantId, price.toString(), EnumChartType.SALE_COUPON_PRICE.getCode(), startdate, createtime); + addChartData(tenantEntity, price.toString(), EnumChartType.SALE_COUPON_PRICE.getCode(), startdate, createtime); } } } @@ -167,72 +168,72 @@ public class ChartDataSchedule { List wxMalls = wxMallMapper.findList(null); for (WxMall wxMall : wxMalls) { - String tenantId = wxMall.getTenantId(); - params.put("tenantId", tenantId); + TenantEntity tenantEntity = wxMall.getTenantInfo(); + params.put("tenantId", tenantEntity.getTenantId()); - wxChartDataEntity.setTenantId(tenantId); + wxChartDataEntity.updateTenantInfo(tenantEntity); wxChartDataEntity.setType(EnumChartType.MERCHANT_TRADE.getCode()); int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("解单金额>>>>>>>>>>>>>>>>>>>>>>>>>>"); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); - wxMerchantTradeDaily.setTenantId(tenantId); + wxMerchantTradeDaily.updateTenantInfo(tenantEntity); wxMerchantTradeDaily.setReportDate(yesterday); List recordList = wxMerchantTradeDailyMapper.findTotalListOfMonth(wxMerchantTradeDaily); Integer price = 0; if (!recordList.isEmpty()) { price = Integer.parseInt(recordList.get(0).getTradeAmt()); } - addChartData(tenantId, price.toString(), EnumChartType.MERCHANT_TRADE.getCode(), querytime, createtime); + addChartData(tenantEntity, price.toString(), EnumChartType.MERCHANT_TRADE.getCode(), querytime, createtime); } } } - public void carBindData(HashMap params, Date createtime, Date date, String tenantId) { + public void carBindData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { Long todaybindcar = wxCUserCarMapper.queryCarCount(params); - addChartData(tenantId, todaybindcar.toString(), EnumChartType.CAR_BIND.getCode(), date, createtime); + addChartData(tenantEntity, todaybindcar.toString(), EnumChartType.CAR_BIND.getCode(), date, createtime); } - public void carNewMemberData(Date createtime, Date date, String tenantId) { + public void carNewMemberData(Date createtime, Date date, TenantEntity tenantEntity) { WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); - wxCUserBasicInfoDto.setTenantId(tenantId); + wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); wxCUserBasicInfoDto.setStartTime(date); wxCUserBasicInfoDto.setEndTime(date); Integer carUserCount = wxCUserCarMapper.countUser(wxCUserBasicInfoDto); - addChartData(tenantId, carUserCount.toString(), EnumChartType.CAR_NEW_MEMBER.getCode(), date, createtime); + addChartData(tenantEntity, carUserCount.toString(), EnumChartType.CAR_NEW_MEMBER.getCode(), date, createtime); } - public void carMemberData(HashMap params, Date createtime, Date date, String tenantId) { + public void carMemberData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { List> carCountHistory = wxCUserCarMapper.queryCarCountHistory(params); Long userCount = carCountHistory.isEmpty() ? 0L : (Long) carCountHistory.get(0).get("count"); - addChartData(tenantId, userCount.toString(), EnumChartType.CAR_MEMBER.getCode(), date, createtime); + addChartData(tenantEntity, userCount.toString(), EnumChartType.CAR_MEMBER.getCode(), date, createtime); } - public void carPayFeeData(HashMap params, Date createtime, Date date, String tenantId) { + public void carPayFeeData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { List> weekCarPayHistoryList = wxCarCmdLogMapper.queryWeekCarPay(params); BigDecimal fee = weekCarPayHistoryList.isEmpty() ? new BigDecimal(0) : (BigDecimal) weekCarPayHistoryList.get(0).get("fee"); - addChartData(tenantId, fee.toString(), EnumChartType.CAR_PAY_FEE.getCode(), date, createtime); + addChartData(tenantEntity, fee.toString(), EnumChartType.CAR_PAY_FEE.getCode(), date, createtime); } - public void carPaidData(HashMap params, Date createtime, Date date, String tenantId) { + public void carPaidData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { Long carPayFeeCount = wxCarCmdLogMapper.queryWeekCarPayCount(params); - addChartData(tenantId, carPayFeeCount.toString(), EnumChartType.CAR_PAID.getCode(), date, createtime); + addChartData(tenantEntity, carPayFeeCount.toString(), EnumChartType.CAR_PAID.getCode(), date, createtime); } - public void carOutData(HashMap params, Date createtime, Date date, String tenantId) { + public void carOutData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { List> historylist = wxCarCmdLogMapper.queryHistory(params); Long carOutCount = historylist.isEmpty() ? 0L : (Long) historylist.get(0).get("carcount"); - addChartData(tenantId, carOutCount.toString(), EnumChartType.CAR_OUT.getCode(), date, createtime); + addChartData(tenantEntity, carOutCount.toString(), EnumChartType.CAR_OUT.getCode(), date, createtime); } - private void addChartData(String tenantId, String result, Integer type, Date querytime, Date createtime) { + private void addChartData(TenantEntity tenantEntity, String result, Integer type, Date querytime, Date createtime) { logger.info("即将插入数据>>>>>>>>>>>>>>>>>>>>>>>"); final IdWorker idWorker = IdWorker.get(); long id = idWorker.nextId(); WxChartDataEntity wxChartDataEntity = new WxChartDataEntity(); wxChartDataEntity.setId(id); - wxChartDataEntity.setTenantId(tenantId); + wxChartDataEntity.updateTenantInfo(tenantEntity); wxChartDataEntity.setResult(result); wxChartDataEntity.setType(type); wxChartDataEntity.setQuerytime(querytime);