Browse Source

售后管理

yzc 1 year ago
parent
commit
c459d6d2bf

+ 0 - 32
hx-sale/src/main/java/com/fjhx/sale/controller/after/AfterSalesController.java

@@ -32,36 +32,4 @@ public class AfterSalesController {
         afterSalesService.add(afterSalesDto);
     }
 
-    /**
-     * 售后管理编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody AfterSalesDto afterSalesDto) {
-        afterSalesService.edit(afterSalesDto);
-    }
-
-    /**
-     * 售后退货
-     */
-    @PostMapping("/salesReturn")
-    public void salesReturn(@RequestBody AfterSalesDto afterSalesDto) {
-        afterSalesService.salesReturn(afterSalesDto);
-    }
-
-    /**
-     * 售后换货
-     */
-    @PostMapping("/salesReplace")
-    public void salesReplace(@RequestBody AfterSalesDto afterSalesDto) {
-        afterSalesService.salesReplace(afterSalesDto);
-    }
-
-    /**
-     * 发起采购
-     */
-    @PostMapping("/initPurchase")
-    public void initPurchase(@RequestBody AfterSalesDto afterSalesDto) {
-        afterSalesService.initPurchase(afterSalesDto);
-    }
-
 }

+ 33 - 0
hx-sale/src/main/java/com/fjhx/sale/controller/after/AfterSalesDetailController.java

@@ -1,6 +1,7 @@
 package com.fjhx.sale.controller.after;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.after.dto.AfterSalesDetailDto;
 import com.fjhx.sale.entity.after.dto.AfterSalesDetailSelectDto;
 import com.fjhx.sale.entity.after.vo.AfterSalesDetailVo;
 import com.fjhx.sale.service.after.AfterSalesDetailService;
@@ -34,4 +35,36 @@ public class AfterSalesDetailController {
         return afterSalesDetailService.getPage(dto);
     }
 
+    /**
+     * 售后管理编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody AfterSalesDetailDto afterSalesDetailDto) {
+        afterSalesDetailService.edit(afterSalesDetailDto);
+    }
+
+    /**
+     * 售后退货
+     */
+    @PostMapping("/salesReturn")
+    public void salesReturn(@RequestBody AfterSalesDetailDto afterSalesDetailDto) {
+        afterSalesDetailService.salesReturn(afterSalesDetailDto);
+    }
+
+    /**
+     * 售后换货
+     */
+    @PostMapping("/salesReplace")
+    public void salesReplace(@RequestBody AfterSalesDetailDto afterSalesDetailDto) {
+        afterSalesDetailService.salesReplace(afterSalesDetailDto);
+    }
+
+    /**
+     * 发起采购
+     */
+    @PostMapping("/initPurchase")
+    public void initPurchase(@RequestBody AfterSalesDetailDto afterSalesDetailDto) {
+        afterSalesDetailService.initPurchase(afterSalesDetailDto);
+    }
+
 }

+ 5 - 0
hx-sale/src/main/java/com/fjhx/sale/entity/after/dto/AfterSalesRecordSelectDto.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class AfterSalesRecordSelectDto extends BaseSelectDto {
 
+    /**
+     * 售后明细id
+     */
+    private Long afterSalesDetailId;
+
 }

+ 5 - 0
hx-sale/src/main/java/com/fjhx/sale/entity/after/po/AfterSalesDetail.java

@@ -55,4 +55,9 @@ public class AfterSalesDetail extends BasePo {
      */
     private BigDecimal amount;
 
+    /**
+     * 售后状态
+     */
+    private Integer status;
+
 }

+ 5 - 3
hx-sale/src/main/java/com/fjhx/sale/entity/after/po/AfterSalesRecords.java

@@ -5,6 +5,8 @@ import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * <p>
  * 售后跟进记录
