java/zhihuishenqu.git

			@@ -6,17 +6,21 @@
			import com.panzhihua.common.model.dtos.community.convenient.JinhuiPageConvenientMerchantDTO;
			import com.panzhihua.common.model.vos.LoginUserInfoVO;
			import com.panzhihua.common.model.vos.R;
			import com.panzhihua.common.model.vos.community.ComActActivityVO;
			import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
			import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
			import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
			import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO;
			import com.panzhihua.common.model.vos.jinhui.*;
			import com.panzhihua.common.service.community.CommunityService;
			import com.panzhihua.common.service.jinhui.JinhuiCommunityService;
			import com.panzhihua.common.validated.AddGroup;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.lang3.StringUtils;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.Resource;
			@@ -28,9 +32,24 @@
			@RequestMapping("/Jinhui/")
			public class JinhuiAppi extends BaseController {

			@Resource
			private CommunityService communityService;

			@Resource
			private JinhuiCommunityService jinhuiCommunityService;


			@ApiOperation(value = "新增服务活动")
			@PostMapping("add/activity")
			public R addActivity(@RequestBody @Validated(AddGroup.class) ComActActivityVO comActActivityVO) {
			Long communityId = this.getCommunityId();
			comActActivityVO.setCommunityId(communityId);
			comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
			comActActivityVO.setStatus(2);
			comActActivityVO.setHasPrize(0);
			comActActivityVO.setHaveIntegralReward(2);
			return communityService.addActivity(comActActivityVO);
			}

			/**
			* 办事指南_新增
			@@ -322,7 +341,7 @@
			* @return
			*/
			@ApiOperation(value = "空间预约申请分页", response = JinhuiInterspaceApplyForVO.class)
			@GetMapping("//applyFor/getList")
			@GetMapping("/applyFor/getList")
			public R applyForGetList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam(value = "intendantType", required = false) String intendantType,

	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -53,7 +53,7 @@
			comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
			comActActivityVO.setStatus(2);
			comActActivityVO.setHasPrize(0);
			comActActivityVO.setHaveIntegralReward(0);
			comActActivityVO.setHaveIntegralReward(2);
			return communityService.addActivity(comActActivityVO);
			}