修改默认地址

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/OrderReturnApplyDTO.java

@@ -7,6 +7,7 @@ import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 订单退货申请对象 oms_order_return_apply
@@ -35,9 +36,6 @@ public class OrderReturnApplyDTO implements Serializable
     /** 收货地址表id */
     private Long companyAddressId;
 
-    /** 退货商品id */
-    private Long goodsId;
-
     /** 订单编号 */
     private String orderSn;
 
@@ -59,28 +57,6 @@ public class OrderReturnApplyDTO implements Serializable
     /** 处理时间 */
     private Date handleTime;
 
-    /** 商品图片 */
-
-    private String goodsPic;
-
-    /** 商品名称 */
-    private String goodsName;
-
-    /** 商品品牌 */
-    private String goodsBrand;
-
-    /** 商品销售属性：颜色：红色；尺码：xl; */
-    private String goodsAttr;
-
-    /** 退货数量 */
-    private Long goodsCount;
-
-    /** 商品单价 */
-    private BigDecimal goodsPrice;
-
-    /** 商品实际支付单价 */
-    private BigDecimal goodsRealPrice;
-
     /** 原因 */
     private String reason;
 
@@ -104,4 +80,8 @@ public class OrderReturnApplyDTO implements Serializable
 
     /** 收货备注 */
     private String receiveNote;
+    /**
+     * 退货商品列表
+     */
+    private List<OmsOrderItemDTO> goodsList;
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/entity/OmsOrderReturnApply.java

@@ -41,9 +41,6 @@ public class OmsOrderReturnApply extends ModifyEntity<Long>
     /** 收货地址表id */
     private Long companyAddressId;
 
-    /** 退货商品id */
-    private Long goodsId;
-
     /** 订单编号 */
     private String orderSn;
 
@@ -65,28 +62,6 @@ public class OmsOrderReturnApply extends ModifyEntity<Long>
     /** 处理时间 */
     private Date handleTime;
 
-    /** 商品图片 */
-
-    private String goodsPic;
-
-    /** 商品名称 */
-    private String goodsName;
-
-    /** 商品品牌 */
-    private String goodsBrand;
-
-    /** 商品销售属性：颜色：红色；尺码：xl; */
-    private String goodsAttr;
-
-    /** 退货数量 */
-    private Long goodsCount;
-
-    /** 商品单价 */
-    private BigDecimal goodsPrice;
-
-    /** 商品实际支付单价 */
-    private BigDecimal goodsRealPrice;
-
     /** 原因 */
     private String reason;
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderReturnApplyServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chelvc.cloud.user.client.UserClient;
 import com.chelvc.cloud.user.client.model.Scope;
 import com.chelvc.cloud.vehicle.client.dto.OmsOrderReturnApplyDTO;
 import com.chelvc.cloud.vehicle.client.dto.OmsOrderReturnApplyIdsDTO;
@@ -15,6 +16,7 @@ import com.chelvc.cloud.vehicle.server.dao.OmsOrderReturnApplyMapper;
 import com.chelvc.cloud.vehicle.server.entity.OmsOrder;
 import com.chelvc.cloud.vehicle.server.entity.OmsOrderReturnApply;
 import com.chelvc.cloud.vehicle.server.service.MerchantService;
+import com.chelvc.cloud.vehicle.server.service.OmsOrderItemService;
 import com.chelvc.cloud.vehicle.server.service.OmsOrderReturnApplyService;
 import com.chelvc.cloud.vehicle.server.service.OmsOrderService;
 import com.chelvc.framework.base.context.SessionContextHolder;
@@ -28,6 +30,7 @@ import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -47,6 +50,10 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
 
     private final OmsOrderService omsOrderService;
 
+    private final OmsOrderItemService omsOrderItemService;
+
+    private final UserClient userClient;
+
     /**
      * 查询订单退货申请
      *
@@ -146,7 +153,15 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
                 .orderByDesc(OmsOrderReturnApply::getCreateTime)
                 .orderByDesc(OmsOrderReturnApply::getReceiveTime)
                 .page(DatabaseContextHolder.page(param.getPaging()));
-        return DatabaseContextHolder.pagination(page, OrderReturnApplyCopier.INSTANCE::copying);
+        Pagination<OrderReturnApplyDTO> pages = DatabaseContextHolder.pagination(page, OrderReturnApplyCopier.INSTANCE::copying);
+        if (CollectionUtils.isEmpty(pages.getRecords())){
+            return pages;
+        }
+        pages.getRecords().forEach(item ->{
+            item.setGoodsList(this.omsOrderItemService.getOrderItemByOrderId(item.getOrderId()));
+
+        });
+        return pages;
     }
 
     @Override

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/UserReceiveAddressServiceImpl.java

@@ -33,6 +33,16 @@ public class UserReceiveAddressServiceImpl extends ServiceImpl<UserReceiveAddres
         receiveAddress.setCreateTime(new Date());
         receiveAddress.setUpdateTime(new Date());
         receiveAddress.setUserId(userId);
+        if (param.isDefaultStatus()){
+            UserReceiveAddress receiveAddressDetail = this.lambdaQuery()
+                    .eq(UserReceiveAddress::getUserId,userId)
+                    .eq(UserReceiveAddress::isDefaultStatus,true)
+                    .one();
+            if (null != receiveAddressDetail){
+                receiveAddressDetail.setDefaultStatus(false);
+                this.updateById(receiveAddressDetail);
+            }
+        }
         this.save(receiveAddress);
         return receiveAddress.getId();