@@ -19,14 +21,14 @@ import lombok.Setter;
 public class AfterSalesRecords extends BasePo {
 
     /**
-     * 售后id
+     * 售后明细id
      */
-    private Long afterSalesId;
+    private Long afterSalesDetailId;
 
     /**
      * 销售合同id
      */
-    private Long followUpTime;
+    private Date followUpTime;
 
     /**
      * 跟进用户id

+ 0 - 4
hx-sale/src/main/java/com/fjhx/sale/entity/after/vo/AfterSalesDetailVo.java

@@ -34,10 +34,6 @@ public class AfterSalesDetailVo extends AfterSalesDetail {
      * 售后类型
      */
     private String type;
-    /**
-     * 售后状态
-     */
-    private Integer status;
 
     /**
      * 产品编码

+ 21 - 0
hx-sale/src/main/java/com/fjhx/sale/service/after/AfterSalesDetailService.java

@@ -1,6 +1,7 @@
 package com.fjhx.sale.service.after;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.after.dto.AfterSalesDetailDto;
 import com.fjhx.sale.entity.after.dto.AfterSalesDetailSelectDto;
 import com.fjhx.sale.entity.after.po.AfterSalesDetail;
 import com.fjhx.sale.entity.after.vo.AfterSalesDetailVo;
@@ -22,4 +23,24 @@ public interface AfterSalesDetailService extends BaseService<AfterSalesDetail> {
      */
     Page<AfterSalesDetailVo> getPage(AfterSalesDetailSelectDto dto);
 
+    /**
+     * 售后管理编辑
+     */
+    void edit(AfterSalesDetailDto afterSalesDetailDto);
+
+    /**
+     * 售后退货
+     */
+    void salesReturn(AfterSalesDetailDto afterSalesDetailDto);
+
+    /**
+     * 售后换货
+     */
+    void salesReplace(AfterSalesDetailDto afterSalesDetailDto);
+
+    /**
+     * 销售发起采购
+     */
+    void initPurchase(AfterSalesDetailDto afterSalesDetailDto);
+
 }

+ 0 - 19
hx-sale/src/main/java/com/fjhx/sale/service/after/AfterSalesService.java

@@ -20,23 +20,4 @@ public interface AfterSalesService extends BaseService<AfterSales> {
      */
     void add(AfterSalesDto afterSalesDto);
 
-    /**
-     * 售后管理编辑
-     */
-    void edit(AfterSalesDto afterSalesDto);
-
-    /**
-     * 售后退货
-     */
-    void salesReturn(AfterSalesDto afterSalesDto);
-
-    /**
-     * 售后换货
-     */
-    void salesReplace(AfterSalesDto afterSalesDto);
-
-    /**
-     * 销售发起采购
-     */
-    void initPurchase(AfterSalesDto afterSalesDto);
 }

+ 115 - 0
hx-sale/src/main/java/com/fjhx/sale/service/after/impl/AfterSalesDetailServiceImpl.java

@@ -1,20 +1,33 @@
 package com.fjhx.sale.service.after.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.utils.Assert;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.sale.entity.after.dto.AfterSalesDetailDto;
 import com.fjhx.sale.entity.after.dto.AfterSalesDetailSelectDto;
+import com.fjhx.sale.entity.after.po.AfterSales;
 import com.fjhx.sale.entity.after.po.AfterSalesDetail;
 import com.fjhx.sale.entity.after.vo.AfterSalesDetailVo;
+import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.mapper.after.AfterSalesDetailMapper;
 import com.fjhx.sale.service.after.AfterSalesDetailService;
+import com.fjhx.sale.service.after.AfterSalesService;
+import com.fjhx.sale.service.contract.ContractProductService;
 import com.fjhx.sale.service.contract.ContractService;
+import com.fjhx.wms.entity.stock.emums.StockWaitType;
+import com.fjhx.wms.entity.stock.po.StockWait;
+import com.fjhx.wms.entity.stock.po.StockWaitDetails;
+import com.fjhx.wms.service.stock.StockWaitDetailsService;
+import com.fjhx.wms.service.stock.StockWaitService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -36,6 +49,14 @@ public class AfterSalesDetailServiceImpl extends ServiceImpl<AfterSalesDetailMap
     private ContractService contractService;
     @Autowired
     private ProductInfoService productInfoService;
