优化分账明细业务

fs-admin/src/main/java/com/fs/his/controller/FsShareAmountDetailController.java

@@ -1,6 +1,9 @@
 package com.fs.his.controller;
 
 import java.util.List;
+
+import com.fs.his.param.FsShareAmountDetailParam;
+import com.fs.his.vo.FsShareAmountDetailVO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,10 +41,10 @@ public class FsShareAmountDetailController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('his:detail:list')")
     @GetMapping("/list")
-    public TableDataInfo list(FsShareAmountDetail fsShareAmountDetail)
+    public TableDataInfo list(FsShareAmountDetailParam fsShareAmountDetail)
     {
         startPage();
-        List<FsShareAmountDetail> list = fsShareAmountDetailService.selectFsShareAmountDetailList(fsShareAmountDetail);
+        List<FsShareAmountDetailVO> list = fsShareAmountDetailService.selectFsShareAmountDetailList(fsShareAmountDetail);
         return getDataTable(list);
     }
 
@@ -51,10 +54,10 @@ public class FsShareAmountDetailController extends BaseController
     @PreAuthorize("@ss.hasPermi('his:detail:export')")
     @Log(title = "分账明细", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(FsShareAmountDetail fsShareAmountDetail)
+    public AjaxResult export(FsShareAmountDetailParam fsShareAmountDetail)
     {
-        List<FsShareAmountDetail> list = fsShareAmountDetailService.selectFsShareAmountDetailList(fsShareAmountDetail);
-        ExcelUtil<FsShareAmountDetail> util = new ExcelUtil<FsShareAmountDetail>(FsShareAmountDetail.class);
+        List<FsShareAmountDetailVO> list = fsShareAmountDetailService.selectFsShareAmountDetailList(fsShareAmountDetail);
+        ExcelUtil<FsShareAmountDetailVO> util = new ExcelUtil<FsShareAmountDetailVO>(FsShareAmountDetailVO.class);
         return util.exportExcel(list, "分账明细数据");
     }
 

fs-service/src/main/java/com/fs/his/mapper/FsShareAmountDetailMapper.java

@@ -3,6 +3,9 @@ package com.fs.his.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.his.domain.FsShareAmountDetail;
+import com.fs.his.param.FsShareAmountDetailParam;
+import com.fs.his.vo.FsShareAmountDetailVO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 分账明细Mapper接口
@@ -25,7 +28,7 @@ public interface FsShareAmountDetailMapper extends BaseMapper<FsShareAmountDetai
      * @param fsShareAmountDetail 分账明细
      * @return 分账明细集合
      */
-    List<FsShareAmountDetail> selectFsShareAmountDetailList(FsShareAmountDetail fsShareAmountDetail);
+    List<FsShareAmountDetailVO> selectFsShareAmountDetailList(@Param("maps") FsShareAmountDetailParam fsShareAmountDetail);
 
     /**
      * 新增分账明细

fs-service/src/main/java/com/fs/his/param/FsShareAmountDetailParam.java

@@ -0,0 +1,15 @@
+package com.fs.his.param;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class FsShareAmountDetailParam {
+    private String orderCode;
+    private Integer type;
+    private String merchantName;
+    private String merchantAccount;
+    private Date startTime;
+    private Date endTime;
+}

fs-service/src/main/java/com/fs/his/service/IFsShareAmountDetailService.java

@@ -3,6 +3,8 @@ package com.fs.his.service;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.his.domain.FsShareAmountDetail;
+import com.fs.his.param.FsShareAmountDetailParam;
+import com.fs.his.vo.FsShareAmountDetailVO;
 
 /**
  * 分账明细Service接口
@@ -25,7 +27,7 @@ public interface IFsShareAmountDetailService extends IService<FsShareAmountDetai
      * @param fsShareAmountDetail 分账明细
      * @return 分账明细集合
      */
-    List<FsShareAmountDetail> selectFsShareAmountDetailList(FsShareAmountDetail fsShareAmountDetail);
+    List<FsShareAmountDetailVO> selectFsShareAmountDetailList(FsShareAmountDetailParam fsShareAmountDetail);
 
     /**
      * 新增分账明细

fs-service/src/main/java/com/fs/his/service/impl/FsShareAmountDetailServiceImpl.java

@@ -3,6 +3,8 @@ package com.fs.his.service.impl;
 import java.util.List;
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fs.his.param.FsShareAmountDetailParam;
+import com.fs.his.vo.FsShareAmountDetailVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fs.his.mapper.FsShareAmountDetailMapper;
@@ -37,7 +39,7 @@ public class FsShareAmountDetailServiceImpl extends ServiceImpl<FsShareAmountDet
      * @return 分账明细
      */
     @Override
-    public List<FsShareAmountDetail> selectFsShareAmountDetailList(FsShareAmountDetail fsShareAmountDetail)
+    public List<FsShareAmountDetailVO> selectFsShareAmountDetailList(FsShareAmountDetailParam fsShareAmountDetail)
     {
         return baseMapper.selectFsShareAmountDetailList(fsShareAmountDetail);
     }

fs-service/src/main/java/com/fs/his/vo/FsShareAmountDetailVO.java

@@ -0,0 +1,35 @@
+package com.fs.his.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fs.common.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class FsShareAmountDetailVO {
+
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderCode;
+
+    /** 商户id */
+    @Excel(name = "分账商户名称")
+    private String merchantName;
+
+    @Excel(name = "分账商户号")
+    private String merchantAccount;
+
+    /** 分账金额 */
+    @Excel(name = "分账金额")
+    private BigDecimal shareAmount;
+
+    @Excel(name = "分账类型",readConverterExp = "1=聚水潭,2=兔灵")
+    private Integer type;
+
+    @Excel(name = "分账时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+}

fs-service/src/main/resources/mapper/his/FsShareAmountDetailMapper.xml

@@ -18,13 +18,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, order_id, order_code, merchant_id, share_amount, create_time, update_time from fs_share_amount_detail
     </sql>
 
-    <select id="selectFsShareAmountDetailList" parameterType="FsShareAmountDetail" resultMap="FsShareAmountDetailResult">
-        <include refid="selectFsShareAmountDetailVo"/>
-        <where>  
-            <if test="orderId != null "> and order_id = #{orderId}</if>
-            <if test="orderCode != null  and orderCode != ''"> and order_code = #{orderCode}</if>
-            <if test="merchantId != null "> and merchant_id = #{merchantId}</if>
-            <if test="shareAmount != null "> and share_amount = #{shareAmount}</if>
+    <select id="selectFsShareAmountDetailList"  resultType="com.fs.his.vo.FsShareAmountDetailVO">
+        select d.order_code, d.share_amount, d.create_time, m.merchant_name,m.merchant_account,m.type from fs_share_amount_detail d LEFT JOIN fs_amounts_share_merchant m ON d.merchant_id = m.id
+        <where>
+            <if test="maps.orderCode != null  and maps.orderCode != ''"> and d.order_code = #{maps.orderCode}</if>
+            <if test="maps.merchantAccount != null  and maps.merchantAccount != ''"> and m.merchant_account = #{maps.merchantAccount}</if>
+            <if test="maps.type != null "> and m.type = #{maps.type} </if>
+            <if test="maps.merchantName != null and maps.merchantName "> and m.merchant_name like concat('%', #{maps.merchantName}, '%') </if>
+            <if test="maps.startTime != null">
+                and DATE(d.create_time) &gt;= DATE(#{maps.startTime})
+            </if>
+            <if test="maps.endTime != null">
+                and DATE(d.create_time) &lt;= DATE(#{maps.endTime})
+            </if>
         </where>
     </select>