Merge branch 'dev/2024/0607/update-app-Y' of feifan/mall-backend-app into master

添加积分商城所需的参数

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java

@@ -41,7 +41,7 @@ public class AppTradeOrderSettlementReqVO {
     @Schema(description = "收件地址编号", example = "1")
     private Long addressId;
     @Schema(description = "地址类别",example = "1 实体;2虚拟")
-    private Integer addressType;
+    private Integer addressType = 1;
 
     @Schema(description = "自提门店编号", example = "1088")
     private Long pickUpStoreId;

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/address/AddressServiceImpl.java

@@ -6,6 +6,7 @@ import cn.newfeifan.mall.module.member.controller.app.address.vo.AppAddressUpdat
 import cn.newfeifan.mall.module.member.convert.address.AddressConvert;
 import cn.newfeifan.mall.module.member.dal.dataobject.address.MemberAddressDO;
 import cn.newfeifan.mall.module.member.dal.mysql.address.MemberAddressMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -23,6 +24,7 @@ import static cn.newfeifan.mall.module.member.enums.ErrorCodeConstants.ADDRESS_N
  */
 @Service
 @Validated
+@Slf4j
 public class AddressServiceImpl implements AddressService {
 
     @Resource
@@ -91,11 +93,8 @@ public class AddressServiceImpl implements AddressService {
     @Override
     public MemberAddressDO getDefaultUserAddress(Long userId,Integer addressType) {
         List<MemberAddressDO> addresses;
-        if(addressType == 1){
-            addresses = memberAddressMapper.selectListByUserIdAndDefaulted(userId, true,addressType);
-        }else{
-            addresses = memberAddressMapper.selectListByUserIdAndDefaulted(userId, true,addressType);
-        }
+        log.info("addressType:{}",addressType);
+        addresses = memberAddressMapper.selectListByUserIdAndDefaulted(userId, true,addressType);
         return CollUtil.getFirst(addresses);
     }