售后服务接口开发

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/OrderReturnApplyClient.java

@@ -0,0 +1,65 @@
+package com.chelvc.cloud.vehicle.client;
+
+import com.chelvc.cloud.vehicle.client.dto.OrderReturnApplyDTO;
+import com.chelvc.cloud.vehicle.client.param.OrderReturnApplyModifyParam;
+import com.chelvc.cloud.vehicle.client.param.OrderReturnApplyPagingParam;
+import com.chelvc.framework.common.model.Pagination;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 订单退货申请业务接口
+ *
+ * @author liude
+ * @data 2024/05/01
+ */
+@FeignClient("vehicle")
+public interface OrderReturnApplyClient {
+
+    /**
+     * 新增订单退货申请
+     * @param param
+     * @return
+     */
+    @PostMapping("/omsOrderReturnApply/add")
+    Long add(@SpringQueryMap OrderReturnApplyModifyParam param);
+
+    /**
+     * 修改订单退货申请
+     * @param param
+     * @return
+     */
+    @PutMapping("/omsOrderReturnApply/update")
+    Long update(@RequestParam("id") Long id,@SpringQueryMap OrderReturnApplyModifyParam param);
+
+    /**
+     * 订单退货申请分页查询
+     * @param param
+     * @return
+     */
+    @GetMapping("/omsOrderReturnApply/paging")
+    Pagination<OrderReturnApplyDTO> paging(@SpringQueryMap OrderReturnApplyPagingParam param);
+
+
+
+    /**
+     * 订单退货申请查询详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/omsOrderReturnApply/getDetail")
+    OrderReturnApplyDTO getDetail(@RequestParam("id")Long id);
+
+    /**
+     * 删除订单退货申请
+     * @param id
+     * @return
+     */
+    @GetMapping("/omsOrderReturnApply/delete")
+    void delete(@RequestParam("id")Long id);
+
+}

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

@@ -0,0 +1,107 @@
+package com.chelvc.cloud.vehicle.client.dto;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 订单退货申请对象 oms_order_return_apply
+ * 
+ * @author liude
+ * @date 2024-05-01
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString(callSuper = true)
+public class OrderReturnApplyDTO implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private Long id;
+
+    /** 订单id */
+    private Long orderId;
+
+    /** 商户id */
+    private Long merchantId;
+
+    /** 收货地址表id */
+    private Long companyAddressId;
+
+    /** 退货商品id */
+    private Long goodsId;
+
+    /** 订单编号 */
+    private String orderSn;
+
+    /** 会员用户名 */
+    private String userName;
+
+    /** 退款金额 */
+    private BigDecimal returnAmount;
+
+    /** 退货人姓名 */
+    private String returnName;
+
+    /** 退货人电话 */
+    private String returnPhone;
+
+    /** 申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝 */
+    private Long status;
+
+    /** 处理时间 */
+    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;
+
+    /** 描述 */
+    private String description;
+
+    /** 凭证图片，以逗号隔开 */
+    private String proofPics;
+
+    /** 处理备注 */
+    private String handleNote;
+
+    /** 处理人员 */
+    private String handleMan;
+
+    /** 收货人 */
+    private String receiveMan;
+
+    /** 收货时间 */
+    private Date receiveTime;
+
+    /** 收货备注 */
+    private String receiveNote;
+}

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/OrderReturnApplyModifyParam.java

@@ -0,0 +1,106 @@
+package com.chelvc.cloud.vehicle.client.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 订单退货申请对象 oms_order_return_apply
+ * 
+ * @author liude
+ * @date 2024-05-01
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString(callSuper = true)
+public class OrderReturnApplyModifyParam implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 订单id */
+    private Long orderId;
+
+    /** 商户id */
+    private Long merchantId;
+
+    /** 收货地址表id */
+    private Long companyAddressId;
+
+    /** 退货商品id */
+    private Long goodsId;
+
+    /** 订单编号 */
+    private String orderSn;
+
+    /** 会员用户名 */
+    private String userName;
+
+    /** 退款金额 */
+    private BigDecimal returnAmount;
+
+    /** 退货人姓名 */
+    private String returnName;
+
+    /** 退货人电话 */
+    private String returnPhone;
+
+    /** 申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝 */
+    private Long status;
+
+    /** 处理时间 */
+    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;
+
+    /** 描述 */
+    private String description;
+
+    /** 凭证图片，以逗号隔开 */
+    private String proofPics;
+
+    /** 处理备注 */
+    private String handleNote;
+
+    /** 处理人员 */
+    private String handleMan;
+
+    /** 收货人 */
+    private String receiveMan;
+
+    /** 收货时间 */
+    private Date receiveTime;
+
+    /** 收货备注 */
+    private String receiveNote;
+}

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/OrderReturnApplyPagingParam.java

