Просмотр исходного кода

[集团版][修改]:集团版预处理

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
84a9c57aa4
5 измененных файлов: 18 добавлений и 10 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java
  2. +4
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java
  3. +7
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java
  4. +3
    -2
      mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java
  5. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 1
- 1
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));
}



+ 4
- 3
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<CUserDateAmountVo> datas = wxCouponOrderService.queryPriceTotalGroup(tenantId, sTime, eTime);
List<CUserDateAmountVo> datas = wxCouponOrderService.queryPriceTotalGroup(tenantEntity, sTime, eTime);
Map<String, Integer> dataMap = new HashMap<>();
for (CUserDateAmountVo v : datas) {
dataMap.put(v.getXTime(), v.getPrice());


+ 7
- 2
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);


+ 3
- 2
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<CUserDateAmountVo> queryPriceTotalGroup(String tenantId, Date startTime,Date endTime);
List<CUserDateAmountVo> queryPriceTotalGroup(TenantEntity tenantEntity, Date startTime, Date endTime);
/**
* 查询消费额
* @return


+ 3
- 2
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<CUserDateAmountVo> queryPriceTotalGroup(String tenantId, Date startTime, Date endTime) {
return wxCouponOrderMapper.queryPriceTotalGroup(tenantId, startTime, endTime);
public List<CUserDateAmountVo> queryPriceTotalGroup(TenantEntity tenantEntity, Date startTime, Date endTime) {
return wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), startTime, endTime);
}

@Override


Загрузка…
Отмена
Сохранить