From ffd413917ffdfe43a99ffa30e9e9c28204c0507b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 3 Sep 2024 05:44:42 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/oms/mapper/EmisCustomerAddressMapper.java  | 3 ++-
 .../erp/oms/service/impl/EmisCustomerAddressServiceImpl.java  | 4 ++--
 .../src/main/resources/mapper/EmisCustomerAddressMapper.xml   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCustomerAddressMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCustomerAddressMapper.java
index 0472388..9fbb20b 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCustomerAddressMapper.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCustomerAddressMapper.java
@@ -13,6 +13,7 @@ package com.xdadan.erp.oms.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xdadan.erp.oms.domain.EmisCustomerAddress;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @ClassName EmisCustomerAddressMapper
@@ -78,7 +79,7 @@ public interface EmisCustomerAddressMapper extends BaseMapper<EmisCustomerAddres
      * 取消默认
      * @return
      */
-    public int cancelCustomerDefaultFlag(String customerCode);
+    public int cancelCustomerDefaultFlag(@Param("customerCode") String customerCode,@Param("addressType") String addressType);
 
 
 
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisCustomerAddressServiceImpl.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisCustomerAddressServiceImpl.java
index 7d13951..5ebc390 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisCustomerAddressServiceImpl.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisCustomerAddressServiceImpl.java
@@ -121,8 +121,8 @@ public class EmisCustomerAddressServiceImpl  implements IEmisCustomerAddressServ
         if("1".equals(defaultFlag)){
 
             if(oldAddress != null ){
-                // 取消对应客户所有默认
-                emisCustomerAddressMapper.cancelCustomerDefaultFlag(oldAddress.getCustomerCode());
+                // 取消对应客户所有默认,寄件或收件
+                emisCustomerAddressMapper.cancelCustomerDefaultFlag(oldAddress.getCustomerCode(),oldAddress.getAddressType());
             }
 
             // 设置当前为1
diff --git a/emis-oms-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
index 18138b6..9b139d7 100644
--- a/emis-oms-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
+++ b/emis-oms-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
@@ -209,7 +209,7 @@
     </update>
 
     <update id="cancelCustomerDefaultFlag" parameterType="String">
-        update emis_customer_address set bl_default_flag = '0' where customer_code = #{customerCode}
+        update emis_customer_address set bl_default_flag = '0' where customer_code = #{customerCode} and address_type = #{addressType}
     </update>