Merge branch 'dev/2024/0604/update-admin-Y' of feifan/mall-backend-admin into master

添加积分商城所需的参数

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -398,7 +398,12 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         }
 
         // 执行更新
-        updateOrderObj.setStatus(TradeOrderStatusEnum.DELIVERED.getStatus()).setDeliveryTime(LocalDateTime.now());
+        if(deliveryReqVO.getDeliveryRemark() != null){
+            //如果是虚拟商品直接完成发货和签收
+            updateOrderObj.setStatus(TradeOrderStatusEnum.COMPLETED.getStatus()).setDeliveryTime(LocalDateTime.now()).setReceivingTime(LocalDateTime.now());
+        }else{
+            updateOrderObj.setStatus(TradeOrderStatusEnum.DELIVERED.getStatus()).setDeliveryTime(LocalDateTime.now());
+        }
         int updateCount = tradeOrderMapper.updateByIdAndStatus(order.getId(), order.getStatus(), updateOrderObj);
         if (updateCount == 0) {
             throw exception(ORDER_DELIVERY_FAIL_STATUS_NOT_UNDELIVERED);

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/address/AddressController.java

@@ -33,8 +33,8 @@ public class AddressController {
     @Operation(summary = "获得用户收件地址列表")
     @Parameter(name = "userId", description = "用户编号", required = true)
     @PreAuthorize("@ss.hasPermission('member:user:query')")
-    public CommonResult<List<AddressRespVO>> getAddressList(@RequestParam("userId") Long userId) {
-        List<MemberAddressDO> list = addressService.getAddressList(userId);
+    public CommonResult<List<AddressRespVO>> getAddressList(@RequestParam("userId") Long userId,Integer addressType) {
+        List<MemberAddressDO> list = addressService.getAddressList(userId,addressType);
         return success(AddressConvert.INSTANCE.convertList2(list));
     }
 

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/address/vo/AddressBaseVO.java

@@ -2,9 +2,6 @@ package cn.newfeifan.mall.module.member.controller.admin.address.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.util.*;
 import javax.validation.constraints.*;
 
 /**
@@ -32,5 +29,7 @@ public class AddressBaseVO {
     @Schema(description = "是否默认", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotNull(message = "是否默认不能为空")
     private Boolean defaultStatus;
+    @Schema(description = "地址类别", example = "1")
+    private Integer addressType;
 
 }

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/dal/dataobject/address/MemberAddressDO.java

@@ -46,9 +46,13 @@ public class MemberAddressDO extends BaseDO {
     private String detailAddress;
     /**
      * 是否默认
-     *
      * true - 默认收件地址
      */
     private Boolean defaultStatus;
 
+    /**
+     * 地址类别
+     */
+    private Integer addressType;
+
 }

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

@@ -52,9 +52,10 @@ public interface AddressService {
      * 获得用户收件地址列表
      *
      * @param userId 用户编号
+     * @param addressType 地址类别
      * @return 用户收件地址列表
      */
-    List<MemberAddressDO> getAddressList(Long userId);
+    List<MemberAddressDO> getAddressList(Long userId,Integer addressType);
 
     /**
      * 获得用户默认的收件地址

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

@@ -84,8 +84,8 @@ public class AddressServiceImpl implements AddressService {
     }
 
     @Override
-    public List<MemberAddressDO> getAddressList(Long userId) {
-        return memberAddressMapper.selectListByUserIdAndDefaulted(userId, null);
+    public List<MemberAddressDO> getAddressList(Long userId,Integer addressType) {
+        return memberAddressMapper.selectList(MemberAddressDO::getUserId,userId,MemberAddressDO::getAddressType,addressType);
     }
 
     @Override

sql/mysql/建空库SQL/11_20240607.sql

@@ -2,4 +2,5 @@ ALTER TABLE product_spu ADD COLUMN spu_pay_type INT(11) NOT NULL DEFAULT '1' COM
 ALTER TABLE member_address MODIFY COLUMN area_id bigint(20) NULL COMMENT '地区编码';        --修改收件地址的地区编码字段为可空
 ALTER TABLE trade_order
 ADD COLUMN delivery_remark varchar(255) COLLATE utf8mb4_unicode_ci COMMENT '发货备注',
-ADD COLUMN attachment varchar(256) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '发货信息的附件';       --添加订单信息的发货备注和附件字段
+ADD COLUMN attachment varchar(256) COLLATE utf8mb4_unicode_ci COMMENT '发货信息的附件';       --添加订单信息的发货备注和附件字段
+ALTER TABLE member_address ADD COLUMN addressType INT(11) NOT NULL DEFAULT 1 COMMENT '地址类别';        --添加收件地址类别字段