java/zhihuishenqu.git

			@@ -2,12 +2,12 @@

			import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO;
			import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
			import com.panzhihua.common.model.dtos.community.convenient.JinhuiPageConvenientMerchantDTO;
			import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
			import com.panzhihua.common.model.vos.R;
			import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
			import com.panzhihua.common.model.vos.jinhui.JinghuiMerchantEvaluateVO;
			import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
			import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
			import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO;
			import com.panzhihua.common.model.vos.jinhui.*;
			import org.springframework.cloud.openfeign.FeignClient;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.web.bind.annotation.*;
			@@ -220,7 +220,7 @@
			* @return
			*/
			@PostMapping("/jinhuiMerchant/page")
			public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO);
			public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO);

			/**
			* 获取便民服务商家详情
			@@ -241,6 +241,13 @@
			public R getListCategories(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize);



			@PostMapping("/jinhuiMerchant/addData")
			public R merchantAddData(@RequestBody JinhuiConvenientMerchantVO item);

			@PostMapping("/jinhuiMerchant/editData")
			public R merchantEditData(@RequestBody JinhuiConvenientMerchantVO item);

			/**************************************************************************************************************
			*
			@@ -293,5 +300,392 @@
			public R merchantEvaluateExpurgateData(@RequestParam("id") String id);


			/*********************************************************************************************************
			*
			*
			* 金汇预约空间
			*
			*
			*********************************************************************************************************/
			/**
			* 金汇空间预约模块分页查询
			* @param
			* @return
			*/
			@GetMapping("/JinhuiInterspace/interspaceGetList")
			public R interspaceGetList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam(value = "intendantType",required = false) String intendantType);

			/**
			* 金汇空间预约模块单个详情
			* @param id
			* @return
			*/
			@GetMapping("/JinhuiInterspace/interspaceGetDetails")
			public R interspaceGetDetails(@RequestParam("id") String id);

			/**
			* 金汇空间预约模块新增
			* @param
			* @return
			*/
			@PostMapping("/JinhuiInterspace/interspaceAddData")
			public R interspaceAddData(@RequestBody JinhuiInterspaceVO item);


			/**
			* 金汇空间预约模块编辑
			* @return
			*/
			@PostMapping("/JinhuiInterspace/interspaceEditData")
			public R interspaceEditData(@RequestBody JinhuiInterspaceVO item);


			/**
			* 金汇空间预约模块删除
			* @param id
			* @return
			*/
			@GetMapping("/JinhuiInterspace/interspaceExpurgateData")
			public R interspaceExpurgateData(@RequestParam("id") String id);


			/****************************************************************************************************
			*
			*
			* 空间预约分类
			*
			*
			******************************************************************************************************/
			/**
			* 空间预约分类分页查询
			* @param
			* @return
			*/
			@GetMapping("/JinhuiInterspace/interspaceTypeGetList")
			public R interspaceTypeGetList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize);

			/**
			* 空间预约分类单个详情
			* @param
			* @return
			*/
			@GetMapping("/JinhuiInterspace/interspaceTypeGetDetails")
			public R interspaceTypeGetDetails(@RequestParam("id") String id);

			/**
			* 空间预约分类新增
			* @param
			* @return
			*/
			@PostMapping("/JinhuiInterspace/interspaceTypeAddData")
			public R interspaceTypeAddData(@RequestBody JinhuiInterspaceTypeVO item);

			/**
			* 空间预约分类编辑
			* @param
			* @return
			*/
			@PostMapping("/JinhuiInterspace/interspaceTypeEditData")
			public R interspaceTypeEditData(@RequestBody JinhuiInterspaceTypeVO item);


			/**
			* 空间预约分类删除
			* @param
			* @return
			*/
			@DeleteMapping("/JinhuiInterspace/interspaceTypeExpurgateData")
			public R interspaceTypeExpurgateData(@RequestParam("id") String id);



			/***************************************************************************************************************
			*
			*
			* 空间预约申请
			*
			*
			**************************************************************************************************************/
			/**
			* 空间预约申请分页查询
			* @param
			* @return
			*/
			@GetMapping("/JinhuiInterspace/applyFor/getList")
			public R applyForGetList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam(value = "intendantType",required = false) String intendantType,
			@RequestParam(value = "state",required = false) String state,
			@RequestParam(value = "interspaceTime",required = false) String interspaceTime,
			@RequestParam(value = "subscribeTimeFrame",required = false) String subscribeTimeFrame,
			@RequestParam(value = "interspaceId",required = false) String interspaceId);

			/**
			* 空间预约申请详情
			* @param
			* @return
			*/
			@GetMapping("/JinhuiInterspace/applyFor/getDetails")
			public R applyForGetDetails(@RequestParam("id") String id);

			/**
			* 空间预约申请新增
			* @param
			* @return
			*/
			@PostMapping("/JinhuiInterspace/applyFor/addData")
			public R applyForAddData(@RequestBody JinhuiInterspaceApplyForVO item);

			/**
			* 空间预约申请编辑
			* @param
			* @return
			*/
			@PostMapping("/JinhuiInterspace/applyFor/editData")
			public R applyForEditData(@RequestBody JinhuiInterspaceApplyForVO item);

			/**
			* 空间预约申请删除
			* @param
			* @return
			*/
			@DeleteMapping("/JinhuiInterspace/applyFor/expurgateData")
			public R applyForExpurgateData(@RequestParam("id") String id);


			/**************************************************************************************************************
			*
			*
			* 金汇微心愿
			*
			*
			***************************************************************************************************************/

			/**
			* 分页查询
			* @param
			* @return
			*/
			@GetMapping("/micro/volunteering/getList")
			public R volunteeringGetList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam(value = "userId", required = false)String userId,
			@RequestParam(value = "state", required = false)String state);

			/**
			* 详情
			* @param id
			* @return
			*/
			@GetMapping("/micro/volunteering/getDetails")
			public R volunteeringGetDetails(@RequestParam("id") String id);
			/**
			* 新增
			* @param
			* @return
			*/
			@PostMapping("/micro/volunteering/addData")
			public R volunteeringAddData(@RequestBody JinhuiMicroVolunteeringVO item);

			/**
			* 编辑
			* @param item
			* @return
			*/
			@PostMapping("/micro/volunteering/editData")
			public R volunteeringEditData(@RequestBody JinhuiMicroVolunteeringVO item);

			/**
			* 删除
			* @param id
			* @return
			*/
			@DeleteMapping("/micro/volunteering/expurgateData")
			public R volunteeringExpurgateData(@RequestParam("id") String id);



			/***************************************************************************************************************
			*
			*
			* 金汇微心愿分类
			*
			*
			*****************************************************************************************************************/
			/**
			* 分页查询
			* @param
			* @return
			*/
			@GetMapping("/micro/type/getList")
			public R volunteeringTypeGetList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize);


			/**
			* 详情
			* @param
			* @return
			*/
			@GetMapping("/micro/type/getDetails")
			public R volunteeringTypeGetDetails(@RequestParam("id") String id);

			/**
			* 新增
			* @param
			* @return
			*/
			@PostMapping("/micro/type/addData")
			public R volunteeringTypeAddData(@RequestBody JinhuiMicroVolunteeringTypeVO item);

			/**
			* 编辑
			* @param
			* @return
			*/
			@PostMapping("/micro/type/editData")
			public R volunteeringTypeEditData(@RequestBody JinhuiMicroVolunteeringTypeVO item);

			/**
			* 删除
			* @param
			* @return
			*/
			@DeleteMapping("/micro/type/expurgateData")
			public R volunteeringTypeExpurgateData(@RequestParam("id") String id);


			/*********************************************************************************************************
			*
			*
			* 金汇商城商品
			*
			*
			*********************************************************************************************************/
			/**
			* 分页查询
			*
			* @param
			* @return
			*/
			@GetMapping("/jinhuiShopping/shoppingGetList")
			public R shoppingGetList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam(value = "goodName", required = false) String goodName,
			@RequestParam(value = "goodType", required = false) String goodType,
			@RequestParam(value = "id", required = false) String id);


			@GetMapping("/jinhuiShopping/shoppingGetDetails")
			public R shoppingGetDetails(@RequestParam("id") String id);

			/**
			* 新增
			*
			* @param
			* @return
			*/
			@PostMapping("/jinhuiShopping/shoppingAddData")
			public R shoppingAddData(@RequestBody JinhuiShoppingVO item);


			@PostMapping("/jinhuiShopping/shoppingEditData")
			public R shoppingEditData(@RequestBody JinhuiShoppingVO item);

			@DeleteMapping("/jinhuiShopping/shoppingExpurgateData")
			public R shoppingExpurgateData(@RequestParam("id") String id);


			/********************************************************************************************************
			*
			*
			* 金汇商城商品订单
			*
			*
			********************************************************************************************************/

			/**
			* 分页查询
			* @param
			* @return
			*/
			@GetMapping("/jinhuiShopping/orderGetList")
			public R orderGetList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam(value = "userId", required = false)String userId,
			@RequestParam(value = "goodsId", required = false)String goodsId,
			@RequestParam(value = "orderNumber", required = false)String orderNumber,
			@RequestParam(value = "goodName", required = false)String goodName,
			@RequestParam(value = "name", required = false)String name,
			@RequestParam(value = "cancelType", required = false)String cancelType);

			/**
			* 分页详情
			* @param
			* @return
			*/
			@GetMapping("/jinhuiShopping/orderGetDetails")
			public R orderGetDetails(@RequestParam("id") String id);

			/**
			* 新增
			* @param
			* @return
			*/
			@PostMapping("/jinhuiShopping/orderAddData")
			public R orderAddData(@RequestBody JinhuiShoppingOrderVO item);


			/**
			* 编辑
			* @param
			* @return
			*/
			@PostMapping("/jinhuiShopping/orderEditData")
			public R orderEditData(@RequestBody JinhuiShoppingOrderVO item);


			/**
			* 取消
			* @param
			* @return
			*/
			@GetMapping("/jinhuiShopping/orderCancelOrder")
			public R orderCancelOrder(@RequestParam("orderId") String orderId);


			/**
			* 删除
			* @param
			* @return
			*/
			@DeleteMapping("/jinhuiShopping/orderExpurgateData")
			public R orderExpurgateData(@RequestParam("id") String id);


			/***************************************************************************************************************
			*
			*
			* 社区配置兑换地址时间
			*
			* *******************************************************************************************************
			* @return
			*/

			@GetMapping("/jinhuiConfig/configGetDetails")
			public R configGetDetails(@RequestParam("communityId") String communityId);


			@PostMapping("/jinhuiConfig/configAddData")
			public R configAddData(@RequestBody JinhuiConfigVO item);

			@PostMapping("/jinhuiConfig/configEditData")
			public R configEditData(@RequestBody JinhuiConfigVO item);

			@DeleteMapping("/jinhuiConfig/configExpurgateData")
			public R configExpurgateData(@RequestParam("communityId") String communityId);

			}