Merge branch 'v9.1_ownerAppInterface_20231221' into test

performance-api/src/main/java/com/clx/performance/param/app/owner/PageOwnerOrderChildListParam.java

+package com.clx.performance.param.app.owner;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @ClassName PageOwnerOrderChildListParam
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/22 15:02
+ * @Version 1.0
+ */
+
+@Getter
+@Setter
+public class PageOwnerOrderChildListParam extends PageParam {
+
+    @ApiModelProperty("运单编号/车牌号/订单编号")
+    private String searchNo;
+
+    @ApiModelProperty("运单状态集合")
+    private List<Integer> status;
+    @ApiModelProperty("开始时间")
+    private String beginTime;
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+    @ApiModelProperty("货主编码")
+    @JsonIgnore
+    private Long ownerUserNo;
+}

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -190,4 +190,20 @@ public class OrderChildVO {
     private BigDecimal lossAmount;
 
 
+
+    //结算信息
+    @ApiModelProperty(value = "实际运费", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal realFreight;
+    @ApiModelProperty(value = "货损金额", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal lossFreight;
+    @ApiModelProperty(value = "预付运费金额", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal prepayFreight;
+    @ApiModelProperty(value = "结算金额", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal settlementFreight;
+
+
 }
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/app/owner/OwnerOrderChildVO.java

+package com.clx.performance.vo.app.owner;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @ClassName OwnerOrderChildVO
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/22 15:00
+ * @Version 1.0
+ */
+
+@ApiModel(description = "货主运单")
+@Getter
+@Setter
+public class OwnerOrderChildVO {
+
+    @ApiModelProperty("id")
+    private Integer id;                             //id
+    @ApiModelProperty("运单编号")
+    private String childNo;                         //运单编号
+    @ApiModelProperty("货单编号")
+    private String orderGoodsNo;                    //货单编号
+    @ApiModelProperty("订单编号")
+    private String orderNo;                         //订单编号
+    @ApiModelProperty("货物名称")
+    private String goodsName;                       //货物名称
+    @ApiModelProperty("车牌号")
+    private String truckNo;                         //车牌号
+    @ApiModelProperty("状态")
+    private Integer status;                         //状态
+    @ApiModelProperty("状态描述")
+    private String statusMsg;                         //状态
+    @ApiModelProperty("发货地址")
+    private String sendAddress;                     //发货地址
+    @ApiModelProperty("收货地址")
+    private String receiveAddress;                  //收货地址
+
+
+
+
+}

performance-web/src/main/java/com/clx/performance/controller/app/owner/AppOwnerOrderChildController.java

+package com.clx.performance.controller.app.owner;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.owner.PageOwnerOrderChildListParam;
+import com.clx.performance.service.OrderChildService;
+import com.clx.performance.vo.app.owner.OwnerOrderChildVO;
+import com.msl.common.base.PageData;
+import com.msl.common.result.Result;
+import com.msl.user.utils.TokenUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ClassName AppOwnerOrderChildController
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/22 14:51
+ * @Version 1.0
+ */
+
+@Slf4j
+@RestController
+@RequestMapping(value="/app/owner/orderChild")
+@Validated
+@Api(tags = "APP-货主运单")
+@AllArgsConstructor
+public class AppOwnerOrderChildController {
+
+    @Autowired
+    OrderChildService orderChildService;
+
+    @ApiOperation(value = "运单列表", notes = "<br>By:刘海泉")
+    @PostMapping("/pageOwnerOrderChildList")
+    public Result<PageData<OwnerOrderChildVO>> pageOwnerOrderChildList(@RequestBody @Validated PageOwnerOrderChildListParam param) {
+        param.setOwnerUserNo(TokenUtil.getLoginUserInfo().getUserNo());
+        IPage<OwnerOrderChildVO> page  = orderChildService.pageOwnerOrderChildList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -6,6 +6,7 @@ import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.param.app.PageOrderChildOfDriverParam;
 import com.clx.performance.param.app.PageOrderChildOfDriverSearchParam;
+import com.clx.performance.param.app.owner.PageOwnerOrderChildListParam;
 import com.clx.performance.param.pc.*;
 import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
@@ -163,4 +164,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     List<OrderChild> selectListWithEmptyCarList();
 
     Page<OrderChild> getMonthAgoByUserNo(Long userNo, LocalDateTime monthAgo, PageParam param);
+
+    IPage<OrderChild> pageOwnerOrderChildList(PageOwnerOrderChildListParam param);
 }

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

@@ -11,6 +11,7 @@ import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.param.app.PageOrderChildOfDriverParam;
 import com.clx.performance.param.app.PageOrderChildOfDriverSearchParam;
+import com.clx.performance.param.app.owner.PageOwnerOrderChildListParam;
 import com.clx.performance.param.pc.*;
 import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
@@ -517,4 +518,20 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         query.orderByDesc(OrderChild :: getCreateTime);
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
     }
+
+    @Override
+    public IPage<OrderChild> pageOwnerOrderChildList(PageOwnerOrderChildListParam param) {
+        LambdaQueryWrapper<OrderChild> query = new LambdaQueryWrapper<>();
+        query.eq(OrderChild :: getOwnerUserNo,param.getOwnerUserNo());
+        if(StringUtils.isNotBlank(param.getSearchNo())){
+            query.and(i ->
+                    i.eq(OrderChild :: getChildNo,param.getSearchNo()).or()
+                            .eq(OrderChild :: getTruckNo,param.getSearchNo()).or()
+                            .eq(OrderChild :: getOrderNo,param.getSearchNo()));
+        }
+        if(CollectionUtil.isNotEmpty(param.getStatus())){query.in(OrderChild :: getStatus,param.getStatus());}
+        if(StringUtils.isNotBlank(param.getBeginTime())){query.ge(OrderChild :: getCreateTime,param.getBeginTime());}
+        if(StringUtils.isNotBlank(param.getEndTime())){query.le(OrderChild :: getCreateTime,param.getEndTime());}
+        return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
+    }
 }

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.*;
+import com.clx.performance.param.app.owner.PageOwnerOrderChildListParam;
 import com.clx.performance.param.pc.OrderChildCarrierCancelParam;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PageMonitorOrderChildQCParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.vo.app.*;
+import com.clx.performance.vo.app.owner.OwnerOrderChildVO;
 import com.clx.performance.vo.pc.*;
 import com.msl.common.base.PageParam;
 
@@ -88,4 +90,6 @@ public interface OrderChildService {
     void updateOrderGoodsAmountLoad(OrderGoods orderGoods,String childNo, BigDecimal dif, Integer orderGoodsStatus);
 
     IPage<CustomerComplaintOrderChildVO> pageCustomerComplaintOrderChild(PageParam param);
+
+    IPage<OwnerOrderChildVO> pageOwnerOrderChildList(PageOwnerOrderChildListParam param);
 }

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

@@ -12,6 +12,7 @@ import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.constant.RedissonConstants;
 import com.clx.performance.dao.*;
 import com.clx.performance.dao.breakcontract.BreakContractDriverRecordDao;
+import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.dto.OrderChildExpectDTO;
 import com.clx.performance.dto.gd.GdRouteDTO;
 import com.clx.performance.dto.payment.WalletResidueCardDTO;
@@ -21,7 +22,9 @@ import com.clx.performance.extranal.user.*;
 import com.clx.performance.feign.FeignPaymentService;
 import com.clx.performance.model.*;
 import com.clx.performance.model.breakcontract.BreakContractDriverRecord;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.app.*;
+import com.clx.performance.param.app.owner.PageOwnerOrderChildListParam;
 import com.clx.performance.param.pc.OrderChildCarrierCancelParam;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PageMonitorOrderChildQCParam;
@@ -37,6 +40,7 @@ import com.clx.performance.utils.gd.GdService;
 import com.clx.performance.utils.spring.ApplicationContextUtils;
 import com.clx.performance.utils.zjxl.ZjxlGpsService;
 import com.clx.performance.vo.app.*;
+import com.clx.performance.vo.app.owner.OwnerOrderChildVO;
 import com.clx.performance.vo.pc.*;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.clx.user.vo.feign.DriverTruckInfoFeignVo;
@@ -162,6 +166,9 @@ public class OrderChildServiceImpl implements OrderChildService {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    SettlementOwnerDetailDao settlementOwnerDetailDao;
+
 
     @Autowired
     private OwnerRunningWaterRecordDao ownerRunningWaterRecordDao;
@@ -1325,6 +1332,18 @@ public class OrderChildServiceImpl implements OrderChildService {
         result.setLossAmount(calcLossAmount(result.getLossWeight(),orderChild.getLossPrice()));
 
 
+
+        //查询结算信息
+        Optional<SettlementOwnerDetail> optional = settlementOwnerDetailDao.getByChildNo(childNo);
+        if(!optional.isPresent()){
+            SettlementOwnerDetail settlementOwnerDetail = optional.get();
+            result.setRealFreight(settlementOwnerDetail.getFreight());
+            result.setLossFreight(settlementOwnerDetail.getLossFreight());
+            result.setPrepayFreight(settlementOwnerDetail.getPrepayFreight());
+            result.setSettlementFreight(settlementOwnerDetail.getSettlementFreight());
+        }
+
+
         return result;
     }
     //计算亏吨吨数
@@ -2165,5 +2184,14 @@ public class OrderChildServiceImpl implements OrderChildService {
         return "--";
     }
 
-
+    @Override
+    public IPage<OwnerOrderChildVO> pageOwnerOrderChildList(PageOwnerOrderChildListParam param) {
+        IPage<OrderChild> page = orderChildDao.pageOwnerOrderChildList(param);
+        List<OwnerOrderChildVO> list = orderChildStruct.convertOwnerOrderChildVOList(page.getRecords());
+        if(CollectionUtils.isNotEmpty(list)){
+            list.forEach(item-> item.setStatusMsg(OrderChildEnum.Status.getMsgByCode(item.getStatus())));
+            return new Page<OwnerOrderChildVO>().setPages(page.getPages()).setTotal(page.getTotal()).setRecords(list);
+        }
+        return new Page<>();
+    }
 }

performance-web/src/main/java/com/clx/performance/struct/OrderChildStruct.java

@@ -6,6 +6,7 @@ import com.clx.performance.model.OrderChild;
 import com.clx.performance.vo.app.CustomerComplaintOrderChildVO;
 import com.clx.performance.vo.app.GoingOrderChildVO;
 import com.clx.performance.vo.app.OrderChildVO;
+import com.clx.performance.vo.app.owner.OwnerOrderChildVO;
 import com.clx.performance.vo.pc.CarrierOrderChildDetailVO;
 import com.clx.performance.vo.pc.OrderChildPCVO;
 import com.msl.common.utils.DateStructUtil;
@@ -29,4 +30,8 @@ public interface OrderChildStruct {
     OrderChildMessage convertMessage(OrderChild item);
 
     Page<CustomerComplaintOrderChildVO> covertPageCustomerComplaintOrderChildVO(Page<OrderChild> page);
+
+
+    List<OwnerOrderChildVO> convertOwnerOrderChildVOList(List<OrderChild> list);
+
 }