+    @Autowired
+    private StockWaitService stockWaitService;
+    @Autowired
+    private StockWaitDetailsService stockWaitDetailsService;
+    @Autowired
+    private ContractProductService contractProductService;
+    @Autowired
+    private AfterSalesService afterSalesService;
 
     @Override
     public Page<AfterSalesDetailVo> getPage(AfterSalesDetailSelectDto dto) {
@@ -78,4 +99,98 @@ public class AfterSalesDetailServiceImpl extends ServiceImpl<AfterSalesDetailMap
         return page;
     }
 
+    @Override
+    public void edit(AfterSalesDetailDto afterSalesDetailSelectDto) {
+        this.updateById(afterSalesDetailSelectDto);
+    }
+
+    /**
+     * 退货
+     */
+    @DSTransactional
+    @Override
+    public void salesReturn(AfterSalesDetailDto afterSalesDetailDto) {
+        Assert.notEmpty(afterSalesDetailDto.getId(), "售后id不能为空");
+        AfterSalesDetail afterSalesDetail = this.getById(afterSalesDetailDto.getId());
+        Assert.notEmpty(afterSalesDetail, "查询不到售后信息");
+
+        //生成售后退货待入库信息
+        StockWait stockWait = new StockWait();
+        stockWait.setType(1);//入库
+        stockWait.setStatus(0);//待入库
+        stockWait.setBusinessType(StockWaitType.SALES_RETURN_IN.getDetailType());
+        stockWait.setBusinessId(afterSalesDetail.getId());
+        stockWaitService.save(stockWait);
+
+        //生成售后退货待入库明细
+        StockWaitDetails stockWaitDetails = new StockWaitDetails();
+        stockWaitDetails.setStockWaitId(stockWait.getId());
+        stockWaitDetails.setProductId(afterSalesDetail.getProductId());
+        stockWaitDetails.setQuantity(afterSalesDetail.getQuantity());
+        stockWaitDetailsService.save(stockWaitDetails);
+    }
+
+    /**
+     * 销售换货
+     */
+    @DSTransactional
+    @Override
+    public void salesReplace(AfterSalesDetailDto afterSalesDetailDto) {
+        Assert.notEmpty(afterSalesDetailDto.getId(), "售后id不能为空");
+        AfterSalesDetail afterSalesDetail = this.getById(afterSalesDetailDto.getId());
+        Assert.notEmpty(afterSalesDetail, "查询不到售后信息");
+
+        //生成售后换货待入库信息
+        StockWait stockWait = new StockWait();
+        stockWait.setType(1);//入库
+        stockWait.setStatus(0);//待入库
+        stockWait.setBusinessType(StockWaitType.SALES_REPLACE_IN.getDetailType());
+        stockWait.setBusinessId(afterSalesDetailDto.getId());
+        stockWaitService.save(stockWait);
+        //生成售后换货待出库信息
+        StockWait stockWait1 = new StockWait();
+        stockWait1.setType(2);//出库
+        stockWait1.setStatus(0);//待出库
+        stockWait1.setBusinessType(StockWaitType.SALES_REPLACE_OUT.getDetailType());
+        stockWait1.setBusinessId(afterSalesDetailDto.getId());
+        stockWaitService.save(stockWait1);
+
+        //生成售后换货待出入库明细
+        //生成入库明细
+        StockWaitDetails stockWaitDetails = new StockWaitDetails();
+        stockWaitDetails.setStockWaitId(stockWait.getId());
+        stockWaitDetails.setProductId(afterSalesDetail.getProductId());
+        stockWaitDetails.setQuantity(afterSalesDetail.getQuantity());
+        stockWaitDetailsService.save(stockWaitDetails);
+        //生成出库明细
+        StockWaitDetails stockWaitDetails1 = new StockWaitDetails();
+        stockWaitDetails1.setStockWaitId(stockWait1.getId());
+        stockWaitDetails1.setProductId(afterSalesDetail.getProductId());
+        stockWaitDetails1.setQuantity(afterSalesDetail.getQuantity());
+        stockWaitDetailsService.save(stockWaitDetails1);
+    }
+
+    /**
+     * 发起采购
+     */
+    @Override
+    @Transactional
+    public void initPurchase(AfterSalesDetailDto afterSalesDetailDto) {
+        Assert.notEmpty(afterSalesDetailDto.getId(), "售后id不能为空");
+        AfterSalesDetail afterSalesDetail = this.getById(afterSalesDetailDto.getId());
+        Assert.notEmpty(afterSalesDetail, "查询不到售后信息");
+        AfterSales afterSales = afterSalesService.getById(afterSalesDetail.getAfterSalesId());
+
+        //创建交接单
+        ContractProduct contractProduct = new ContractProduct();
+        contractProduct.setProductId(afterSalesDetail.getProductId());
+        contractProduct.setQuantity(afterSalesDetail.getQuantity());
+        contractProduct.setExpendQuantity(afterSalesDetail.getQuantity());
+        contractProduct.setContractId(afterSales.getContractId());
+        contractProduct.setPrice(afterSalesDetail.getPrice());
+        contractProduct.setAmount(afterSalesDetail.getAmount());
+        contractProduct.setRemark(afterSalesDetail.getRemark());
+        contractProductService.save(contractProduct);
+    }
+
 }

