Browse Source

//LegionActivity

release_toaliyun_real
xiaohu 1 year ago
parent
commit
2b4c8cb3c7
5 changed files with 38 additions and 9 deletions
  1. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityController.java
  2. +3
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityController.java
  3. +9
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivity.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxLegionActivityService.java
  5. +23
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java

+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityController.java View File

@@ -57,7 +57,8 @@ public class WxLegionActivityController extends BaseController {
TenantEntity tenantInfo = getTenantInfo(); TenantEntity tenantInfo = getTenantInfo();
wxLegionActivity.updateTenantInfo(tenantInfo); wxLegionActivity.updateTenantInfo(tenantInfo);
wxLegionActivity.setSortColumns(SortField.CreateDate_DESC); wxLegionActivity.setSortColumns(SortField.CreateDate_DESC);
final PageInfo<WxLegionActivity> page = wxLegionActivityService.listAsPage(wxLegionActivity,true, pageNum, pageSize);
wxLegionActivity.setNeedCount(true);
final PageInfo<WxLegionActivity> page = wxLegionActivityService.listAsPage(wxLegionActivity, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 3
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityController.java View File

@@ -48,7 +48,9 @@ public class WxLegionActivityController extends BaseController {
wxLegionActivity.updateTenantInfo(tenantInfo); wxLegionActivity.updateTenantInfo(tenantInfo);
wxLegionActivity.setStatusList(EnumLegionActivityStatus.getLine()); wxLegionActivity.setStatusList(EnumLegionActivityStatus.getLine());
wxLegionActivity.setSortColumns(SortField.CreateDate_DESC); wxLegionActivity.setSortColumns(SortField.CreateDate_DESC);
final PageInfo<WxLegionActivity> page = wxLegionActivityService.listAsPage(wxLegionActivity, false,pageNum, pageSize);
wxLegionActivity.setNeedCount(false);
wxLegionActivity.setMerchantId(getLoginBUser().getMerchantId());
final PageInfo<WxLegionActivity> page = wxLegionActivityService.listAsPage(wxLegionActivity,pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 9
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivity.java View File

@@ -145,4 +145,13 @@ public class WxLegionActivity extends TenantEntity {
@TableField(exist = false) @TableField(exist = false)
private Map<String,Object> activityData; private Map<String,Object> activityData;


@TableField(exist = false)
private boolean needCount;

@TableField(exist = false)
private Long merchantId;
@TableField(exist = false)
private String legionName;
@TableField(exist = false)
private String unionName;
} }

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxLegionActivityService.java View File

@@ -12,7 +12,7 @@ import com.iformall.domain.po.WxOfflineActivity;
*/ */
public interface WxLegionActivityService { public interface WxLegionActivityService {


PageInfo<WxLegionActivity> listAsPage(WxLegionActivity wxLegionActivity, boolean needCount, Integer pageNum, Integer pageSize);
PageInfo<WxLegionActivity> listAsPage(WxLegionActivity wxLegionActivity, Integer pageNum, Integer pageSize);


void saveOrUpdate(WxLegionActivity wxLegionActivity); void saveOrUpdate(WxLegionActivity wxLegionActivity);




+ 23
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java View File

@@ -1,5 +1,6 @@
package com.iformall.service.impl; package com.iformall.service.impl;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@@ -54,10 +55,10 @@ public class WxLegionActivityServiceImpl implements WxLegionActivityService{
private WxMerchantService wxMerchantService; private WxMerchantService wxMerchantService;


@Override @Override
public PageInfo<WxLegionActivity> listAsPage(WxLegionActivity record, boolean needCount, Integer pageNum, Integer pageSize) {
public PageInfo<WxLegionActivity> listAsPage(WxLegionActivity record, Integer pageNum, Integer pageSize) {
handlerQuery(record); handlerQuery(record);
PageInfo<WxLegionActivity> activityPageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxLegionActivityMapper.findList(record)); PageInfo<WxLegionActivity> activityPageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxLegionActivityMapper.findList(record));
handlerList(record,activityPageInfo.getList(),needCount);
handlerList(record,activityPageInfo.getList());
return activityPageInfo; return activityPageInfo;
} }


@@ -84,18 +85,19 @@ public class WxLegionActivityServiceImpl implements WxLegionActivityService{
} }
} }


private void handlerList(TenantEntity tenantEntity,List<WxLegionActivity> list, boolean needCount) {
private void handlerList(WxLegionActivity record,List<WxLegionActivity> list) {
if(list == null || list.isEmpty()){ if(list == null || list.isEmpty()){
return; return;
} }
List<Long> ids = list.stream().map(WxLegionActivity::getId).collect(Collectors.toList()); List<Long> ids = list.stream().map(WxLegionActivity::getId).collect(Collectors.toList());
WxLegionActivityConfig legionConfigQ = new WxLegionActivityConfig(); WxLegionActivityConfig legionConfigQ = new WxLegionActivityConfig();
legionConfigQ.updateTenantInfo(tenantEntity);
legionConfigQ.updateTenantInfo(record);
legionConfigQ.setActivityIdList(ids); legionConfigQ.setActivityIdList(ids);
Map<Long, String> legionConfigMap = wxLegionActivityConfigService.getLegionConfigMap(legionConfigQ);
legionConfigQ.setParentId(0L); legionConfigQ.setParentId(0L);
Map<Long,Integer> legionCountMap = wxLegionActivityConfigService.findLegionCount(legionConfigQ); Map<Long,Integer> legionCountMap = wxLegionActivityConfigService.findLegionCount(legionConfigQ);
WxLegionActivityMerchantConfig merchantConfigQ = new WxLegionActivityMerchantConfig(); WxLegionActivityMerchantConfig merchantConfigQ = new WxLegionActivityMerchantConfig();
merchantConfigQ.updateTenantInfo(tenantEntity);
merchantConfigQ.updateTenantInfo(record);
merchantConfigQ.setActivityIdList(ids); merchantConfigQ.setActivityIdList(ids);
Map<Long,Integer> merchantCountMap = wxLegionActivityMerchantConfigService.findMerchantCount(merchantConfigQ); Map<Long,Integer> merchantCountMap = wxLegionActivityMerchantConfigService.findMerchantCount(merchantConfigQ);


@@ -107,9 +109,24 @@ public class WxLegionActivityServiceImpl implements WxLegionActivityService{
activity.setLegionCount(legionCountMap.get(activity.getId())==null?0:legionCountMap.get(activity.getId())); activity.setLegionCount(legionCountMap.get(activity.getId())==null?0:legionCountMap.get(activity.getId()));
activity.setMerchantCount(merchantCountMap.get(activity.getId())==null?0:merchantCountMap.get(activity.getId())); activity.setMerchantCount(merchantCountMap.get(activity.getId())==null?0:merchantCountMap.get(activity.getId()));
//处理数量 //处理数量
if(needCount){
if(record.isNeedCount()){
activity.setActivityData(wxLegionActivityOrderService.handleActivityData(activity,null)); activity.setActivityData(wxLegionActivityOrderService.handleActivityData(activity,null));
} }
//处理商户所属
if(record.getMerchantId() != null){
WxLegionActivityMerchantConfig merchantQ = new WxLegionActivityMerchantConfig();
merchantQ.updateTenantInfo(activity);
merchantQ.setActivityId(activity.getId());
merchantQ.setMerchantId(record.getMerchantId());
WxLegionActivityMerchantConfig merchantConfig = wxLegionActivityMerchantConfigMapper.selectOne(new QueryWrapper<>(merchantQ));
if(merchantConfig == null || merchantConfig.getLegionId().equals(0L)){
activity.setLegionName("无军团");
activity.setUnionName("无联盟");
}else{
activity.setLegionName(legionConfigMap.get(merchantConfig.getLegionId()));
activity.setUnionName(merchantConfig.getUnionId().equals(0L)?"无联盟":legionConfigMap.get(merchantConfig.getUnionId()));
}
}
} }
} }




Loading…
Cancel
Save