Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java

@@ -57,6 +57,7 @@ public class KwmAddressService {
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
+
     /**
      * @param reqVo 分页入参
      * @return HttpResult
@@ -210,33 +211,34 @@ public class KwmAddressService {
             }
         }
 
-        //当前是普通地址，需要把已设置的取消
-        if (defaultType.equals(AddressDefaultTypeEnum.NO.getCode())) {
-            LambdaQueryWrapper<KwmAddress> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.eq(KwmAddress::getEntId, entId).
-                               eq(KwmAddress::getDelFlag, Global.NO).
-                               and(wp -> wp.eq(KwmAddress::getDefaultType, setDefaultType).or().
-                                            eq(KwmAddress::getDefaultType, AddressDefaultTypeEnum.BOTH.getCode()));
-            List<KwmAddress> kwmAddressList = kwmAddressMapper.selectList(lambdaQueryWrapper);
-            if (CollectionUtils.isNotEmpty(kwmAddressList)) {
-                KwmAddress kwmAddress1 = kwmAddressList.get(0);
-                if (kwmAddress1.getDefaultType().equals(AddressDefaultTypeEnum.BOTH.getCode())) {
-                    if (setDefaultType.equals(AddressDefaultTypeEnum.SHIPMENT.getCode())) {
-                        kwmAddress1.setDefaultType(AddressDefaultTypeEnum.TAKE.getCode());
-                    }
-
-                    if (setDefaultType.equals(AddressDefaultTypeEnum.TAKE.getCode())) {
-                        kwmAddress1.setDefaultType(AddressDefaultTypeEnum.SHIPMENT.getCode());
-                    }
-                } else {
-                    kwmAddress1.setDefaultType(AddressDefaultTypeEnum.NO.getCode());
+        //需要把已设置的取消
+        LambdaQueryWrapper<KwmAddress> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(KwmAddress::getEntId, entId).
+                eq(KwmAddress::getDelFlag, Global.NO).
+                and(wp -> wp.eq(KwmAddress::getDefaultType, setDefaultType).or().
+                        eq(KwmAddress::getDefaultType, AddressDefaultTypeEnum.BOTH.getCode()));
+        List<KwmAddress> kwmAddressList = kwmAddressMapper.selectList(lambdaQueryWrapper);
+        if (CollectionUtils.isNotEmpty(kwmAddressList)) {
+            KwmAddress kwmAddress1 = kwmAddressList.get(0);
+            if (kwmAddress1.getDefaultType().equals(AddressDefaultTypeEnum.BOTH.getCode())) {
+                if (setDefaultType.equals(AddressDefaultTypeEnum.SHIPMENT.getCode())) {
+                    kwmAddress1.setDefaultType(AddressDefaultTypeEnum.TAKE.getCode());
                 }
-                kwmAddress1.setUpdateBy(userId);
-                kwmAddress1.setUpdateTime(date);
-                if (kwmAddressMapper.updateById(kwmAddress1) <= 0) {
-                    throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
+
+                if (setDefaultType.equals(AddressDefaultTypeEnum.TAKE.getCode())) {
+                    kwmAddress1.setDefaultType(AddressDefaultTypeEnum.SHIPMENT.getCode());
                 }
+            } else {
+                kwmAddress1.setDefaultType(AddressDefaultTypeEnum.NO.getCode());
+            }
+            kwmAddress1.setUpdateBy(userId);
+            kwmAddress1.setUpdateTime(date);
+            if (kwmAddressMapper.updateById(kwmAddress1) <= 0) {
+                throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
             }
+        }
+
+        if (defaultType.equals(AddressDefaultTypeEnum.NO.getCode())) {
             kwmAddress.setDefaultType(setDefaultType);
         }