| @@ -159,4 +159,15 @@ public class WxLegionActivityController extends BaseController { | |||||
| return new ResultData(legionConfigList); | 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); | |||||
| } | |||||
| } | } | ||||
| @@ -201,4 +201,14 @@ public class WxOfflineActivityController extends BaseController { | |||||
| wxOfflineActivityGrantAwardService.activityGrantExport(request,response,wxOfflineActivity); | 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); | |||||
| } | |||||
| } | } | ||||
| @@ -21,4 +21,6 @@ public interface WxLegionActivityService { | |||||
| WxLegionActivity getInfoById(Long id, String tenantId); | WxLegionActivity getInfoById(Long id, String tenantId); | ||||
| void delMerchant(WxLegionActivity wxLegionActivity); | void delMerchant(WxLegionActivity wxLegionActivity); | ||||
| WxLegionActivity getBasicById(Long id, String tenantId); | |||||
| } | } | ||||
| @@ -15,4 +15,6 @@ public interface WxOfflineActivityItemService { | |||||
| void saveOrUpdateFromActivity(WxOfflineActivity wxOfflineActivity, List<WxOfflineActivityItem> activityItemList); | void saveOrUpdateFromActivity(WxOfflineActivity wxOfflineActivity, List<WxOfflineActivityItem> activityItemList); | ||||
| List<WxOfflineActivityItem> getActivityItemList(Long activityId, String tenantId); | List<WxOfflineActivityItem> getActivityItemList(Long activityId, String tenantId); | ||||
| List<WxOfflineActivityItem> getActivityItemBasicList(Long activityId, String tenantId); | |||||
| } | } | ||||
| @@ -33,4 +33,6 @@ public interface WxOfflineActivityService{ | |||||
| int getCountWidthCredit(WxOfflineActivity wxOfflineActivity); | int getCountWidthCredit(WxOfflineActivity wxOfflineActivity); | ||||
| WxOfflineActivity selectCreditActivityOne(TenantEntity tenantEntity, Date orderDate); | WxOfflineActivity selectCreditActivityOne(TenantEntity tenantEntity, Date orderDate); | ||||
| WxOfflineActivity getBasicById(Long id, String tenantId); | |||||
| } | } | ||||
| @@ -277,6 +277,17 @@ public class WxLegionActivityServiceImpl implements WxLegionActivityService{ | |||||
| wxLegionActivityOrderMapper.updateAuditStatus(activityOrder); | 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; | |||||
| } | |||||
| } | } | ||||
| @@ -93,6 +93,15 @@ public class WxOfflineActivityItemServiceImpl implements WxOfflineActivityItemSe | |||||
| } | } | ||||
| return itemList; | return itemList; | ||||
| } | } | ||||
| @Override | |||||
| public List<WxOfflineActivityItem> getActivityItemBasicList(Long activityId, String tenantId) { | |||||
| WxOfflineActivityItem activityItemQuery = new WxOfflineActivityItem(); | |||||
| activityItemQuery.setActivityId(activityId); | |||||
| activityItemQuery.setTenantId(tenantId); | |||||
| List<WxOfflineActivityItem> itemList = wxOfflineActivityItemMapper.findList(activityItemQuery); | |||||
| return itemList; | |||||
| } | |||||
| } | } | ||||
| @@ -176,6 +176,16 @@ public class WxOfflineActivityServiceImpl implements WxOfflineActivityService{ | |||||
| wxOfflineActivity.setCreditOnOff(EnumYesOrNo.YES.getCode()); | wxOfflineActivity.setCreditOnOff(EnumYesOrNo.YES.getCode()); | ||||
| return wxOfflineActivityMapper.selectCreditActivityOne(wxOfflineActivity); | 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; | |||||
| } | |||||
| } | } | ||||