+ 4 - 0
hx-sale/src/main/java/com/fjhx/sale/service/after/impl/AfterSalesRecordsServicesImpl.java

@@ -3,6 +3,7 @@ package com.fjhx.sale.service.after.impl;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.utils.Assert;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.sale.entity.after.dto.AfterSalesRecordSelectDto;
 import com.fjhx.sale.entity.after.dto.AfterSalesRecordsDto;
@@ -31,6 +32,9 @@ public class AfterSalesRecordsServicesImpl extends ServiceImpl<AfterSalesRecords
     @Override
     public Page<AfterSalesRecordsVo> getPage(AfterSalesRecordSelectDto dto) {
         IWrapper<AfterSalesRecords> wrapper = getWrapper();
+        Long afterSalesDetailId = dto.getAfterSalesDetailId();
+        Assert.notEmpty(afterSalesDetailId, "售后明细id不能为空");
+        wrapper.eq(AfterSalesRecordsVo::getAfterSalesDetailId, afterSalesDetailId);
         wrapper.orderByDesc("asr", AfterSalesRecords::getFollowUpTime);
         Page<AfterSalesRecordsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<AfterSalesRecordsVo> records = page.getRecords();

+ 1 - 121
hx-sale/src/main/java/com/fjhx/sale/service/after/impl/AfterSalesServiceImpl.java

@@ -3,7 +3,6 @@ package com.fjhx.sale.service.after.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.common.utils.Assert;
 import com.fjhx.sale.entity.after.dto.AfterSalesDto;
 import com.fjhx.sale.entity.after.po.AfterSales;
 import com.fjhx.sale.entity.after.po.AfterSalesDetail;
@@ -12,17 +11,10 @@ import com.fjhx.sale.mapper.after.AfterSalesMapper;
 import com.fjhx.sale.service.after.AfterSalesDetailService;
 import com.fjhx.sale.service.after.AfterSalesService;
 import com.fjhx.sale.service.contract.ContractProductService;
-import com.fjhx.wms.entity.stock.emums.StockWaitType;
-import com.fjhx.wms.entity.stock.po.StockWait;
-import com.fjhx.wms.entity.stock.po.StockWaitDetails;
-import com.fjhx.wms.service.stock.StockWaitDetailsService;
-import com.fjhx.wms.service.stock.StockWaitService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,10 +33,7 @@ import java.util.stream.Collectors;
 public class AfterSalesServiceImpl extends ServiceImpl<AfterSalesMapper, AfterSales> implements AfterSalesService {
     @Autowired
     private AfterSalesDetailService afterSalesDetailService;
-    @Autowired
-    private StockWaitService stockWaitService;
-    @Autowired
-    private StockWaitDetailsService stockWaitDetailsService;
+
     @Autowired
     private ContractProductService contractProductService;
 
@@ -72,113 +61,4 @@ public class AfterSalesServiceImpl extends ServiceImpl<AfterSalesMapper, AfterSa
         afterSalesDetailService.saveBatch(afterSalesDetailList);
     }
 
-    @Override
-    public void edit(AfterSalesDto afterSalesDto) {
-        this.updateById(afterSalesDto);
-    }
-
-    /**
-     * 退货
-     */
-    @DSTransactional
-    @Override
-    public void salesReturn(AfterSalesDto afterSalesDto) {
-        Assert.notEmpty(afterSalesDto.getId(), "售后id不能为空");
-        AfterSales afterSales = this.getById(afterSalesDto.getId());
-        Assert.notEmpty(afterSales, "查询不到售后信息");
-
-        //生成售后退货待入库信息
-        StockWait stockWait = new StockWait();
-        stockWait.setType(1);//入库
-        stockWait.setStatus(0);//待入库
-        stockWait.setBusinessType(StockWaitType.SALES_RETURN_IN.getDetailType());
-        stockWait.setBusinessId(afterSales.getId());
-        stockWaitService.save(stockWait);
-
-        //生成售后退货待入库明细
-        List<AfterSalesDetail> afterSalesDetailList = afterSalesDetailService.list(q -> q.eq(AfterSalesDetail::getAfterSalesId, afterSales.getId()));
-        List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
-        for (AfterSalesDetail afterSalesDetail : afterSalesDetailList) {
-            StockWaitDetails stockWaitDetails = new StockWaitDetails();
-            stockWaitDetails.setStockWaitId(stockWait.getId());
-            stockWaitDetails.setProductId(afterSalesDetail.getProductId());
-            stockWaitDetails.setQuantity(afterSalesDetail.getQuantity());
-            stockWaitDetailsList.add(stockWaitDetails);
-        }
-        stockWaitDetailsService.saveBatch(stockWaitDetailsList);
-    }
-
-    /**
-     * 销售换货
-     */
-    @DSTransactional
-    @Override
-    public void salesReplace(AfterSalesDto afterSalesDto) {
-        Assert.notEmpty(afterSalesDto.getId(), "售后id不能为空");
-        AfterSales afterSales = this.getById(afterSalesDto.getId());
-        Assert.notEmpty(afterSales, "查询不到售后信息");
-
-        //生成售后换货待入库信息
-        StockWait stockWait = new StockWait();
-        stockWait.setType(1);//入库
-        stockWait.setStatus(0);//待入库
-        stockWait.setBusinessType(StockWaitType.SALES_REPLACE_IN.getDetailType());
-        stockWait.setBusinessId(afterSales.getId());
-        stockWaitService.save(stockWait);
-        //生成售后换货待出库信息
-        StockWait stockWait1 = new StockWait();
-        stockWait1.setType(2);//出库
-        stockWait1.setStatus(0);//待出库
-        stockWait1.setBusinessType(StockWaitType.SALES_REPLACE_OUT.getDetailType());
-        stockWait1.setBusinessId(afterSales.getId());
-        stockWaitService.save(stockWait1);
-
-        //生成售后换货待出入库明细
-        List<AfterSalesDetail> afterSalesDetailList = afterSalesDetailService.list(q -> q.eq(AfterSalesDetail::getAfterSalesId, afterSales.getId()));
-        List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
-        List<StockWaitDetails> stockWaitDetailsList1 = new ArrayList<>();
-        for (AfterSalesDetail afterSalesDetail : afterSalesDetailList) {
-            //生成入库明细
-            StockWaitDetails stockWaitDetails = new StockWaitDetails();
-            stockWaitDetails.setStockWaitId(stockWait.getId());
-            stockWaitDetails.setProductId(afterSalesDetail.getProductId());
-            stockWaitDetails.setQuantity(afterSalesDetail.getQuantity());
-            stockWaitDetailsList.add(stockWaitDetails);
-            //生成出库明细
-            StockWaitDetails stockWaitDetails1 = new StockWaitDetails();
-            stockWaitDetails.setStockWaitId(stockWait1.getId());
-            stockWaitDetails.setProductId(afterSalesDetail.getProductId());
-            stockWaitDetails.setQuantity(afterSalesDetail.getQuantity());
-            stockWaitDetailsList1.add(stockWaitDetails1);
-        }
-        stockWaitDetailsService.saveBatch(stockWaitDetailsList);
-        stockWaitDetailsService.saveBatch(stockWaitDetailsList1);
-    }
-
-    /**
-     * 发起采购
-     */
-    @Override
-    @Transactional
-    public void initPurchase(AfterSalesDto afterSalesDto) {
-        Assert.notEmpty(afterSalesDto.getId(), "售后id不能为空");
-        AfterSales afterSales = this.getById(afterSalesDto.getId());
-        Assert.notEmpty(afterSales, "查询不到售后信息");
-        List<AfterSalesDetail> afterSalesDetailList = afterSalesDetailService.list(q -> q.eq(AfterSalesDetail::getAfterSalesId, afterSales.getId()));
-        //创建交接单
-        List<ContractProduct> newContractProductList = new ArrayList<>();
-        for (AfterSalesDetail afterSalesDetail : afterSalesDetailList) {
-            ContractProduct contractProduct = new ContractProduct();
-            contractProduct.setProductId(afterSalesDetail.getProductId());
-            contractProduct.setQuantity(afterSalesDetail.getQuantity());
-            contractProduct.setExpendQuantity(afterSalesDetail.getQuantity());
-            contractProduct.setContractId(afterSales.getContractId());
-            contractProduct.setPrice(afterSalesDetail.getPrice());
-            contractProduct.setAmount(afterSalesDetail.getAmount());
-            contractProduct.setRemark(afterSalesDetail.getRemark());
-            newContractProductList.add(contractProduct);
-        }
-        contractProductService.saveBatch(newContractProductList);
-    }
-
 }

