From bb067689b4fa31650f52f43c8e67d867860b7610 Mon Sep 17 00:00:00 2001
From: wqy <1191068887@qq.com>
Date: Tue, 23 Apr 2024 09:15:34 +0800
Subject: [PATCH] =?UTF-8?q?bug=20fix=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oms/controller/OrderController.java       |  6 ++++++
 .../domain/form/ManagerOrderQueryForm.java    | 12 +++++------
 .../cyl/manager/oms/service/OrderService.java | 20 +++++++++++++++++++
 .../main/resources/mapper/oms/OrderMapper.xml | 12 +++++------
 4 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java
index 55ccc27..aef2601 100644
--- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java
+++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java
@@ -50,6 +50,12 @@ public class OrderController extends BaseController {
         return ResponseEntity.ok(service.selectList(query, page));
     }
 
+    @ApiOperation("修改收件人信息")
+    @PostMapping("/receiver/update")
+    public ResponseEntity<Boolean> updateReceiver(@RequestBody Order order) {
+        return ResponseEntity.ok(service.updateReceiver(order));
+    }
+
     @ApiOperation("导出订单表列表")
     @PreAuthorize("@ss.hasPermi('oms:order:export')")
     @Log(title = "订单表", businessType = BusinessType.EXPORT)
diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerOrderQueryForm.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerOrderQueryForm.java
index 29a11b7..3711ae3 100644
--- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerOrderQueryForm.java
+++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerOrderQueryForm.java
@@ -33,14 +33,14 @@ public class ManagerOrderQueryForm {
     @ApiModelProperty(name = "status", value = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单", required = true, dataType = "String")
     private Integer status;
 
-    @ApiModelProperty("省份/直辖市id 精确匹配")
-    private Long receiverProvinceId;
+    @ApiModelProperty("省份/直辖市 精确匹配")
+    private String receiverProvince;
 
-    @ApiModelProperty("城市id 精确匹配")
-    private Long receiverCityId;
+    @ApiModelProperty("城市 精确匹配")
+    private String receiverCity;
 
-    @ApiModelProperty("区id 精确匹配")
-    private Long receiverDistrictId;
+    @ApiModelProperty("区 精确匹配")
+    private String receiverDistrict;
 
     @ApiModelProperty(name = "startTime", value = "开始时间", required = true, dataType = "Date")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java
index 518fbf8..9b9491b 100644
--- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java
+++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java
@@ -30,6 +30,7 @@ import com.cyl.manager.ums.mapper.MemberMapper;
 import com.github.pagehelper.PageHelper;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.AesCryptoUtils;
+import com.ruoyi.common.utils.PhoneUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -380,4 +381,23 @@ public class OrderService {
             return null;
         }
     }
+
+    public Boolean updateReceiver(Order order) {
+        Order dbOrder = orderMapper.selectById(order.getId());
+        if (dbOrder == null) {
+            return false;
+        }
+        UpdateWrapper<Order> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("receiver_name",order.getReceiverName())
+                        .set("receiver_phone",PhoneUtils.hidePhone(order.getReceiverPhone()))
+                        .set("receiver_city",order.getReceiverCity())
+                        .set("receiver_district",order.getReceiverDistrict())
+                        .set("receiver_province",order.getReceiverProvince())
+                        .set("receiver_detail_address",order.getReceiverDetailAddress())
+                        .set("receiver_phone_encrypted",AesCryptoUtils.encrypt(aesKey, order.getReceiverPhone()))
+                        .set("update_time",LocalDateTime.now());
+        updateWrapper.eq("id",order.getId());
+        int update = orderMapper.update(null, updateWrapper);
+        return update == 1;
+    }
 }
diff --git a/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml b/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml
index 4702d3a..b717d9d 100644
--- a/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml
+++ b/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml
@@ -133,14 +133,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!--<if test="productName != null and productName != ''">-->
             <!--and instr(b.product_name, #{productName}) > 0-->
         <!--</if>-->
-        <if test="receiverProvinceId != null ">
-            and a.receiver_province_id = #{receiverProvinceId}
+        <if test="receiverProvince != null ">
+            and a.receiver_province = #{receiverProvince}
         </if>
-        <if test="receiverCityId != null">
-            and a.receiver_city_id = #{receiverCityId}
+        <if test="receiverCity != null">
+            and a.receiver_city = #{receiverCity}
         </if>
-        <if test="receiverDistrictId != null">
-            and a.receiver_district_id = #{receiverDistrictId}
+        <if test="receiverDistrict != null">
+            and a.receiver_district = #{receiverDistrict}
         </if>
         <if test="userPhone != null and userPhone != ''">
             and c.phone_encrypted=#{userPhone} > 0