diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index a327522f8..ae6e3315b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -494,7 +494,7 @@ public class WxCUserBasicInfoController extends BaseController { }) @SystemControllerLog(description = "会员管理-进出场车辆分页列表") public ResultData carPayList(@ModelAttribute WxCarPayRecord record, Integer pageNum, Integer pageSize){ - record.setTenantId(super.getTenantId()); + record.updateTenantInfo(getTenantInfo()); return new ResultData(wxCarPayRecordService.findCarPayListByPage(record,pageNum,pageSize)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java index 425cef6b1..6bfecb2a6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java @@ -14,6 +14,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.domain.po.WxCouponOrder; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.mapper.WxCUserBasicInfoMapper; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.utils.DataUtil; @@ -261,7 +262,7 @@ public class WxCUserDataController extends BaseController { @SystemControllerLog(description = "会员首页-报表数据-查询用户消费金额") public ResultData findUserAmountData() { logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserAmountData"); - String tenantId = getTenantId(); + TenantEntity tenantEntity = getTenantInfo(); Calendar c = Calendar.getInstance(); Date today = c.getTime(); c.add(Calendar.DAY_OF_YEAR, 1); @@ -272,7 +273,7 @@ public class WxCUserDataController extends BaseController { c.add(Calendar.DAY_OF_YEAR, -30);//三十天前 Date startTime = c.getTime(); WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setTenantId(tenantId); + wxCouponOrder.updateTenantInfo(tenantEntity); wxCouponOrder.setStartTime(startTime); wxCouponOrder.setEndTime(endTime); int thisMonthCount = wxCouponOrderService.queryPriceTotal(wxCouponOrder);//月消费金额 @@ -281,7 +282,7 @@ public class WxCUserDataController extends BaseController { Date eTime = c.getTime(); c.add(Calendar.DAY_OF_YEAR, -30); Date sTime = c.getTime(); - List datas = wxCouponOrderService.queryPriceTotalGroup(tenantId, sTime, eTime); + List datas = wxCouponOrderService.queryPriceTotalGroup(tenantEntity, sTime, eTime); Map dataMap = new HashMap<>(); for (CUserDateAmountVo v : datas) { dataMap.put(v.getXTime(), v.getPrice()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java index 4ecdcb5c7..3fbb7571c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java @@ -6,6 +6,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMsgValidationcode; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.service.WxMsgValidationcodeService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -79,7 +80,9 @@ public class WxMsgValidationcodeController extends BaseController { public ResultData sendvalidationcode(String tenantId, String phone, Integer type, String appid) { logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::sendvalidationcode"); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(tenantId); + wxMsgValidationcode.updateTenantInfo(new TenantEntity(){{ + setTenantId(tenantId); + }}); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); wxMsgValidationcode.setAppid(appid); @@ -96,7 +99,9 @@ public class WxMsgValidationcodeController extends BaseController { public ResultData hasvalidationcode(String tenantId, String phone, Integer type, String code, String appid) { logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::hasvalidationcode"); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(tenantId); + wxMsgValidationcode.updateTenantInfo(new TenantEntity(){{ + setTenantId(tenantId); + }}); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); wxMsgValidationcode.setCode(code); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java index 7ba69fdbe..f9177eedb 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.*; import javax.servlet.http.HttpServletRequest; @@ -155,12 +156,12 @@ public interface WxCouponOrderService { /** * 日期分组 消费总数 - * @param tenantId + * @param tenantEntity * @param startTime * @param endTime * @return */ - List queryPriceTotalGroup(String tenantId, Date startTime,Date endTime); + List queryPriceTotalGroup(TenantEntity tenantEntity, Date startTime, Date endTime); /** * 查询消费额 * @return diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index ac081b4fe..1d7ea3b57 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -12,6 +12,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxSharingOrderDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.AppUniformMsg; import com.iformall.domain.po.msg.FmInsideCouponVerifyMsg; import com.iformall.domain.po.msg.MpAppMsg; @@ -931,8 +932,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override - public List queryPriceTotalGroup(String tenantId, Date startTime, Date endTime) { - return wxCouponOrderMapper.queryPriceTotalGroup(tenantId, startTime, endTime); + public List queryPriceTotalGroup(TenantEntity tenantEntity, Date startTime, Date endTime) { + return wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), startTime, endTime); } @Override