+ 6 - 6
hx-sale/src/main/resources/mapper/after/AfterSalesDetailMapper.xml

@@ -6,15 +6,15 @@
                asd.after_sales_id,
                asd.product_id,
                asd.quantity,
+               asd.`status`,
+               asd.create_user,
+               asd.create_time,
+               asd.update_user,
+               asd.update_time,
                as1.customer_id,
                as1.contract_id,
                as1.type,
-               as1.`status`,
-               as1.remark,
-               as1.create_user,
-               as1.create_time,
-               as1.update_user,
-               as1.update_time
+               as1.remark
         FROM after_sales_detail asd
                  LEFT JOIN after_sales as1 ON asd.after_sales_id = as1.id
             ${ew.customSqlSegment}

+ 2 - 2
hx-sale/src/main/resources/mapper/after/AfterSalesRecordsMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.fjhx.sale.mapper.after.AfterSalesRecordsMapper">
     <select id="getPage" resultType="com.fjhx.sale.entity.after.vo.AfterSalesRecordsVo">
         select asr.id,
-               asr.after_sales_id,
+               asr.after_sales_detail_id,
                asr.follow_up_time,
                asr.follow_up_user_id,
                asr.remark,
@@ -11,7 +11,7 @@
                asr.create_time,
                asr.update_user,
                asr.update_time
-        from after_sales_record asr
+        from after_sales_records asr
             ${ew.customSqlSegment}
     </select>