From a0aa6829edd09c0e186b32d067242d1db3b6b73c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 24 十一月 2023 15:40:11 +0800
Subject: [PATCH] 修改小程序下单

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
index d9689f6..0203e62 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -12,6 +12,7 @@
 import com.panzhihua.common.model.vos.jinhui.JinhuiShoppingOrderVO;
 import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
 import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.model.vos.user.SysUserVO;
 import com.panzhihua.common.service.community.CommunityService;
 import com.panzhihua.common.service.partybuilding.NewStriveForFeign;
 import com.panzhihua.common.service.user.UserService;
@@ -718,8 +719,8 @@
     @PostMapping("/orderAddData")
     public R orderAddData(@RequestBody NewFightShoppingOrderVO item)
     {
-        item.setCommunityId(getCommunityId()+"");
-        item.setUserId(getUserId()+"");
+//        item.setCommunityId(getCommunityId()+"");
+//        item.setUserId(getUserId()+"");
         item.setOrderType("1");
         return newStriveForFeign.orderAddData(item);
     }
@@ -789,4 +790,22 @@
         return communityService.getIntegralUserRank(getCommunityId(),getUserId());
     }
 
+
+    @ApiOperation(value = "是否是商家   如果是商家返回商家id")
+    @GetMapping("/selectUserBind")
+    public R selectUserBind()
+    {
+        return newStriveForFeign.selectUserBind(getCommunityId()+"",getUserId()+"");
+    }
+
+
+
+    @ApiOperation(value = "搜索用户", response = SysUserVO.class)
+    @GetMapping("/selectUserList")
+    public R selectUserList(@RequestParam("phoneOrname") String phoneOrname)
+    {
+        return newStriveForFeign.selectUserList(getCommunityId()+"",phoneOrname);
+    }
+
+
 }

--
Gitblit v1.7.1