运单明细详情

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/PageOwnerSettlementOwnerDetailVO.java

@@ -86,4 +86,7 @@ public class PageOwnerSettlementOwnerDetailVO {
     @ApiModelProperty(value="开票状态 0-否,1-是",example = "1")
     private Integer invoiceStatus;
 
+    @ApiModelProperty(value="创建时间",example = "2013-01-01 00:00:00")
+    private String createTime;
+
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDetailDaoImpl.java

 package com.clx.performance.dao.impl.settle;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.mapper.settle.SettlementOwnerDetailMapper;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
-import com.msl.common.base.Optional;
+import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -21,14 +19,8 @@ import org.springframework.stereotype.Repository;
 @Repository
 public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDetailMapper, SettlementOwnerDetail, Integer> implements SettlementOwnerDetailDao {
     @Override
-    public IPage<SettlementOwnerDetail> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param) {
-        LambdaQueryWrapper<SettlementOwnerDetail> queryWrapper = lQrWrapper()
-                .eq(SettlementOwnerDetail::getSettlementNo,param.getSettlementNo())
-                .eq(StringUtils.isNotBlank(param.getChildNo()),SettlementOwnerDetail::getChildNo, param.getChildNo())
-                .eq(StringUtils.isNotBlank(param.getOrderNo()),SettlementOwnerDetail::getOrderNo, param.getOrderNo())
-                .eq(StringUtils.isNotBlank(param.getSettlementSubNo()),SettlementOwnerDetail::getSettlementSubNo, param.getSettlementSubNo());
-        queryWrapper.orderByDesc(SettlementOwnerDetail::getId);
-        return Optional.ofNullable(super.page(Page.of(param.getPage(), param.getPageSize()), queryWrapper))
-                .orElse(Page.of(param.getPage(), param.getPageSize()));
+    public IPage<PageOwnerSettlementOwnerDetailVO> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param) {
+        Page<PageOwnerSettlementOwnerDetailVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageOwnerSettlementOrderDetailList(page,param);
     }
 }

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDetailDao.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.settle.SettlementOwnerDetailMapper;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
+import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
 import com.msl.common.dao.BaseDao;
 
 
@@ -15,6 +16,6 @@ import com.msl.common.dao.BaseDao;
  */
 public interface SettlementOwnerDetailDao extends BaseDao<SettlementOwnerDetailMapper, SettlementOwnerDetail, Integer> {
 
-    IPage<SettlementOwnerDetail> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param);
+    IPage<PageOwnerSettlementOwnerDetailVO> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param);
 
 }

performance-web/src/main/java/com/clx/performance/mapper/settle/SettlementOwnerDetailMapper.java

@@ -2,10 +2,21 @@ package com.clx.performance.mapper.settle;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
+import com.clx.performance.sqlProvider.settle.SettlementOwnerDetailSqlProvider;
+import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
 
 @Mapper
 public interface SettlementOwnerDetailMapper extends BaseMapper<SettlementOwnerDetail> {
 
+    @SelectProvider(type = SettlementOwnerDetailSqlProvider.class, method = "pageOwnerSettlementOrderDetailList")
+    IPage<PageOwnerSettlementOwnerDetailVO> pageOwnerSettlementOrderDetailList(@Param("page") Page<PageOwnerSettlementOwnerDetailVO> page,
+                                                                               @Param("param") PageOwnerSettlementOwnerDetailParam param);
+
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerDetailServiceImpl.java

@@ -2,10 +2,8 @@ package com.clx.performance.service.impl.settle;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
-import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
 import com.clx.performance.service.settle.SettlementOwnerDetailService;
-import com.clx.performance.struct.settle.SettlementOwnerDetailStruct;
 import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -23,13 +21,11 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
 
     private final SettlementOwnerDetailDao settlementOwnerDetailDao;
 
-    private final SettlementOwnerDetailStruct settlementOwnerDetailStruct;
 
     @Override
     public IPage<PageOwnerSettlementOwnerDetailVO> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param) {
 
-        IPage<SettlementOwnerDetail> settlementOwnerDetailIPage = settlementOwnerDetailDao.pageOwnerSettlementOrderDetailList(param);
-        return  settlementOwnerDetailStruct.convertPage(settlementOwnerDetailIPage);
+        return settlementOwnerDetailDao.pageOwnerSettlementOrderDetailList(param);
 
     }
 }

performance-web/src/main/java/com/clx/performance/sqlProvider/settle/SettlementOwnerDetailSqlProvider.java

+package com.clx.performance.sqlProvider.settle;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
+import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.jdbc.SQL;
+
+public class SettlementOwnerDetailSqlProvider {
+
+
+    public String pageOwnerSettlementOrderDetailList(@Param("page") Page<PageOwnerSettlementOwnerDetailVO> page, @Param("param") PageOwnerSettlementOwnerDetailParam param) {
+        return new SQL(){{
+            SELECT("owner_user_no,owner_name,settlement_no,settlement_sub_no," +
+                    "child_no,order_no,goods_name,freight_price,weight," +
+                    "freight,loss_price,loss_weight,loss_freight,prepay_freight," +
+                    "settlement_freight,invoice_freight,invoice_type,final_payment_status,invoice_status," +
+                    "date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime ");
+            FROM("settlement_owner_detail ");
+            WHERE("settlement_no = #{param.settlementNo}");
+            if (StringUtils.isNotBlank(param.getSettlementSubNo())) {WHERE("pay_time >= #{param.settlementSubNo}");}
+            if (StringUtils.isNotBlank(param.getOrderNo())) {WHERE("pay_time = #{param.orderNo}");}
+            if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
+            ORDER_BY("id desc");
+        }}.toString();
+    }
+
+
+
+
+
+}

performance-web/src/main/java/com/clx/performance/struct/settle/SettlementOwnerDetailStruct.java

 package com.clx.performance.struct.settle;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.model.settle.SettlementOwnerDetail;
-import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
 import com.msl.common.utils.DateStructUtil;
 import com.msl.common.utils.DateUtils;
 import org.mapstruct.Mapper;
@@ -10,7 +7,6 @@ import org.mapstruct.Mapper;
 @Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {DateUtils.class})
 public interface SettlementOwnerDetailStruct {
 
-    IPage<PageOwnerSettlementOwnerDetailVO> convertPage(IPage<SettlementOwnerDetail> page);
 
 
 }
\ No newline at end of file