From 074e0690cb8585aaa0d3f4d3b7e1577c5bbc2bef Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Tue, 30 Jan 2024 14:44:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9C=B0=E5=9D=80=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/project/address/view.html       | 23 ++++++-------------
 .../templates/project/user/view.html          |  6 +++++
 .../controller/UserAddressController.java     | 12 +++++-----
 .../service/impl/UserAddressServiceImpl.java  |  7 ++----
 .../service/impl/WechatServiceImpl.java       |  2 ++
 .../resources/mapper/UserAddressMapper.xml    |  1 +
 6 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/address/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/address/view.html
index 8ad17be0..4965a4b0 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/address/view.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/address/view.html
@@ -11,12 +11,11 @@
                 <div class="select-list">
                     <ul>
                         <li>
-                            <p>昵称：</p>
-                            <input type="text" name="nickname"/>
+                            <input type="text"  name="userId" th:value="${userId}" hidden/>
                         </li>
                         <li>
-                            <p>电话：</p>
-                            <input type="text" name="mobile"/>
+                            <p>详细地址：</p>
+                            <input type="text"  name="address"/>
                         </li>
                         <li>
                             <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i
@@ -57,24 +56,16 @@
                 checkbox: true
             },
                 {
-                    field: 'nickname',
-                    title: '昵称'
+                    field: 'name',
+                    title: '收货人'
                 },
                 {
                     field: 'mobile',
                     title: '电话'
                 },
                 {
-                    field: 'gender',
-                    title: '性别'
-                },
-                {
-                    field: 'province',
-                    title: '省份'
-                },
-                {
-                    field: 'city',
-                    title: '城市'
+                    field: 'address',
+                    title: '详细地址'
                 },
                 {
                     field: 'creator',
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/user/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/user/view.html
index 6a982ca8..ee6b4caf 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/user/view.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/user/view.html
@@ -90,6 +90,7 @@
                     formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i>勋章</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="address(\'' + row.guid + '\')"><i class="fa fa-edit"></i>地址</a> ');
                         return actions.join('');
                     }
                 }
@@ -98,6 +99,11 @@
         $.table.init(options);
     });
 
+
+    function address(id) {
+        table.set();
+        $.modal.openFull("", ctx + "small/project/address/view/" + id);
+    }
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/UserAddressController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/UserAddressController.java
index 8b87ff34..b496c20e 100755
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/UserAddressController.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/UserAddressController.java
@@ -29,8 +29,9 @@ public class UserAddressController extends BaseController {
     private IUserAddressService userAddressService;
 
     @RequiresPermissions("project:address:view")
-    @GetMapping("/view")
-    public String manage() {
+    @GetMapping("/view/{id}")
+    public String manage(@PathVariable("id") String guid, ModelMap mmap) {
+        mmap.put("userId", guid);
         return prefix + "/view";
     }
 
@@ -79,10 +80,10 @@ public class UserAddressController extends BaseController {
     /**
      * 新增保存
      */
-    @RequiresPermissions("project:address:add")
+    //@RequiresPermissions("project:address:add")
     @PostMapping("/add")
     @ResponseBody
-    public ZDResponse addSave(UserAddress userAddress) {
+    public ZDResponse addSave(@RequestBody UserAddress userAddress) {
         return userAddressService.insertUserAddress(userAddress) > 0
                 ? ZDResponse.success() : ZDResponse.error("新增失败");
     }
@@ -111,10 +112,9 @@ public class UserAddressController extends BaseController {
     /**
      * 删除
      */
-    @RequiresPermissions("project:address:remove")
     @PostMapping("/remove")
     @ResponseBody
-    public ZDResponse remove(String ids) {
+    public ZDResponse remove(@RequestBody String ids) {
         return userAddressService.deleteUserAddressByIds(ids) > 0
                 ? ZDResponse.success() : ZDResponse.error("删除失败");
     }
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/UserAddressServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/UserAddressServiceImpl.java
index f69636d8..0d4c908f 100644
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/UserAddressServiceImpl.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/UserAddressServiceImpl.java
@@ -57,11 +57,8 @@ public class UserAddressServiceImpl implements IUserAddressService {
      */
     @Override
     public int insertUserAddress(UserAddress userAddress) {
-        UserBean userBean = userApi.getCurrentUser();
-        if (Objects.nonNull(userBean)) {
-            userAddress.setCreator(userBean.getUserName());
-            userAddress.setCreateTime(DateUtils.getNowDate());
-        }
+        userAddress.setCreator("SYSTEM");
+        userAddress.setCreateTime(DateUtils.getNowDate());
         userAddress.setGuid(StringUtils.getUUID());
         return userAddressMapper.insertUserAddress(userAddress);
     }
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java
index 873770da..bd6844de 100644
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java
@@ -101,8 +101,10 @@ public class WechatServiceImpl implements WechatService {
             insertOrUpdateDO.setToken(getToken(insertOrUpdateDO.getGuid(), insertOrUpdateDO.getNickname()));
             wechatLoginMapper.insertUser(insertOrUpdateDO);
             userInfoMap.put("token", openId);
+            userInfoMap.put("userId", insertOrUpdateDO.getGuid());
         } else {
             userInfoMap.put("token", openId);
+            userInfoMap.put("userId", insertOrUpdateDO.getGuid());
             // 已存在，做已存在的处理，如更新用户的头像，昵称等，根据openID更新
             //wechatLoginMapper.updateByOpenId(insertOrUpdateDO);
         }
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/UserAddressMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/UserAddressMapper.xml
index aab2423b..809f7e63 100644
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/UserAddressMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/UserAddressMapper.xml
@@ -30,6 +30,7 @@
             <if test="name != null  and name != ''">and `name` like concat('%', #{name}, '%')</if>
             <if test="address != null  and address != ''">and `address` like concat('%', #{address}, '%')</if>
             <if test="creator != null  and creator != ''">and creator = #{creator}</if>
+            <if test="userId != null  and userId != ''">and user_id = #{userId}</if>
         </where>
         order by create_time desc
     </select>