@@ -0,0 +1,38 @@
+package com.chelvc.cloud.vehicle.client.param;
+
+import com.chelvc.framework.common.model.Paging;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 订单退货申请对象 oms_order_return_apply
+ * 
+ * @author liude
+ * @date 2024-05-01
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString(callSuper = true)
+public class OrderReturnApplyPagingParam implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分页信息
+     */
+    @NotNull(message = "分页不能为空")
+    private Paging paging;
+
+    /** 商户id */
+    private Long merchantId;
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/controller/OmsOrderReturnApplyController.java

@@ -2,13 +2,23 @@ package com.chelvc.cloud.vehicle.server.controller;
 
 
 import com.chelvc.cloud.vehicle.client.dto.OmsOrderReturnApplyDTO;
+import com.chelvc.cloud.vehicle.client.dto.OrderReturnApplyDTO;
+import com.chelvc.cloud.vehicle.client.param.OrderReturnApplyModifyParam;
+import com.chelvc.cloud.vehicle.client.param.OrderReturnApplyPagingParam;
 import com.chelvc.cloud.vehicle.server.service.OmsOrderReturnApplyService;
+import com.chelvc.framework.common.model.Pagination;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * 订单退货申请接口
+ */
 @RestController
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class OmsOrderReturnApplyController {
@@ -19,4 +29,57 @@ public class OmsOrderReturnApplyController {
     public OmsOrderReturnApplyDTO getOrderReturnApplyInfo(@RequestParam("id") Long id) {
         return omsOrderReturnApplyService.getOrderReturnApplyInfo(id);
     }
+
+    /**
+     * 新增订单退货申请
+     * @param param
+     * @return
+     */
+    @PostMapping("/omsOrderReturnApply/add")
+    public Long add(@SpringQueryMap OrderReturnApplyModifyParam param) {
+        return omsOrderReturnApplyService.insertOmsOrderReturnApply(param);
+    }
+
+    /**
+     * 修改订单退货申请
+     * @param param
+     * @return
+     */
+    @PutMapping("/omsOrderReturnApply/update")
+    public Long update(@RequestParam("id") Long id,@SpringQueryMap OrderReturnApplyModifyParam param) {
+        return omsOrderReturnApplyService.updateOmsOrderReturnApply(id,param);
+    }
+
+    /**
+     * 订单退货申请分页查询
+     * @param param
+     * @return
+     */
+    @GetMapping("/omsOrderReturnApply/paging")
+    public Pagination<OrderReturnApplyDTO> paging(@SpringQueryMap OrderReturnApplyPagingParam param) {
+        return omsOrderReturnApplyService.getOrderReturnApplyPaging(param);
+    }
+
+
+
+    /**
+     * 订单退货申请查询详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/omsOrderReturnApply/getDetail")
+    public OrderReturnApplyDTO getDetail(@RequestParam("id")Long id) {
+        return omsOrderReturnApplyService.selectOmsOrderReturnApplyById(id);
+    }
+
+    /**
+     * 删除订单退货申请
+     * @param id
+     * @return
+     */
+    @GetMapping("/omsOrderReturnApply/delete")
+    public void delete(@RequestParam("id")Long id) {
+        omsOrderReturnApplyService.deleteOmsOrderReturnApplyById(id);
+    }
+
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/copier/OrderReturnApplyCopier.java

@@ -0,0 +1,57 @@
+package com.chelvc.cloud.vehicle.server.copier;
+import com.chelvc.cloud.vehicle.client.dto.OrderReturnApplyDTO;
+import com.chelvc.cloud.vehicle.client.param.OrderReturnApplyModifyParam;
+import com.chelvc.cloud.vehicle.server.entity.OmsOrderReturnApply;
+import org.mapstruct.Builder;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
+import org.mapstruct.factory.Mappers;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单退货申请拷贝接口
+ *
+ * @author liude
+ * @date 2023/12/20
+ */
+@Mapper(builder = @Builder(disableBuilder = true))
+public interface OrderReturnApplyCopier {
+    /**
+     * 对象拷贝接口实例
+     */
+    OrderReturnApplyCopier INSTANCE = Mappers.getMapper(OrderReturnApplyCopier.class);
+
+    /**
+     * 订单退货申请拷贝
+     *
+     * @param omsOrderReturnApply 订单退货申请
+     * @return 订单退货申请
+     */
+    OrderReturnApplyDTO copying(OmsOrderReturnApply omsOrderReturnApply);
+
+    /**
+     * 订单退货申请信息拷贝
+     *
+     * @param omsOrderReturnApplies 订单退货申请信息集合
+     * @return 订单退货申请信息列表
+     */
+    List<OrderReturnApplyDTO> copying(Collection<OmsOrderReturnApply> omsOrderReturnApplies);
+
+    /**
+     * 订单退货申请信息拷贝
+     *
+     * @param param 订单退货申请更新参数
+     * @return 订单退货申请信息
+     */
+    OmsOrderReturnApply copying(OrderReturnApplyModifyParam param);
+
+    /**
+     * 订单退货申请信息拷贝
+     *
+     * @param param    订单退货申请更新参数
+     * @param omsOrderReturnApply 订单退货申请信息
+     */
+    void copying(OrderReturnApplyModifyParam param, @MappingTarget OmsOrderReturnApply omsOrderReturnApply);
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/OmsOrderReturnApplyMapper.java

@@ -15,51 +15,4 @@ import java.util.List;
 @Mapper
 public interface OmsOrderReturnApplyMapper extends BaseMapper<OmsOrderReturnApply>
 {
-    /**
-     * 查询订单退货申请
-     * 
-     * @param id 订单退货申请主键
-     * @return 订单退货申请
-     */
-    public OmsOrderReturnApply selectOmsOrderReturnApplyById(Long id);
-
-    /**
-     * 查询订单退货申请列表
-     * 
-     * @param omsOrderReturnApply 订单退货申请
-     * @return 订单退货申请集合
-     */
-    public List<OmsOrderReturnApply> selectOmsOrderReturnApplyList(OmsOrderReturnApply omsOrderReturnApply);
-
-    /**
-     * 新增订单退货申请
-     * 
-     * @param omsOrderReturnApply 订单退货申请
-     * @return 结果
-     */
-    public int insertOmsOrderReturnApply(OmsOrderReturnApply omsOrderReturnApply);
-
-    /**
-     * 修改订单退货申请
-     * 
-     * @param omsOrderReturnApply 订单退货申请
-     * @return 结果
-     */
-    public int updateOmsOrderReturnApply(OmsOrderReturnApply omsOrderReturnApply);
-
-    /**
-     * 删除订单退货申请
-     * 
-     * @param id 订单退货申请主键
-     * @return 结果
-     */
-    public int deleteOmsOrderReturnApplyById(Long id);
-
-    /**
-     * 批量删除订单退货申请
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteOmsOrderReturnApplyByIds(Long[] ids);
 }

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

@@ -28,7 +28,7 @@ public class OmsOrderReturnApply extends ModifyEntity<Long>
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /** 主键ID */
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
@@ -42,13 +42,13 @@ public class OmsOrderReturnApply extends ModifyEntity<Long>
     private Long companyAddressId;
 
     /** 退货商品id */
-    private Long productId;
+    private Long goodsId;
 
     /** 订单编号 */
     private String orderSn;
 
     /** 会员用户名 */
-    private String memberUsername;
+    private String userName;
 
     /** 退款金额 */
     private BigDecimal returnAmount;
@@ -63,31 +63,29 @@ public class OmsOrderReturnApply extends ModifyEntity<Long>
     private Long status;
 
     /** 处理时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-
     private Date handleTime;
 
     /** 商品图片 */
 
-    private String productPic;
+    private String goodsPic;
 
     /** 商品名称 */
-    private String productName;
+    private String goodsName;
 
     /** 商品品牌 */
-    private String productBrand;
+    private String goodsBrand;
 
     /** 商品销售属性：颜色：红色；尺码：xl; */
-    private String productAttr;
+    private String goodsAttr;
 
     /** 退货数量 */
-    private Long productCount;
+    private Long goodsCount;
 
     /** 商品单价 */
-    private BigDecimal productPrice;
+    private BigDecimal goodsPrice;
 
     /** 商品实际支付单价 */
-    private BigDecimal productRealPrice;
+    private BigDecimal goodsRealPrice;
 
     /** 原因 */
     private String reason;
@@ -108,7 +106,6 @@ public class OmsOrderReturnApply extends ModifyEntity<Long>
     private String receiveMan;
 
     /** 收货时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date receiveTime;
 
     /** 收货备注 */

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

@@ -2,7 +2,9 @@ package com.chelvc.cloud.vehicle.server.service;
 
 import com.chelvc.cloud.vehicle.client.dto.OmsOrderReturnApplyDTO;
 import com.chelvc.cloud.vehicle.client.dto.OmsOrderReturnApplyIdsDTO;
-import com.chelvc.cloud.vehicle.server.entity.OmsOrderReturnApply;
+import com.chelvc.cloud.vehicle.client.dto.OrderReturnApplyDTO;
+import com.chelvc.cloud.vehicle.client.param.OrderReturnApplyModifyParam;
+import com.chelvc.cloud.vehicle.client.param.OrderReturnApplyPagingParam;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
 
@@ -22,31 +24,30 @@ public interface OmsOrderReturnApplyService
      * @param id 订单退货申请主键
      * @return 订单退货申请
      */
-    public OmsOrderReturnApply selectOmsOrderReturnApplyById(Long id);
+    public OrderReturnApplyDTO selectOmsOrderReturnApplyById(Long id);
 
     /**
      * 查询订单退货申请列表
      *
-     * @param omsOrderReturnApply 订单退货申请
      * @return 订单退货申请集合
      */
-    public List<OmsOrderReturnApply> selectOmsOrderReturnApplyList(OmsOrderReturnApply omsOrderReturnApply);
+    public List<OrderReturnApplyDTO> selectOmsOrderReturnApplyList(OrderReturnApplyModifyParam param);
 
     /**
      * 新增订单退货申请
      *
-     * @param omsOrderReturnApply 订单退货申请
+     * @param param 订单退货申请
      * @return 结果
      */
-    public int insertOmsOrderReturnApply(OmsOrderReturnApply omsOrderReturnApply);
+    public Long insertOmsOrderReturnApply(OrderReturnApplyModifyParam param);
 
     /**
      * 修改订单退货申请
      *
-     * @param omsOrderReturnApply 订单退货申请
+     * @param param 订单退货申请
      * @return 结果
      */
-    public int updateOmsOrderReturnApply(OmsOrderReturnApply omsOrderReturnApply);
+    public Long updateOmsOrderReturnApply(Long id ,OrderReturnApplyModifyParam param);
 
     /**
      * 批量删除订单退货申请
@@ -54,7 +55,7 @@ public interface OmsOrderReturnApplyService
      * @param ids 需要删除的订单退货申请主键集合
      * @return 结果
      */
-    public int deleteOmsOrderReturnApplyByIds(Long[] ids);
+    public void deleteOmsOrderReturnApplyByIds(List<Long> ids);
 
     /**
      * 删除订单退货申请信息
@@ -62,7 +63,14 @@ public interface OmsOrderReturnApplyService
      * @param id 订单退货申请主键
      * @return 结果
      */
-    public int deleteOmsOrderReturnApplyById(Long id);
+    public Long deleteOmsOrderReturnApplyById(Long id);
+
+    /**
+     * 分页查看申请退款订单
+     * @param param
+     * @return
+     */
+    Pagination<OrderReturnApplyDTO> getOrderReturnApplyPaging(OrderReturnApplyPagingParam param);
 
     /**
      * 查看商家端申请退款订单

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

@@ -4,15 +4,26 @@ 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.model.Scope;
 import com.chelvc.cloud.vehicle.client.dto.OmsOrderReturnApplyDTO;
 import com.chelvc.cloud.vehicle.client.dto.OmsOrderReturnApplyIdsDTO;
+import com.chelvc.cloud.vehicle.client.dto.OrderReturnApplyDTO;
+import com.chelvc.cloud.vehicle.client.param.OrderReturnApplyModifyParam;
+import com.chelvc.cloud.vehicle.client.param.OrderReturnApplyPagingParam;
+import com.chelvc.cloud.vehicle.server.copier.OrderReturnApplyCopier;
 import com.chelvc.cloud.vehicle.server.dao.OmsOrderReturnApplyMapper;
 import com.chelvc.cloud.vehicle.server.entity.OmsOrderReturnApply;
+import com.chelvc.cloud.vehicle.server.service.MerchantService;
 import com.chelvc.cloud.vehicle.server.service.OmsOrderReturnApplyService;
+import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
+import com.chelvc.framework.common.util.AssertUtils;
 import com.chelvc.framework.common.util.ObjectUtils;
+import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.database.context.DatabaseContextHolder;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,11 +37,11 @@ import java.util.List;
  * @date 2023-11-08
  */
 @Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnApplyMapper, OmsOrderReturnApply> implements
         OmsOrderReturnApplyService
 {
-    @Autowired
-    private OmsOrderReturnApplyMapper omsOrderReturnApplyMapper;
+    private final MerchantService merchantService;
 
     /**
      * 查询订单退货申请
@@ -39,46 +50,53 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
      * @return 订单退货申请
      */
     @Override
-    public OmsOrderReturnApply selectOmsOrderReturnApplyById(Long id)
+    public OrderReturnApplyDTO selectOmsOrderReturnApplyById(@NonNull Long id)
     {
-        return omsOrderReturnApplyMapper.selectOmsOrderReturnApplyById(id);
+        OmsOrderReturnApply omsOrderReturnApply = this.getById(id);
+        return OrderReturnApplyCopier.INSTANCE.copying(omsOrderReturnApply);
     }
 
     /**
      * 查询订单退货申请列表
      *
-     * @param omsOrderReturnApply 订单退货申请
+     * @param param 订单退货申请
      * @return 订单退货申请
      */
     @Override
-    public List<OmsOrderReturnApply> selectOmsOrderReturnApplyList(OmsOrderReturnApply omsOrderReturnApply)
+    public List<OrderReturnApplyDTO> selectOmsOrderReturnApplyList(OrderReturnApplyModifyParam param)
     {
-        return omsOrderReturnApplyMapper.selectOmsOrderReturnApplyList(omsOrderReturnApply);
+        List<OmsOrderReturnApply> list = this.lambdaQuery().eq(OmsOrderReturnApply::getOrderId,param.getOrderId())
+                .orderByDesc(OmsOrderReturnApply::getCreateTime).list();
+        return OrderReturnApplyCopier.INSTANCE.copying(list);
     }
 
     /**
      * 新增订单退货申请
      *
-     * @param omsOrderReturnApply 订单退货申请
+     * @param param 订单退货申请
      * @return 结果
      */
     @Override
-    public int insertOmsOrderReturnApply(OmsOrderReturnApply omsOrderReturnApply)
+    public Long insertOmsOrderReturnApply(@NonNull OrderReturnApplyModifyParam param)
     {
+        OmsOrderReturnApply omsOrderReturnApply = OrderReturnApplyCopier.INSTANCE.copying(param);
         omsOrderReturnApply.setCreateTime(new Date());
-        return omsOrderReturnApplyMapper.insertOmsOrderReturnApply(omsOrderReturnApply);
+        this.save(omsOrderReturnApply);
+        return omsOrderReturnApply.getId();
     }
 
     /**
      * 修改订单退货申请
      *
-     * @param omsOrderReturnApply 订单退货申请
+     * @param param 订单退货申请
      * @return 结果
      */
     @Override
-    public int updateOmsOrderReturnApply(OmsOrderReturnApply omsOrderReturnApply)
+    public Long updateOmsOrderReturnApply(@NonNull Long id, @NonNull OrderReturnApplyModifyParam param)
     {
-        return omsOrderReturnApplyMapper.updateOmsOrderReturnApply(omsOrderReturnApply);
+        OmsOrderReturnApply omsOrderReturnApply = AssertUtils.available(this.getById(id), "退货申请单不存在");
+        OrderReturnApplyCopier.INSTANCE.copying(param,omsOrderReturnApply);
+        return omsOrderReturnApply.getId();
     }
 
     /**
@@ -88,9 +106,9 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
      * @return 结果
      */
     @Override
-    public int deleteOmsOrderReturnApplyByIds(Long[] ids)
+    public void deleteOmsOrderReturnApplyByIds(@NonNull List<Long> ids)
     {
-        return omsOrderReturnApplyMapper.deleteOmsOrderReturnApplyByIds(ids);
+        this.baseMapper.deleteBatchIds(ids);
     }
 
     /**
@@ -100,9 +118,30 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
      * @return 结果
      */
     @Override
-    public int deleteOmsOrderReturnApplyById(Long id)
+    public Long deleteOmsOrderReturnApplyById(@NonNull Long id)
     {
-        return omsOrderReturnApplyMapper.deleteOmsOrderReturnApplyById(id);
+        OmsOrderReturnApply omsOrderReturnApply = AssertUtils.available(this.getById(id), "退货申请单不存在");
+        this.baseMapper.deleteById(id);
+        return omsOrderReturnApply.getId();
+    }
+    @Override
+    public Pagination<OrderReturnApplyDTO> getOrderReturnApplyPaging(OrderReturnApplyPagingParam param){
+        Long userId = SessionContextHolder.getId();
+        Scope scope = com.chelvc.framework.common.util.StringUtils.ifEmpty(SessionContextHolder.getScope(), Scope::parse);
+        if (scope == Scope.ADMIN) {
+        }else {
+            List<Long> merchants = this.merchantService.getMerchantIdsByUserId(userId);
+            if (ObjectUtils.isEmpty(merchants)) {
+                return null;
+            }
+            param.setMerchantId(merchants.get(0));
+        }
+        Page<OmsOrderReturnApply> page = this.lambdaQuery()
+                .eq(StringUtils.notEmpty(param.getMerchantId()),OmsOrderReturnApply::getMerchantId,param.getMerchantId())
+                .orderByDesc(OmsOrderReturnApply::getCreateTime)
+                .orderByDesc(OmsOrderReturnApply::getReceiveTime)
+                .page(DatabaseContextHolder.page(param.getPaging()));
+        return DatabaseContextHolder.pagination(page, OrderReturnApplyCopier.INSTANCE::copying);
     }
 
     @Override
@@ -125,7 +164,7 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
 
     @Override
     public OmsOrderReturnApplyDTO getOrderReturnApplyInfo(Long id) {
-        OmsOrderReturnApply omsOrderReturnApply = omsOrderReturnApplyMapper.selectOmsOrderReturnApplyById(id);
+        OmsOrderReturnApply omsOrderReturnApply = this.getById(id);
         if (omsOrderReturnApply == null){
             return null;
         }

vehicle-server/src/main/resources/mapper/OmsOrderReturnApplyMapper.xml

@@ -3,178 +3,4 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chelvc.cloud.vehicle.server.dao.OmsOrderReturnApplyMapper">
-    
-    <resultMap type="com.chelvc.cloud.vehicle.server.entity.OmsOrderReturnApply" id="OmsOrderReturnApplyResult">
-        <result property="id"    column="id"    />
-        <result property="orderId"    column="order_id"    />
-        <result property="companyAddressId"    column="company_address_id"    />
-        <result property="productId"    column="product_id"    />
-        <result property="orderSn"    column="order_sn"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="memberUsername"    column="member_username"    />
-        <result property="returnAmount"    column="return_amount"    />
-        <result property="returnName"    column="return_name"    />
-        <result property="returnPhone"    column="return_phone"    />
-        <result property="status"    column="status"    />
-        <result property="handleTime"    column="handle_time"    />
-        <result property="productPic"    column="product_pic"    />
-        <result property="productName"    column="product_name"    />
-        <result property="productBrand"    column="product_brand"    />
-        <result property="productAttr"    column="product_attr"    />
-        <result property="productCount"    column="product_count"    />
-        <result property="productPrice"    column="product_price"    />
-        <result property="productRealPrice"    column="product_real_price"    />
-        <result property="reason"    column="reason"    />
-        <result property="description"    column="description"    />
-        <result property="proofPics"    column="proof_pics"    />
-        <result property="handleNote"    column="handle_note"    />
-        <result property="handleMan"    column="handle_man"    />
-        <result property="receiveMan"    column="receive_man"    />
-        <result property="receiveTime"    column="receive_time"    />
-        <result property="receiveNote"    column="receive_note"    />
-    </resultMap>
-
-    <sql id="selectOmsOrderReturnApplyVo">
-        select id, order_id, company_address_id, product_id, order_sn, create_time, member_username, return_amount, return_name, return_phone, status, handle_time, product_pic, product_name, product_brand, product_attr, product_count, product_price, product_real_price, reason, description, proof_pics, handle_note, handle_man, receive_man, receive_time, receive_note from oms_order_return_apply
-    </sql>
-
-    <select id="selectOmsOrderReturnApplyList" parameterType="com.chelvc.cloud.vehicle.server.entity.OmsOrderReturnApply" resultMap="OmsOrderReturnApplyResult">
-        <include refid="selectOmsOrderReturnApplyVo"/>
-        <where>  
-            <if test="orderId != null "> and order_id = #{orderId}</if>
-            <if test="companyAddressId != null "> and company_address_id = #{companyAddressId}</if>
-            <if test="productId != null "> and product_id = #{productId}</if>
-            <if test="orderSn != null  and orderSn != ''"> and order_sn = #{orderSn}</if>
-            <if test="memberUsername != null  and memberUsername != ''"> and member_username like concat('%', #{memberUsername}, '%')</if>
-            <if test="returnAmount != null "> and return_amount = #{returnAmount}</if>
-            <if test="returnName != null  and returnName != ''"> and return_name like concat('%', #{returnName}, '%')</if>
-            <if test="returnPhone != null  and returnPhone != ''"> and return_phone = #{returnPhone}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="handleTime != null "> and handle_time = #{handleTime}</if>
-            <if test="productPic != null  and productPic != ''"> and product_pic = #{productPic}</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="productBrand != null  and productBrand != ''"> and product_brand = #{productBrand}</if>
-            <if test="productAttr != null  and productAttr != ''"> and product_attr = #{productAttr}</if>
-            <if test="productCount != null "> and product_count = #{productCount}</if>
-            <if test="productPrice != null "> and product_price = #{productPrice}</if>
-            <if test="productRealPrice != null "> and product_real_price = #{productRealPrice}</if>
-            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
-            <if test="description != null  and description != ''"> and description = #{description}</if>
-            <if test="proofPics != null  and proofPics != ''"> and proof_pics = #{proofPics}</if>
-            <if test="handleNote != null  and handleNote != ''"> and handle_note = #{handleNote}</if>
-            <if test="handleMan != null  and handleMan != ''"> and handle_man = #{handleMan}</if>
-            <if test="receiveMan != null  and receiveMan != ''"> and receive_man = #{receiveMan}</if>
-            <if test="receiveTime != null "> and receive_time = #{receiveTime}</if>
-            <if test="receiveNote != null  and receiveNote != ''"> and receive_note = #{receiveNote}</if>
-        </where>
-    </select>
-    
-    <select id="selectOmsOrderReturnApplyById" parameterType="Long" resultMap="OmsOrderReturnApplyResult">
-        <include refid="selectOmsOrderReturnApplyVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertOmsOrderReturnApply" parameterType="com.chelvc.cloud.vehicle.server.entity.OmsOrderReturnApply" useGeneratedKeys="true" keyProperty="id">
-        insert into oms_order_return_apply
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="orderId != null">order_id,</if>
-            <if test="companyAddressId != null">company_address_id,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="orderSn != null">order_sn,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="memberUsername != null">member_username,</if>
-            <if test="returnAmount != null">return_amount,</if>
-            <if test="returnName != null">return_name,</if>
-            <if test="returnPhone != null">return_phone,</if>
-            <if test="status != null">status,</if>
-            <if test="handleTime != null">handle_time,</if>
-            <if test="productPic != null">product_pic,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="productBrand != null">product_brand,</if>
-            <if test="productAttr != null">product_attr,</if>
-            <if test="productCount != null">product_count,</if>
-            <if test="productPrice != null">product_price,</if>
-            <if test="productRealPrice != null">product_real_price,</if>
-            <if test="reason != null">reason,</if>
-            <if test="description != null">description,</if>
-            <if test="proofPics != null">proof_pics,</if>
-            <if test="handleNote != null">handle_note,</if>
-            <if test="handleMan != null">handle_man,</if>
-            <if test="receiveMan != null">receive_man,</if>
-            <if test="receiveTime != null">receive_time,</if>
-            <if test="receiveNote != null">receive_note,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="orderId != null">#{orderId},</if>
-            <if test="companyAddressId != null">#{companyAddressId},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="orderSn != null">#{orderSn},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="memberUsername != null">#{memberUsername},</if>
-            <if test="returnAmount != null">#{returnAmount},</if>
-            <if test="returnName != null">#{returnName},</if>
-            <if test="returnPhone != null">#{returnPhone},</if>
-            <if test="status != null">#{status},</if>
-            <if test="handleTime != null">#{handleTime},</if>
-            <if test="productPic != null">#{productPic},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="productBrand != null">#{productBrand},</if>
-            <if test="productAttr != null">#{productAttr},</if>
-            <if test="productCount != null">#{productCount},</if>
-            <if test="productPrice != null">#{productPrice},</if>
-            <if test="productRealPrice != null">#{productRealPrice},</if>
-            <if test="reason != null">#{reason},</if>
-            <if test="description != null">#{description},</if>
-            <if test="proofPics != null">#{proofPics},</if>
-            <if test="handleNote != null">#{handleNote},</if>
-            <if test="handleMan != null">#{handleMan},</if>
-            <if test="receiveMan != null">#{receiveMan},</if>
-            <if test="receiveTime != null">#{receiveTime},</if>
-            <if test="receiveNote != null">#{receiveNote},</if>
-         </trim>
-    </insert>
-
-    <update id="updateOmsOrderReturnApply" parameterType="com.chelvc.cloud.vehicle.server.entity.OmsOrderReturnApply">
-        update oms_order_return_apply
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="orderId != null">order_id = #{orderId},</if>
-            <if test="companyAddressId != null">company_address_id = #{companyAddressId},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="orderSn != null">order_sn = #{orderSn},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="memberUsername != null">member_username = #{memberUsername},</if>
-            <if test="returnAmount != null">return_amount = #{returnAmount},</if>
-            <if test="returnName != null">return_name = #{returnName},</if>
-            <if test="returnPhone != null">return_phone = #{returnPhone},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="handleTime != null">handle_time = #{handleTime},</if>
-            <if test="productPic != null">product_pic = #{productPic},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="productBrand != null">product_brand = #{productBrand},</if>
-            <if test="productAttr != null">product_attr = #{productAttr},</if>
-            <if test="productCount != null">product_count = #{productCount},</if>
-            <if test="productPrice != null">product_price = #{productPrice},</if>
-            <if test="productRealPrice != null">product_real_price = #{productRealPrice},</if>
-            <if test="reason != null">reason = #{reason},</if>
-            <if test="description != null">description = #{description},</if>
-            <if test="proofPics != null">proof_pics = #{proofPics},</if>
-            <if test="handleNote != null">handle_note = #{handleNote},</if>
-            <if test="handleMan != null">handle_man = #{handleMan},</if>
-            <if test="receiveMan != null">receive_man = #{receiveMan},</if>
-            <if test="receiveTime != null">receive_time = #{receiveTime},</if>
-            <if test="receiveNote != null">receive_note = #{receiveNote},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteOmsOrderReturnApplyById" parameterType="Long">
-        delete from oms_order_return_apply where id = #{id}
-    </delete>
-
-    <delete id="deleteOmsOrderReturnApplyByIds" parameterType="String">
-        delete from oms_order_return_apply where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
 </mapper>