Explorar el Código

//offline

release_toaliyun_real
xiaohu hace 1 año
padre
commit
b2be7b221d
Se han modificado 2 ficheros con 28 adiciones y 18 borrados
  1. +10
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java
  2. +18
    -16
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java

+ 10
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java Ver fichero

@@ -102,8 +102,16 @@ public class WxOfflineActivityGrantController extends BaseController {
}
TenantEntity tenantEntity = getTenantInfo();
wxOfflineActivityGrantAward.updateTenantInfo(tenantEntity);
wxOfflineActivityGrantAwardService.handlerGrantAwardPage(wxOfflineActivityGrantAward);
return new ResultData(wxOfflineActivityGrantAward);
try{
wxOfflineActivityGrantAwardService.handlerGrantAwardPage(wxOfflineActivityGrantAward);
return new ResultData(wxOfflineActivityGrantAward);
}catch(MallinkException e){
logger.error(e.getMessage());
return new ResultData(e.getErrorCode(), e.getMessage());
}catch(Exception e){
logger.error("异常:" + e);
return new ResultData(ErrorCode.SYS_SERVER_ERROR);
}
}




+ 18
- 16
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java Ver fichero

@@ -181,21 +181,22 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity

//订单参数处理
List<WxOfflineActivityItem> activityItemList = wxOfflineActivityItemService.getActivityItemList(activity.getId(), activity.getTenantId());
Map<Long, List<Long>> activityItemRecordMap = new HashMap<>();
if(wxOfflineActivityGrantAward.getActivityItemList() != null && !wxOfflineActivityGrantAward.getActivityItemList().isEmpty()){
Map<Long, List<Long>> ActivityItemRecordMap = wxOfflineActivityGrantAward.getActivityItemList().stream().collect(toMap(WxOfflineActivityItem::getId, WxOfflineActivityItem::getRecordIds));
for (WxOfflineActivityItem activityItem : activityItemList) {
if(EnumOfflineActivityMode.CONDITION_SUM.getCode().equals(activityItem.getModeType())){
List<Long> records = ActivityItemRecordMap.get(activityItem.getId());
if(records == null || records.isEmpty()){
throw new MallinkException(Result.ERROR, "发奖未选择订单");
}
activityItem.setRecordIds(records);
List<WxOfflineActivityRecord> collect = wxOfflineActivityGrantAward.getRecordList().stream()
.filter(record -> activityItem.getRecordIds().contains(record.getId())).collect(toList());
activityItem.setRecordList(collect);
}else{
activityItem.setRecordList(wxOfflineActivityGrantAward.getRecordList());
activityItemRecordMap = wxOfflineActivityGrantAward.getActivityItemList().stream().collect(toMap(WxOfflineActivityItem::getId, WxOfflineActivityItem::getRecordIds));
}
for (WxOfflineActivityItem activityItem : activityItemList) {
if(EnumOfflineActivityMode.CONDITION_SUM.getCode().equals(activityItem.getModeType())){
List<Long> records = activityItemRecordMap.get(activityItem.getId());
if(records == null || records.isEmpty()){
throw new MallinkException(Result.ERROR, "发奖未选择订单");
}
activityItem.setRecordIds(records);
List<WxOfflineActivityRecord> collect = wxOfflineActivityGrantAward.getRecordList().stream()
.filter(record -> activityItem.getRecordIds().contains(record.getId())).collect(toList());
activityItem.setRecordList(collect);
}else{
activityItem.setRecordList(wxOfflineActivityGrantAward.getRecordList());
}
}
wxOfflineActivityGrantAward.setActivityItemList(activityItemList);
@@ -687,17 +688,18 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
if(wxOfflineActivityGrantAward.getActivityItemList() == null){
throw new MallinkException(Result.ERROR, "请检查活动项参数");
}
Map<Long, WxOfflineActivityItem> grantActivityItemMap = wxOfflineActivityGrantAward.getActivityItemList().stream().collect(toMap(WxOfflineActivityItem::getId, Function.identity()));
Map<Long, WxOfflineActivityItem> grantActivityItemMap = new HashMap<>();
if(wxOfflineActivityGrantAward.getActivityItemList() != null && !wxOfflineActivityGrantAward.getActivityItemList().isEmpty()){
grantActivityItemMap = wxOfflineActivityGrantAward.getActivityItemList().stream().collect(toMap(WxOfflineActivityItem::getId, Function.identity()));
}

List<WxOfflineActivityItem> activityItemList = wxOfflineActivityItemService.getActivityItemList(activity.getId(), activity.getTenantId());


int i = 0;//检查活动奖项

for (WxOfflineActivityItem activityItem : activityItemList) {

Map<Long, WxOfflineActivityAwardsItem> awardsItemMap = activityItem.getActivityAwardsItemList().stream().collect(toMap(WxOfflineActivityAwardsItem::getId, Function.identity()));

WxOfflineActivityItem grantActivityItem = grantActivityItemMap.get(activityItem.getId());
//订单参数处理
if(EnumOfflineActivityMode.CONDITION_SUM.getCode().equals(activityItem.getModeType())){


Cargando…
Cancelar
Guardar