| @@ -2,6 +2,7 @@ package com.iformall.controller.market; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.annotation.ApiVersion; | |||
| import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.constant.SwaggerConstant; | |||
| @@ -85,8 +86,17 @@ public class WxLegionActivityController extends BaseController { | |||
| if(!merchantIds.isEmpty() && merchantIds.stream().distinct().count() != merchantIds.size()){ | |||
| return new ResultData(Result.ERROR,"军团商户配置重复"); | |||
| } | |||
| wxLegionActivityService.saveOrUpdate(wxLegionActivity); | |||
| return new ResultData(wxLegionActivity); | |||
| try{ | |||
| wxLegionActivityService.saveOrUpdate(wxLegionActivity); | |||
| return new ResultData(wxLegionActivity); | |||
| }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); | |||
| } | |||
| } | |||
| @ApiVersion(group = SwaggerConstant.V_2_0_0) | |||
| @@ -1,6 +1,7 @@ | |||
| package com.iformall.controller.market; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| @@ -118,8 +119,16 @@ public class WxOfflineActivityGrantController extends BaseController { | |||
| TenantEntity tenantEntity = getTenantInfo(); | |||
| wxOfflineActivityGrantAward.updateTenantInfo(tenantEntity); | |||
| wxOfflineActivityGrantAward.setCreateBy(getUserId()); | |||
| wxOfflineActivityGrantAwardService.grantAward(wxOfflineActivityGrantAward); | |||
| return new ResultData(); | |||
| try{ | |||
| wxOfflineActivityGrantAwardService.grantAward(wxOfflineActivityGrantAward); | |||
| return new ResultData(); | |||
| }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); | |||
| } | |||
| } | |||
| @ApiOperation("活动发奖详情") | |||
| @@ -2,6 +2,7 @@ package com.iformall.controller; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.annotation.ApiVersion; | |||
| import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.constant.SwaggerConstant; | |||
| @@ -9,6 +10,7 @@ import com.iformall.domain.po.WxLegionActivityOrder; | |||
| import com.iformall.domain.po.WxOfflineActivityRecord; | |||
| import com.iformall.domain.po.base.BaseEntity.SortField; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.exception.MallinkException; | |||
| import com.iformall.service.WxLegionActivityOrderService; | |||
| import com.iformall.service.WxOfflineActivityRecordService; | |||
| import io.swagger.annotations.Api; | |||
| @@ -78,8 +80,16 @@ public class WxLegionActivityOrderController extends BaseController { | |||
| wxLegionActivityOrder.updateTenantInfo(tenantEntity); | |||
| wxLegionActivityOrder.setCreateBy(getMerchantBUserId()); | |||
| wxLegionActivityOrder.setMerchantId(getLoginBUser().getMerchantId()); | |||
| wxLegionActivityOrderService.saveOrUpdate(wxLegionActivityOrder); | |||
| return new ResultData(); | |||
| try{ | |||
| wxLegionActivityOrderService.saveOrUpdate(wxLegionActivityOrder); | |||
| return new ResultData(); | |||
| }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); | |||
| } | |||
| } | |||
| @ApiVersion(group = SwaggerConstant.V_2_0_0) | |||
| @@ -2,6 +2,7 @@ package com.iformall.controller; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.annotation.ApiVersion; | |||
| import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.constant.SwaggerConstant; | |||
| @@ -10,6 +11,7 @@ import com.iformall.domain.po.WxOfflineActivityRecord; | |||
| import com.iformall.domain.po.base.BaseEntity.SortField; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.enums.EnumLegionActivityUserStatus; | |||
| import com.iformall.exception.MallinkException; | |||
| import com.iformall.service.WxLegionActivityUserService; | |||
| import com.iformall.service.WxOfflineActivityRecordService; | |||
| import io.swagger.annotations.Api; | |||
| @@ -73,8 +75,16 @@ public class WxLegionActivityUserController extends BaseController { | |||
| wxLegionActivityUser.updateTenantInfo(tenantEntity); | |||
| wxLegionActivityUser.setCreateBy(getMerchantBUserId()); | |||
| wxLegionActivityUser.setMerchantId(getLoginBUser().getMerchantId()); | |||
| wxLegionActivityUserService.saveOrUpdate(wxLegionActivityUser); | |||
| return new ResultData(); | |||
| try{ | |||
| wxLegionActivityUserService.saveOrUpdate(wxLegionActivityUser); | |||
| return new ResultData(); | |||
| }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); | |||
| } | |||
| } | |||
| @ApiVersion(group = SwaggerConstant.V_2_0_0) | |||