Quellcode durchsuchen

bug

release_toaliyun_real
xhxu vor 5 Jahren
Ursprung
Commit
10b7b7d9f6
6 geänderte Dateien mit 36 neuen und 6 gelöschten Zeilen
  1. +6
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java
  2. +16
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java
  3. +8
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  5. +4
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java
  6. +1
    -1
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

+ 6
- 2
mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java Datei anzeigen

@@ -111,14 +111,18 @@ 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.updateTenantInfo(getTenantInfo());
if(StringUtils.isNotBlank(getTenantInfo().getParentTenantId())){
wxLevelConfig.setTenantId(getTenantInfo().getParentTenantId());
}else{
wxLevelConfig.setTenantId(getTenantInfo().getTenantId());
}
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.updateTenantInfo(getTenantInfo());
dto.updateFinalTenantInfo(getTenantInfo());
dto.setStartTime(startTime); dto.setStartTime(startTime);
dto.setEndTime(endTime); dto.setEndTime(endTime);
if (i + 1 < levelList.size()) { if (i + 1 < levelList.size()) {


+ 16
- 1
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java Datei anzeigen

@@ -4,6 +4,8 @@ import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.controller.base.BaseController; import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.po.base.TenantEntity;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +47,11 @@ 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.updateTenantInfo(getTenantInfo());
if(StringUtils.isNotBlank(getTenantInfo().getParentTenantId())){
wxLevelConfig.setTenantId(getTenantInfo().getParentTenantId());
}else{
wxLevelConfig.setTenantId(getTenantInfo().getTenantId());
}
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);
@@ -57,6 +63,9 @@ public class WxLevelConfigController extends BaseController {
public ResultData add(@RequestBody List<WxLevelConfig> levelConfigs) { public ResultData add(@RequestBody List<WxLevelConfig> levelConfigs) {
logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add");
try { try {
if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) {
return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限");
}
wxLevelConfigService.batchSave(getTenantInfo(), levelConfigs); wxLevelConfigService.batchSave(getTenantInfo(), levelConfigs);
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
@@ -71,6 +80,9 @@ public class WxLevelConfigController extends BaseController {
public ResultData updateCapabilities(@RequestBody List<WxLevelConfig> levelConfigs) { public ResultData updateCapabilities(@RequestBody List<WxLevelConfig> levelConfigs) {
logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add");
try { try {
if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) {
return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限");
}
wxLevelConfigService.batchUpdateCapabilities(getTenantInfo(), levelConfigs); wxLevelConfigService.batchUpdateCapabilities(getTenantInfo(), levelConfigs);
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
@@ -84,6 +96,9 @@ public class WxLevelConfigController extends BaseController {
@SystemControllerLog(description = "会员等级权益-删除") @SystemControllerLog(description = "会员等级权益-删除")
public ResultData delete(@RequestBody WxLevelConfig wxLevelConfig) { public ResultData delete(@RequestBody WxLevelConfig wxLevelConfig) {
logger.debug("[" + getIpAddr() + "] WxLevelConfigController::delete"); logger.debug("[" + getIpAddr() + "] WxLevelConfigController::delete");
if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) {
return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限");
}
wxLevelConfigService.deleteById(wxLevelConfig.getId()); wxLevelConfigService.deleteById(wxLevelConfig.getId());
return new ResultData(Result.SUCCESS, "删除成功", null); return new ResultData(Result.SUCCESS, "删除成功", null);
} }


+ 8
- 0
mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java Datei anzeigen

@@ -40,4 +40,12 @@ public class TenantEntity extends BaseEntity {
setTenantId(info.getTenantId()); setTenantId(info.getTenantId());
} }
} }

public void updateFinalTenantInfo(BaseTenantEntity info){
if (StringUtils.isNotBlank(info.getParentTenantId())) {
setParentTenantId(info.getParentTenantId());
}else{
setTenantId(info.getTenantId());
}
}
} }

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java Datei anzeigen

@@ -2168,7 +2168,7 @@ public class WxChartServiceImpl implements WxChartDataService {


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.updateTenantInfo(tenantEntity);
dto.updateFinalTenantInfo(tenantEntity);
dto.setStartTime(DateUtils.stringToDate(startdate)); dto.setStartTime(DateUtils.stringToDate(startdate));
dto.setEndTime(DateUtils.stringToDate(enddate)); dto.setEndTime(DateUtils.stringToDate(enddate));
if (i + 1 < levelList.size()) { if (i + 1 < levelList.size()) {


+ 4
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java Datei anzeigen

@@ -27,8 +27,11 @@ import java.util.List;


@Service @Service
public class WxLevelConfigServiceImpl implements WxLevelConfigService { public class WxLevelConfigServiceImpl implements WxLevelConfigService {

private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());

private final static String CAPABILITY_SEND_CAR_COUPON = "carCouponCount"; private final static String CAPABILITY_SEND_CAR_COUPON = "carCouponCount";

@Autowired @Autowired
WxLevelConfigMapper wxLevelConfigMapper; WxLevelConfigMapper wxLevelConfigMapper;


@@ -56,7 +59,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService {
l.setScale(WxLevelConfig.DEFAULT_SCALE); l.setScale(WxLevelConfig.DEFAULT_SCALE);
} }
WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto();
dto.updateTenantInfo(record);
dto.updateFinalTenantInfo(record);
dto.setLevelStartScore(l.getPoints()); dto.setLevelStartScore(l.getPoints());
if (i + 1<page.getList().size()) if (i + 1<page.getList().size())
dto.setLevelEndScore(page.getList().get(i+1).getPoints()); dto.setLevelEndScore(page.getList().get(i+1).getPoints());


+ 1
- 1
mallinkService/src/main/resources/mapper/WxShopMapper.xml Datei anzeigen

@@ -615,7 +615,7 @@
</if> </if>
,count(distinct w.shop_id) xCount ,count(distinct w.shop_id) xCount
from wx_merchant_shop w left join wx_shop s on w.shop_id=s.id from wx_merchant_shop w left join wx_shop s on w.shop_id=s.id
where w.is_del=0
where w.is_del=0 and s.is_del=0
<if test=" null != tenantId and '' != tenantId"> <if test=" null != tenantId and '' != tenantId">
and w.`tenant_id` = #{tenantId} and w.`tenant_id` = #{tenantId}
</if> </if>


Laden…
Abbrechen
Speichern