From c0176109caa96cab00d402075e81fa23eb3f85b8 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 28 八月 2023 15:47:22 +0800
Subject: [PATCH] 新增商家端商家类型
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 85 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 77 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 6ffdc73..afd9189 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -26,6 +26,7 @@
import com.panzhihua.common.model.dtos.property.PagePropertyWorkerDTO;
import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO;
import com.panzhihua.common.model.dtos.shop.*;
+import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
@@ -37,6 +38,7 @@
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
+import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
@@ -214,12 +216,6 @@
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO;
-import com.panzhihua.common.model.vos.BcDictionaryItemVO;
-import com.panzhihua.common.model.vos.BcDictionaryVO;
-import com.panzhihua.common.model.vos.ComActSocialMemberVO;
-import com.panzhihua.common.model.vos.DictionaryVO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
@@ -257,6 +253,8 @@
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -11336,7 +11334,8 @@
*/
@GetMapping("/VolunteerType/volunteerTypeGetList")
public R volunteerTypeGetList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageSize") int pageSize);
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("type") String type);
/**
* 新增
@@ -11509,8 +11508,78 @@
@PostMapping("/VolunteerIntegralMerchant/updateById")
public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO);
+
+ @PostMapping("/unmount")
+ public R VolunteerIntegralMerchantUnmount(@RequestBody VolunteerIntegralMerchantVO vimVO);
+
@DeleteMapping("/VolunteerIntegralMerchant/deleteById")
- public R VolunteerIntegralMerchantDeleteById(@RequestParam String id);
+ public R VolunteerIntegralMerchantDeleteById(@RequestParam("id") String id);
+
+
+ /***********************************************************************************************************
+ *
+ *
+ * 订单兑换
+ *
+ *
+ ***********************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/order/getList")
+ public R getList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "goodsId", required = false) String goodsId,
+ @RequestParam(value = "orderNumber", required = false) String orderNumber,
+ @RequestParam(value = "goodsName", required = false) String goodsName,
+ @RequestParam(value = "condition", required = false) String condition,
+ @RequestParam(value = "userName", required = false) String userName,
+ @RequestParam(value = "communityId", required = false) String communityId,
+ @RequestParam(value = "userId", required = false) String userId);
+
+ /**
+ * 查询详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/order/getData")
+ public R getData(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralMerchant/order/insertData")
+ public R insertData(@RequestBody VolunteerCreditsExchangeVO item);
+
+ /**
+ * 更新
+ * @param item
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralMerchant/order/update")
+ public R update(@RequestBody VolunteerCreditsExchangeVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/VolunteerIntegralMerchant/order/delete")
+ public R delete(@RequestParam("id") String id);
+
+ /**
+ * 核销
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/order/conditionData")
+ public R conditionData(@RequestParam("id") String id);
+
--
Gitblit v1.7.1