From 4246b65b3e6c008b45623bb3627fb6e06df13246 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 19 十月 2023 16:25:26 +0800
Subject: [PATCH] 便民服务商家管理

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
index 4a55aee..c041e0e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -169,7 +169,9 @@
      */
     @ApiOperation(value = "分页查询便民服务商家", response = ConvenientMerchantVO.class)
     @PostMapping("/merchant/page")
-    public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO) {
+    public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO)
+    {
+        pageConvenientMerchantDTO.setAuditType("2");
         return jinhuiCommunityService.pageMerchant(pageConvenientMerchantDTO);
     }
 
@@ -603,4 +605,20 @@
     }
 
 
+    @ApiOperation(value = "订单核销")
+    @GetMapping("/orderCheck")
+    public R orderEditData(@RequestParam("id") String id)
+    {
+
+        if(StringUtils.isEmpty(id))
+        {
+            return R.fail("订单id不能为空");
+        }
+
+        JinhuiShoppingOrderVO vo=new JinhuiShoppingOrderVO();
+        vo.setId(id);
+        vo.setCancelType("1");
+        return jinhuiCommunityService.orderEditData(vo);
+    }
+
 }

--
Gitblit v1.7.1