Merge remote-tracking branch 'origin/dev' into dev

hx-purchase/src/main/java/com/fjhx/purchase/entity/sales/vo/SalesReturnDetailVo.java

@@ -58,4 +58,14 @@ public class SalesReturnDetailVo extends SalesReturnDetail {
      * 货品规格型号
      */
     private String productSpec;
+
+    /**
+     * 退款状态
+     */
+    private Integer refundStatus;
+
+    /**
+     * 操作人
+     */
+    private String opUserName;
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/sales/impl/SalesReturnDetailServiceImpl.java

@@ -1,30 +1,28 @@
 package com.fjhx.purchase.service.sales.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 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.fjhx.common.constant.SourceConstant;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.purchase.entity.arrival.vo.ArrivalDetailVo;
-import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
+import com.fjhx.purchase.entity.sales.dto.SalesReturnDetailDto;
+import com.fjhx.purchase.entity.sales.dto.SalesReturnDetailSelectDto;
 import com.fjhx.purchase.entity.sales.po.SalesReturnDetail;
+import com.fjhx.purchase.entity.sales.vo.SalesReturnDetailVo;
 import com.fjhx.purchase.mapper.sales.SalesReturnDetailMapper;
 import com.fjhx.purchase.service.sales.SalesReturnDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.supply.entity.supplier.po.SupplierInfo;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.utils.UserUtil;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.sales.vo.SalesReturnDetailVo;
-import com.fjhx.purchase.entity.sales.dto.SalesReturnDetailSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.purchase.entity.sales.dto.SalesReturnDetailDto;
-import cn.hutool.core.bean.BeanUtil;
 
 import java.util.List;
 import java.util.Map;
@@ -88,6 +86,8 @@ public class SalesReturnDetailServiceImpl extends ServiceImpl<SalesReturnDetailM
                 }
             }
         }
+        //赋值操作人
+        UserUtil.assignmentNickName(list, SalesReturnDetailVo::getUpdateUser, SalesReturnDetailVo::setOpUserName);
         return page;
     }
 

hx-purchase/src/main/resources/mapper/sales/SalesReturnDetailMapper.xml

@@ -2,13 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.purchase.mapper.sales.SalesReturnDetailMapper">
     <select id="getPage" resultType="com.fjhx.purchase.entity.sales.vo.SalesReturnDetailVo">
-        SELECT
-            t1.*,
-            t2.`code`,
-            t2.supply_id
-        FROM
-            sales_return_detail t1
-        LEFT JOIN sales_return t2 ON t1.sales_return_id = t2.id
+        SELECT t1.*,
+               t2.`code`,
+               t2.supply_id,
+               IF(r.refund_status IS NULL, 0, r.refund_status) refundStatus
+        FROM sales_return_detail t1
+                 LEFT JOIN sales_return t2 ON t1.sales_return_id = t2.id
+                 LEFT JOIN refund_detail rd ON rd.sales_return_id = t2.id
+                 LEFT JOIN refund r ON rd.refund_id = r.id
             ${ew.customSqlSegment}
     </select>