diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityController.java index c4e48cdea..53390b8b9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityController.java @@ -159,4 +159,15 @@ public class WxLegionActivityController extends BaseController { return new ResultData(legionConfigList); } + @ApiVersion(group = SwaggerConstant.V_2_0_0) + @ApiOperation("查询基础信息") + @GetMapping("getBasicById") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "主键id", dataType = "Long", paramType = "query", required = true)}) + public ResultData getBasicById(Long id) { + TenantEntity tenantInfo = getTenantInfo(); + WxLegionActivity activity = wxLegionActivityService.getBasicById(id, tenantInfo.getTenantId()); + return new ResultData(activity); + } + } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityController.java index 2177c8bc4..7cd58ffa7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityController.java @@ -201,4 +201,14 @@ public class WxOfflineActivityController extends BaseController { wxOfflineActivityGrantAwardService.activityGrantExport(request,response,wxOfflineActivity); } + @ApiOperation("查询基础信息") + @GetMapping("getBasicById") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "主键id", dataType = "Long", paramType = "query", required = true)}) + public ResultData getBasicById(Long id) { + TenantEntity tenantInfo = getTenantInfo(); + WxOfflineActivity activity = wxOfflineActivityService.getBasicById(id, tenantInfo.getTenantId()); + return new ResultData(activity); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxLegionActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxLegionActivityService.java index f1ba33acf..945801cae 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxLegionActivityService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxLegionActivityService.java @@ -21,4 +21,6 @@ public interface WxLegionActivityService { WxLegionActivity getInfoById(Long id, String tenantId); void delMerchant(WxLegionActivity wxLegionActivity); + + WxLegionActivity getBasicById(Long id, String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityItemService.java b/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityItemService.java index 162f950fe..75b6bd897 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityItemService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityItemService.java @@ -15,4 +15,6 @@ public interface WxOfflineActivityItemService { void saveOrUpdateFromActivity(WxOfflineActivity wxOfflineActivity, List activityItemList); List getActivityItemList(Long activityId, String tenantId); + + List getActivityItemBasicList(Long activityId, String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityService.java index 118656272..da7e633ce 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityService.java @@ -33,4 +33,6 @@ public interface WxOfflineActivityService{ int getCountWidthCredit(WxOfflineActivity wxOfflineActivity); WxOfflineActivity selectCreditActivityOne(TenantEntity tenantEntity, Date orderDate); + + WxOfflineActivity getBasicById(Long id, String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java index 0a273ac6c..690dda55f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java @@ -277,6 +277,17 @@ public class WxLegionActivityServiceImpl implements WxLegionActivityService{ wxLegionActivityOrderMapper.updateAuditStatus(activityOrder); } + + @Override + public WxLegionActivity getBasicById(Long id, String tenantId) { + WxLegionActivity activity = wxLegionActivityMapper.selectById(id, tenantId); + if(activity == null){ + return activity; + } + //获取军团配置 + activity.setLegionList(wxLegionActivityConfigService.findLegionList(id,tenantId)); + return activity; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityItemServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityItemServiceImpl.java index ac4f88e64..912c9896f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityItemServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityItemServiceImpl.java @@ -93,6 +93,15 @@ public class WxOfflineActivityItemServiceImpl implements WxOfflineActivityItemSe } return itemList; } + + @Override + public List getActivityItemBasicList(Long activityId, String tenantId) { + WxOfflineActivityItem activityItemQuery = new WxOfflineActivityItem(); + activityItemQuery.setActivityId(activityId); + activityItemQuery.setTenantId(tenantId); + List itemList = wxOfflineActivityItemMapper.findList(activityItemQuery); + return itemList; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityServiceImpl.java index d26dc24d3..f4883c1e2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityServiceImpl.java @@ -176,6 +176,16 @@ public class WxOfflineActivityServiceImpl implements WxOfflineActivityService{ wxOfflineActivity.setCreditOnOff(EnumYesOrNo.YES.getCode()); return wxOfflineActivityMapper.selectCreditActivityOne(wxOfflineActivity); } + + @Override + public WxOfflineActivity getBasicById(Long id, String tenantId) { + WxOfflineActivity wxOfflineActivity = wxOfflineActivityMapper.selectById(id, tenantId); + if (wxOfflineActivity == null) { + return null; + } + wxOfflineActivity.setActivityItemList(wxOfflineActivityItemService.getActivityItemBasicList(wxOfflineActivity.getId(),tenantId)); + return wxOfflineActivity; + } }