Merge remote-tracking branch 'origin/master' into v7.6_small_version_fix_20231204

performance-api/src/main/java/com/clx/performance/param/pc/customer/PageCustomerComplaintDetailParam.java

+package com.clx.performance.param.pc.customer;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PageCustomerComplaintDetailParam extends PageParam {
+
+    @ApiModelProperty("司机姓名")
+    private String driverName;                      //司机姓名
+    @ApiModelProperty("联系方式")
+    private String driverMobile;                    //司机手机号
+    @ApiModelProperty("运单编号")
+    private String childNo;                         //运单编号
+    @ApiModelProperty("投诉类型id")
+    private Integer complaintTypeId;             //投诉类型id
+    @ApiModelProperty(value = "开始时间", example = "")
+    private String beginTime;
+    @ApiModelProperty(value = "结束时间", example = "")
+    private String endTime;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/customer/PageCustomerComplaintTypeParam.java

+package com.clx.performance.param.pc.customer;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PageCustomerComplaintTypeParam extends PageParam {
+
+    @ApiModelProperty("名称")
+    private String name;
+}

performance-api/src/main/java/com/clx/performance/param/pc/customer/SaveComplaintTypeParam.java

+package com.clx.performance.param.pc.customer;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * @ClassName SaveComplaintTypeParam
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/7 10:46
+ * @Version 1.0
+ */
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class SaveComplaintTypeParam {
+
+    private Integer id;
+
+
+    @Size(min=1 ,max = 10)
+    @NotBlank(message = "分类名称不能为空")
+    @ApiModelProperty(value = "分类名称")
+    private String name;
+}

performance-api/src/main/java/com/clx/performance/param/pc/customer/SaveCustomerComplaintDetailParam.java

+package com.clx.performance.param.pc.customer;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.List;
+
+/**
+ * @ClassName saveCustomerComplaintDetailParam
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/8 13:52
+ * @Version 1.0
+ */
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class SaveCustomerComplaintDetailParam {
+
+    @NotNull(message = "投诉类型ID不能为空")
+    @ApiModelProperty("投诉类型ID")
+    private Integer complaintTypeId;             //投诉类型id
+
+    @ApiModelProperty("运单编号")
+    private String childNo;                         //运单编号
+
+    @Size(min=1 ,max = 1000)
+    @ApiModelProperty("运单编号")
+    private String content;                      //问题描述
+
+    @ApiModelProperty("图片")
+    private List<String> picture;                      //图片
+
+}

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

+package com.clx.performance.vo.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @ClassName CustomerComplaintOrderChildVO
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/7 17:55
+ * @Version 1.0
+ */
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CustomerComplaintOrderChildVO {
+    @ApiModelProperty(value = "id", example = "1")
+    private Integer id;
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    private String childNo;
+    @ApiModelProperty(value = "货单编号", example = "100000000")
+    private String orderGoodsNo;
+    @ApiModelProperty(value = "订单编号", example = "10000000000")
+    private String orderNo;
+    @ApiModelProperty(value = "发货地址", example = "朝阳")
+    private String sendAddress;
+    @ApiModelProperty(value = "收货地址", example = "西城")
+    private String receiveAddress;
+    @ApiModelProperty(value = "车牌号", example = "京A12345")
+    private String truckNo;
+    @ApiModelProperty(value = "司机姓名", example = "张三")
+    private String driverName;
+    @ApiModelProperty(value = "接单时间", example = "2023-12-12 12:12:12")
+    private String createTime;                      //创建时间
+    @ApiModelProperty(value = "状态", example = "10")
+    private Integer status;                         //状态
+    @ApiModelProperty(value = "状态信息", example = "接单")
+    private String statusMsg;
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/customer/CustomerComplaintDetailVO.java

+package com.clx.performance.vo.pc.customer;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @ClassName CustomerComplaintTypeVO
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/7 11:42
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class CustomerComplaintDetailVO {
+    @ApiModelProperty("id")
+    private Integer id;
+    @ApiModelProperty("司机用户编号")
+    private Long driverUserNo;                      //司机用户编号
+    @ApiModelProperty("司机姓名")
+    private String driverName;                      //司机姓名
+    @ApiModelProperty("司机手机号")
+    private String driverMobile;                    //司机手机号
+    @ApiModelProperty("运单编号")
+    private String childNo;                         //运单编号
+    @ApiModelProperty("投诉类型id")
+    private Integer complaintTypeId;             //投诉类型id
+    @ApiModelProperty("投诉类型名称")
+    private String name;             //投诉类型名称
+    @ApiModelProperty("问题描述")
+    private String content;                      //问题描述
+    @ApiModelProperty("图片字符串")
+    private String picture;                      //图片
+    @ApiModelProperty("图片集合")
+    private List<String> pictureList;                      //图片集合
+    @ApiModelProperty("创建时间")
+    private String createTime;                      //创建时间
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/customer/CustomerComplaintTypeVO.java

+package com.clx.performance.vo.pc.customer;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @ClassName CustomerComplaintTypeVO
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/7 11:42
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class CustomerComplaintTypeVO {
+
+
+    @ApiModelProperty("id")
+    private Integer id;
+    @ApiModelProperty("投诉类型名称")
+    private String name;  //投诉类型名称
+    @ApiModelProperty("创建时间")
+    private String createTime;                      //创建时间
+    @ApiModelProperty("最后编辑时间")
+    private String modifiedTime;                    //修改时间
+
+}

performance-web/src/main/java/com/clx/performance/constant/RabbitKeyConstants.java

@@ -63,4 +63,11 @@ public class RabbitKeyConstants {
 
     public static final String ORDER_LARGE_SCREEN_QUEUE ="clx-order.order.large.screen.queue";
 
+
+    // 预付运费和保证金 自动冻结 触发消息队列
+    public static final String FREEZE_TRIGGER_EXCHANGE = "clx-order.freeze.trigger.exchange";
+    public static final String FREEZE_TRIGGER_QUEUE = "clx-order.freeze.trigger.queue";
+    public static final String FREEZE_TRIGGER_ROUTING_KEY = "clx-order.freeze.trigger.routing.key";
+
+
 }

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

@@ -5,6 +5,7 @@ import com.clx.performance.param.app.*;
 import com.clx.performance.service.OrderChildService;
 import com.clx.performance.vo.app.*;
 import com.msl.common.base.PageData;
+import com.msl.common.base.PageParam;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
@@ -174,4 +175,11 @@ public class AppDriverOrderChildController {
         return Result.ok(orderChildService.getGoingLatestOrderChild());
     }
 
+    @ApiOperation(value = "客诉运单列表", notes = "<br>By:刘海泉")
+    @PostMapping("/pageCustomerComplaintOrderChild")
+    public Result<PageData<CustomerComplaintOrderChildVO>> pageCustomerComplaintOrderChild(@RequestBody @Validated PageParam param) {
+        IPage<CustomerComplaintOrderChildVO> page = orderChildService.pageCustomerComplaintOrderChild(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
 }

performance-web/src/main/java/com/clx/performance/controller/pc/customer/CustomerComplaintDetailController.java

+package com.clx.performance.controller.pc.customer;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.customer.PageCustomerComplaintDetailParam;
+import com.clx.performance.param.pc.customer.SaveCustomerComplaintDetailParam;
+import com.clx.performance.service.customer.CustomerComplaintDetailService;
+import com.clx.performance.vo.pc.customer.CustomerComplaintDetailVO;
+import com.msl.common.base.PageData;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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 CustomerComplaintTypeController
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/7 10:44
+ * @Version 1.0
+ */
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/customer/complaint/type")
+@Validated
+@Api(tags = "客服-投诉详情")
+@AllArgsConstructor
+public class CustomerComplaintDetailController {
+
+    private final CustomerComplaintDetailService customerComplaintDetailService;
+
+
+    @ApiOperation(value = "保存客户投诉",notes = "<br>By:刘海泉")
+    @PostMapping("/saveCustomerComplaintDetail")
+    public Result<Object> saveCustomerComplaintDetail(@RequestBody @Validated SaveCustomerComplaintDetailParam param){
+        customerComplaintDetailService.saveCustomerComplaintDetail(param);
+        return Result.ok();
+    }
+
+
+    @ApiOperation(value = "投诉详情列表",notes = "<br>By:刘海泉")
+    @PostMapping("/pageCustomerComplaintDetail")
+    public Result<PageData<CustomerComplaintDetailVO>> pageCustomerComplaintDetail(@RequestBody @Validated PageCustomerComplaintDetailParam param){
+        IPage<CustomerComplaintDetailVO> page = customerComplaintDetailService.pageCustomerComplaintDetail(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/customer/CustomerComplaintTypeController.java

+package com.clx.performance.controller.pc.customer;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.customer.PageCustomerComplaintTypeParam;
+import com.clx.performance.param.pc.customer.SaveComplaintTypeParam;
+import com.clx.performance.service.customer.CustomerComplaintTypeService;
+import com.clx.performance.vo.pc.customer.CustomerComplaintTypeVO;
+import com.msl.common.base.PageData;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+import java.util.List;
+
+/**
+ * @ClassName CustomerComplaintTypeController
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/7 10:44
+ * @Version 1.0
+ */
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/customer/complaint/type")
+@Validated
+@Api(tags = "客服-投诉分类")
+@AllArgsConstructor
+public class CustomerComplaintTypeController {
+
+    private final CustomerComplaintTypeService customerComplaintTypeService;
+
+
+    @ApiOperation(value = "保存/更新投诉分类",notes = "<br>By:刘海泉")
+    @PostMapping("/saveCustomerComplaintType")
+    public Result<Object> saveCustomerComplaintType(@RequestBody @Validated SaveComplaintTypeParam param){
+        customerComplaintTypeService.saveCustomerComplaintType(param);
+        return Result.ok();
+    }
+
+
+    @ApiOperation(value = "投诉分类列表",notes = "<br>By:刘海泉")
+    @PostMapping("/pageCustomerComplaintType")
+    public Result<PageData<CustomerComplaintTypeVO>> pageCustomerComplaintType(@RequestBody @Validated PageCustomerComplaintTypeParam param){
+        IPage<CustomerComplaintTypeVO> page = customerComplaintTypeService.pageCustomerComplaintType(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+
+    @ApiOperation(value = "投诉分类下拉选",notes = "<br>By:刘海泉")
+    @PostMapping("/getCustomerComplaintTypeSelect")
+    public Result<List<CustomerComplaintTypeVO>> getCustomerComplaintTypeSelect(@RequestBody @Validated PageCustomerComplaintTypeParam param){
+        List<CustomerComplaintTypeVO> list = customerComplaintTypeService.getCustomerComplaintTypeSelect(param);
+        return Result.ok(list);
+    }
+
+
+}

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

@@ -11,6 +11,7 @@ import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import com.msl.common.base.Optional;
+import com.msl.common.base.PageParam;
 import com.msl.common.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
@@ -158,4 +159,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
 
     List<OrderChild> selectListWithEmptyCarList();
+
+    Page<OrderChild> getMonthAgoByUserNo(Long userNo, LocalDateTime monthAgo, PageParam param);
 }

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

@@ -27,7 +27,7 @@ public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMappe
     Optional<OrderGoodsTruckBind> getValidByOrderGoodsNoAndTruckNo(String truckNo);
     Optional<List<OrderGoodsTruckBind>> getValidByTruckNo(String truckNo);
 
-    Optional<List<OrderGoodsTruckBind>> selectListByTruckNo(List<String> truckList);
+    List<String> selectListByTruckNo(List<String> truckList);
 
     void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code);
 

performance-web/src/main/java/com/clx/performance/dao/customer/CustomerComplaintDetailDao.java

+package com.clx.performance.dao.customer;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.mapper.customer.CustomerComplaintDetailMapper;
+import com.clx.performance.model.customer.CustomerComplaintDetail;
+import com.clx.performance.param.pc.customer.PageCustomerComplaintDetailParam;
+import com.clx.performance.vo.pc.customer.CustomerComplaintDetailVO;
+import com.msl.common.dao.BaseDao;
+
+public interface CustomerComplaintDetailDao extends BaseDao<CustomerComplaintDetailMapper, CustomerComplaintDetail, Integer> {
+    Page<CustomerComplaintDetailVO> pageCustomerComplaintDetail(PageCustomerComplaintDetailParam param);
+}

performance-web/src/main/java/com/clx/performance/dao/customer/CustomerComplaintTypeDao.java

+package com.clx.performance.dao.customer;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.mapper.customer.CustomerComplaintTypeMapper;
+import com.clx.performance.model.customer.CustomerComplaintType;
+import com.clx.performance.param.pc.customer.PageCustomerComplaintTypeParam;
+import com.msl.common.dao.BaseDao;
+
+import java.util.List;
+
+public interface CustomerComplaintTypeDao extends BaseDao<CustomerComplaintTypeMapper, CustomerComplaintType, Integer> {
+    long countByNameExcludeSelf(String name, Integer id);
+
+    Page<CustomerComplaintType> pageCustomerComplaintType(PageCustomerComplaintTypeParam param);
+
+    List<CustomerComplaintType> getCustomerComplaintTypeSelect(PageCustomerComplaintTypeParam param);
+}

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

@@ -16,6 +16,7 @@ import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import com.msl.common.base.Optional;
+import com.msl.common.base.PageParam;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
@@ -497,4 +498,15 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         );
     }
 
+    @Override
+    public Page<OrderChild> getMonthAgoByUserNo(Long userNo, LocalDateTime monthAgo, PageParam param) {
+        LambdaQueryWrapper<OrderChild> query = new LambdaQueryWrapper<>();
+        query.and(i ->
+                i.eq(OrderChild :: getDriverUserNo,userNo).or()
+                        .eq(OrderChild :: getTruckOwnUserNo,userNo)
+        );
+        query.ge(OrderChild :: getCreateTime,monthAgo);
+        query.orderByDesc(OrderChild :: getCreateTime);
+        return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
+    }
 }

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

@@ -2,7 +2,6 @@ package com.clx.performance.dao.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
 import com.clx.performance.enums.OrderGoodsTruckBindEnum;
 import com.clx.performance.mapper.OrderGoodsTruckBindMapper;
@@ -75,10 +74,8 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
 
 
     @Override
-    public Optional<List<OrderGoodsTruckBind>> selectListByTruckNo(List<String> truckList) {
-        return Optional.ofNullable(baseMapper.selectList(new QueryWrapper<OrderGoodsTruckBind>().lambda()
-                        .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.NORMAL.getCode())
-                .in(OrderGoodsTruckBind::getTruckNo,truckList).select(OrderGoodsTruckBind::getOrderGoodsNo)));
+    public List<String> selectListByTruckNo(List<String> truckList) {
+        return baseMapper.selectListByTruckNo(truckList);
     }
 
     @Override

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

+package com.clx.performance.dao.impl.customer;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.customer.CustomerComplaintDetailDao;
+import com.clx.performance.mapper.customer.CustomerComplaintDetailMapper;
+import com.clx.performance.model.customer.CustomerComplaintDetail;
+import com.clx.performance.param.pc.customer.PageCustomerComplaintDetailParam;
+import com.clx.performance.vo.pc.customer.CustomerComplaintDetailVO;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @ClassName CustomerComplaintTypeDaoImpl
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/7 11:25
+ * @Version 1.0
+ */
+@Repository
+public class CustomerComplaintDetailDaoImpl extends BaseDaoImpl<CustomerComplaintDetailMapper, CustomerComplaintDetail, Integer> implements CustomerComplaintDetailDao {
+    @Override
+    public Page<CustomerComplaintDetailVO> pageCustomerComplaintDetail(PageCustomerComplaintDetailParam param) {
+        return baseMapper.pageCustomerComplaintDetail(Page.of(param.getPage(), param.getPageSize()),param);
+    }
+}

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

+package com.clx.performance.dao.impl.customer;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.customer.CustomerComplaintTypeDao;
+import com.clx.performance.mapper.customer.CustomerComplaintTypeMapper;
+import com.clx.performance.model.customer.CustomerComplaintType;
+import com.clx.performance.param.pc.customer.PageCustomerComplaintTypeParam;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @ClassName CustomerComplaintTypeDaoImpl
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/7 11:25
+ * @Version 1.0
+ */
+@Repository
+public class CustomerComplaintTypeDaoImpl extends BaseDaoImpl<CustomerComplaintTypeMapper, CustomerComplaintType, Integer> implements CustomerComplaintTypeDao {
+    @Override
+    public long countByNameExcludeSelf(String name, Integer id) {
+        LambdaQueryWrapper<CustomerComplaintType> query = new LambdaQueryWrapper<>();
+        query.eq(CustomerComplaintType :: getName,name);
+        if(Objects.nonNull(id)){
+            query.ne(CustomerComplaintType :: getId,id);
+        }
+        return baseMapper.selectCount(query);
+    }
+
+    @Override
+    public Page<CustomerComplaintType> pageCustomerComplaintType(PageCustomerComplaintTypeParam param) {
+        LambdaQueryWrapper<CustomerComplaintType> query = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(param.getName())){
+            query.eq(CustomerComplaintType :: getName,param.getName());
+        }
+        query.orderByDesc(CustomerComplaintType :: getModifiedTime);
+        return baseMapper.selectPage(Page.of(param.getPage(),param.getPageSize()),query);
+    }
+
+    @Override
+    public List<CustomerComplaintType> getCustomerComplaintTypeSelect(PageCustomerComplaintTypeParam param) {
+        LambdaQueryWrapper<CustomerComplaintType> query = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(param.getName())){
+            query.eq(CustomerComplaintType :: getName,param.getName());
+        }
+        query.orderByDesc(CustomerComplaintType :: getModifiedTime);
+        return baseMapper.selectList(query);
+    }
+}

performance-web/src/main/java/com/clx/performance/extranal/user/impl/OwnerInfoServiceImpl.java

@@ -20,7 +20,7 @@ public class OwnerInfoServiceImpl implements OwnerInfoService {
     @Override
     public OwnerInfoFeignVO getOwnerInfo(Long userNo) {
         return Optional.ofNullable(ownerInfoFeign.getOwnerInfo(userNo))
-                .filter(Result::succeed).map(item->item.getData()).orElseThrow(ResultCodeEnum.FAIL);
+                .filter(Result::succeed).map(Result::getData).orElseThrow(ResultCodeEnum.FAIL,"未查询到对应的货主信息");
     }
 
 }

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsTruckBindMapper.java

 package com.clx.performance.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.clx.performance.model.OrderGoodsDriverTruck;
 import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.sqlProvider.OrderGoodsTruckBindSqlProvider;
 import org.apache.ibatis.annotations.Mapper;
@@ -27,7 +26,8 @@ public interface OrderGoodsTruckBindMapper extends BaseMapper<OrderGoodsTruckBin
     @Select("select truck_no from order_goods_truck_bind where order_goods_no=#{orderGoodsNo}")
     List<Integer> getTrucksByOrderGoodsNo(@Param("orderGoodsNo") String orderGoodsNo);
 
-    List<OrderGoodsDriverTruck> selectListByTruckNo(List<OrderGoodsDriverTruck> truckList);
+    @SelectProvider(type = OrderGoodsTruckBindSqlProvider.class, method = "selectListByTruckNo")
+    List<String> selectListByTruckNo(List<String> truckList);
 
 
     @SelectProvider(type = OrderGoodsTruckBindSqlProvider.class, method = "findUnreleasedTruck")

performance-web/src/main/java/com/clx/performance/mapper/customer/CustomerComplaintDetailMapper.java

+package com.clx.performance.mapper.customer;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.model.customer.CustomerComplaintDetail;
+import com.clx.performance.param.pc.customer.PageCustomerComplaintDetailParam;
+import com.clx.performance.sqlProvider.customer.CustomerComplaintDetailSqlProvider;
+import com.clx.performance.vo.pc.customer.CustomerComplaintDetailVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
+
+public interface CustomerComplaintDetailMapper extends BaseMapper<CustomerComplaintDetail> {
+
+
+    @SelectProvider(type = CustomerComplaintDetailSqlProvider.class, method = "pageCustomerComplaintDetail")
+    Page<CustomerComplaintDetailVO> pageCustomerComplaintDetail(@Param("page") Page<CustomerComplaintDetailVO>  page , @Param("param") PageCustomerComplaintDetailParam param);
+}

performance-web/src/main/java/com/clx/performance/mapper/customer/CustomerComplaintTypeMapper.java

+package com.clx.performance.mapper.customer;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.customer.CustomerComplaintType;
+
+public interface CustomerComplaintTypeMapper extends BaseMapper<CustomerComplaintType> {
+}

performance-web/src/main/java/com/clx/performance/model/customer/CustomerComplaintDetail.java

+package com.clx.performance.model.customer;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * @ClassName CustomerComplaintType
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/7 10:54
+ * @Version 1.0
+ */
+
+@Getter
+@Setter
+@NoArgsConstructor
+@TableName(autoResultMap = true)
+public class CustomerComplaintDetail implements HasKey<Integer> {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    private Long driverUserNo;                      //司机用户编号
+    private String driverName;                      //司机姓名
+    private String driverMobile;                    //司机手机号
+    private String childNo;                         //运单编号
+    private Integer complaintTypeId;             //投诉类型id
+    private String content;                      //问题描述
+    private String picture;                      //图片
+    private String createTime;                      //创建时间
+    private String modifiedTime;                    //修改时间
+
+    @KeyColumn("id")
+    @Override
+    public Integer gainKey() {
+        return id;
+    }
+
+
+}

performance-web/src/main/java/com/clx/performance/model/customer/CustomerComplaintType.java

+package com.clx.performance.model.customer;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * @ClassName CustomerComplaintType
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/7 10:54
+ * @Version 1.0
+ */
+
+@Getter
+@Setter
+@NoArgsConstructor
+@TableName(autoResultMap = true)
+public class CustomerComplaintType implements HasKey<Integer> {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    private String name;  //投诉类型名称
+    private LocalDateTime createTime;                      //创建时间
+    private LocalDateTime modifiedTime;                    //修改时间
+
+    @KeyColumn("id")
+    @Override
+    public Integer gainKey() {
+        return id;
+    }
+
+
+}

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

 package com.clx.performance.service;
 
-import cn.hutool.json.JSON;
-import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
@@ -12,11 +10,10 @@ 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.pc.*;
-import com.clx.user.vo.pc.driver.truck.DriverTruckVo;
+import com.msl.common.base.PageParam;
 
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.Objects;
 
 
 /**
@@ -88,4 +85,5 @@ public interface OrderChildService {
 
     void updateOrderGoodsAmountLoad(OrderGoods orderGoods,String childNo, BigDecimal dif, Integer orderGoodsStatus);
 
+    IPage<CustomerComplaintOrderChildVO> pageCustomerComplaintOrderChild(PageParam param);
 }

performance-web/src/main/java/com/clx/performance/service/customer/CustomerComplaintDetailService.java

+package com.clx.performance.service.customer;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.customer.PageCustomerComplaintDetailParam;
+import com.clx.performance.param.pc.customer.SaveCustomerComplaintDetailParam;
+import com.clx.performance.vo.pc.customer.CustomerComplaintDetailVO;
+
+public interface CustomerComplaintDetailService {
+    void saveCustomerComplaintDetail(SaveCustomerComplaintDetailParam param);
+
+    IPage<CustomerComplaintDetailVO> pageCustomerComplaintDetail(PageCustomerComplaintDetailParam param);
+}

performance-web/src/main/java/com/clx/performance/service/customer/CustomerComplaintTypeService.java

+package com.clx.performance.service.customer;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.pc.customer.PageCustomerComplaintTypeParam;
+import com.clx.performance.param.pc.customer.SaveComplaintTypeParam;
+import com.clx.performance.vo.pc.customer.CustomerComplaintTypeVO;
+
+import java.util.List;
+
+public interface CustomerComplaintTypeService {
+    void saveCustomerComplaintType(SaveComplaintTypeParam param);
+
+    Page<CustomerComplaintTypeVO> pageCustomerComplaintType(PageCustomerComplaintTypeParam param);
+
+    List<CustomerComplaintTypeVO> getCustomerComplaintTypeSelect(PageCustomerComplaintTypeParam param);
+}

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

+package com.clx.performance.service.customer.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.customer.CustomerComplaintDetailDao;
+import com.clx.performance.model.customer.CustomerComplaintDetail;
+import com.clx.performance.param.pc.customer.PageCustomerComplaintDetailParam;
+import com.clx.performance.param.pc.customer.SaveCustomerComplaintDetailParam;
+import com.clx.performance.service.customer.CustomerComplaintDetailService;
+import com.clx.performance.struct.customer.CustomerComplaintDetailStruct;
+import com.clx.performance.vo.pc.customer.CustomerComplaintDetailVO;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+
+/**
+ * @ClassName CustomerComplaintTypeServiceImpl
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/7 10:51
+ * @Version 1.0
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class CustomerComplaintDetailServiceImpl implements CustomerComplaintDetailService {
+    private final CustomerComplaintDetailDao customerComplaintDetailDao;
+    private final CustomerComplaintDetailStruct customerComplaintDetailStruct;
+    @Override
+    public void saveCustomerComplaintDetail(SaveCustomerComplaintDetailParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        CustomerComplaintDetail detail = new CustomerComplaintDetail();
+        detail.setDriverUserNo(loginUserInfo.getUserNo());
+        detail.setDriverName(loginUserInfo.getUserName());
+        detail.setDriverMobile(loginUserInfo.getUserMobile());
+        detail.setChildNo(param.getChildNo());
+        detail.setComplaintTypeId(param.getComplaintTypeId());
+        detail.setContent(param.getContent());
+        if(CollectionUtil.isNotEmpty(param.getPicture())){
+            detail.setPicture(String.join(",",param.getPicture()));
+        }
+        customerComplaintDetailDao.saveEntity(detail);
+    }
+
+    @Override
+    public IPage<CustomerComplaintDetailVO> pageCustomerComplaintDetail(PageCustomerComplaintDetailParam param) {
+        Page<CustomerComplaintDetailVO> page  = customerComplaintDetailDao.pageCustomerComplaintDetail(param);
+        if(CollectionUtil.isNotEmpty(page.getRecords())){
+            page.getRecords().forEach(item->{
+                if(StringUtils.isNotBlank(item.getPicture())){
+                    item.setPictureList(Arrays.asList(item.getPicture().split(",")));
+                }
+            });
+        }
+        return page;
+    }
+}

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

+package com.clx.performance.service.customer.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.customer.CustomerComplaintTypeDao;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.model.customer.CustomerComplaintType;
+import com.clx.performance.param.pc.customer.PageCustomerComplaintTypeParam;
+import com.clx.performance.param.pc.customer.SaveComplaintTypeParam;
+import com.clx.performance.service.customer.CustomerComplaintTypeService;
+import com.clx.performance.struct.customer.CustomerComplaintTypeStruct;
+import com.clx.performance.vo.pc.customer.CustomerComplaintTypeVO;
+import com.msl.common.exception.ServiceSystemException;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @ClassName CustomerComplaintTypeServiceImpl
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/7 10:51
+ * @Version 1.0
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class CustomerComplaintTypeServiceImpl implements CustomerComplaintTypeService {
+
+    private final CustomerComplaintTypeDao customerComplaintTypeDao;
+    private final CustomerComplaintTypeStruct customerComplaintTypeStruct;
+    @Override
+    public void saveCustomerComplaintType(SaveComplaintTypeParam param) {
+
+        long count = customerComplaintTypeDao.countByNameExcludeSelf(param.getName(),param.getId());
+        if(count > 0 ){
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"分类名称重复");
+        }
+        if(Objects.isNull(param.getId())){  // 新增
+            CustomerComplaintType insert = new CustomerComplaintType();
+            insert.setName(param.getName());
+            customerComplaintTypeDao.saveEntity(insert);
+        }else{    //更新
+            CustomerComplaintType update = new CustomerComplaintType();
+            update.setId(param.getId());
+            update.setName(param.getName());
+            customerComplaintTypeDao.updateEntityByKey(update);
+        }
+    }
+
+    @Override
+    public Page<CustomerComplaintTypeVO> pageCustomerComplaintType(PageCustomerComplaintTypeParam param) {
+        Page<CustomerComplaintType> page =  customerComplaintTypeDao.pageCustomerComplaintType(param);
+        Page<CustomerComplaintTypeVO> result = new Page<>();
+
+        if(CollectionUtil.isNotEmpty(page.getRecords())){
+            result.setRecords(customerComplaintTypeStruct.convertList(page.getRecords()));
+            result.setTotal(page.getTotal());
+            result.setPages(page.getPages());
+        }
+        return  result;
+    }
+
+    @Override
+    public List<CustomerComplaintTypeVO> getCustomerComplaintTypeSelect(PageCustomerComplaintTypeParam param) {
+        List<CustomerComplaintType> list =  customerComplaintTypeDao.getCustomerComplaintTypeSelect(param);
+        return customerComplaintTypeStruct.convertList(list);
+    }
+}

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

@@ -3,6 +3,7 @@ package com.clx.performance.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.enums.OrderEnum;
+import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignAddressVO;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
@@ -16,10 +17,7 @@ import com.clx.performance.dto.gd.GdRouteDTO;
 import com.clx.performance.dto.payment.WalletResidueCardDTO;
 import com.clx.performance.dto.zjxl.TruckTraceDTO;
 import com.clx.performance.enums.*;
-import com.clx.performance.extranal.user.AddressService;
-import com.clx.performance.extranal.user.DriverService;
-import com.clx.performance.extranal.user.OrderService;
-import com.clx.performance.extranal.user.OwnerInfoService;
+import com.clx.performance.extranal.user.*;
 import com.clx.performance.feign.FeignPaymentService;
 import com.clx.performance.model.*;
 import com.clx.performance.model.breakcontract.BreakContractDriverRecord;
@@ -44,6 +42,7 @@ import com.clx.user.enums.driver.DriverInfoEnum;
 import com.clx.user.vo.feign.DriverTruckInfoFeignVo;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
 import com.msl.common.base.Optional;
+import com.msl.common.base.PageParam;
 import com.msl.common.enums.ResultCodeEnum;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
@@ -159,6 +158,9 @@ public class OrderChildServiceImpl implements OrderChildService {
     @Autowired
     private ZjxlGpsService zjxlGpsService;
 
+    @Autowired
+    private UserService userService;
+
 
     @Override
     public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {
@@ -380,8 +382,9 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 更新货单数据
         updateOrderGoodsAmount(orderGoods, orderChild);
 
-        // 更新定向单状态
-        updateOrderGoodsDirect(bind);
+        // 更新定向平台车状态，自由车状态不更新
+        updateOrderGoodsDirect(orderGoods,bind);
+
 
         // 新增运单
         orderChildDao.saveEntity(orderChild);
@@ -476,7 +479,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
 
         // 更新定向派单
-        updateOrderGoodsDirectReject(orderGoodsTruckBind);
+        updateOrderGoodsDirectReject(orderGoods,orderGoodsTruckBind);
     }
 
     @Override
@@ -857,9 +860,12 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 更新出车状态
         updateDriverOrderStatusUnload(orderChild.getDriverUserNo(), orderChild.getTruckId());
 
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         //释放车辆
-        goodsOrderTruckRecordComponent.releaseDriverCard(orderChild.getOrderGoodsNo(), orderChild.getTruckNo());
-
+        //非自有车辆配货的进行车辆释放
+        if(!Objects.equals(orderGoods.getVehicleUsage(), VehicleUsageEnum.Status.OWN.getCode())){
+            goodsOrderTruckRecordComponent.releaseDriverCard(orderChild.getOrderGoodsNo(), orderChild.getTruckNo());
+        }
         // 发送mq 卸车
         orderChildMqService.orderChildUnload(orderChild.getChildNo());
     }
@@ -1149,8 +1155,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 返回吨数
         updateOrderGoodsAmountReturn(orderChild, orderGoods);
 
-        // 取消定向
-        updateOrderGoodsDirectCancel(orderGoodsTruckBind);
+        //取消车辆绑定
+        updateOrderGoodsDirectCancel(orderGoods,orderGoodsTruckBind);
 
         orderChildDao.updateCancel(orderChild);
 
@@ -1209,7 +1215,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         updateOrderGoodsAmountReturn(orderChild, orderGoods);
 
         // 取消定向
-        updateOrderGoodsDirectCancel(orderGoodsTruckBind);
+        updateOrderGoodsDirectCancel(orderGoods,orderGoodsTruckBind);
 
         orderChildDao.updateCancel(orderChild);
 
@@ -1466,11 +1472,13 @@ public class OrderChildServiceImpl implements OrderChildService {
     /**
      * 更新定向单状态 (接单)
      */
-    private void updateOrderGoodsDirect(OrderGoodsTruckBind orderGoodsTruckBind) {
+    private void updateOrderGoodsDirect(OrderGoods orderGoods,OrderGoodsTruckBind orderGoodsTruckBind) {
         if (orderGoodsTruckBind == null) {
             return;
         }
-
+        if(Objects.equals(orderGoods.getVehicleUsage(), VehicleUsageEnum.Status.OWN.getCode())){
+            return;
+        }
         orderGoodsTruckBind.setStatus(OrderGoodsTruckBind.Status.ORDER.getCode());
         orderGoodsTruckBindDao.updateStatus(orderGoodsTruckBind);
     }
@@ -1478,7 +1486,11 @@ public class OrderChildServiceImpl implements OrderChildService {
     /**
      * 更新定向派单状态 (拒绝)
      */
-    private void updateOrderGoodsDirectReject(OrderGoodsTruckBind orderGoodsTruckBind) {
+    private void updateOrderGoodsDirectReject(OrderGoods orderGoods,OrderGoodsTruckBind orderGoodsTruckBind) {
+        if(Objects.equals(orderGoods.getVehicleUsage(),VehicleUsageEnum.Status.OWN.getCode())){
+            //定向平台车辆取消绑定，自由车辆状态绑定状态不变
+            return;
+        }
         orderGoodsTruckBind.setStatus(OrderGoodsTruckBind.Status.CANCEL.getCode());
         orderGoodsTruckBindDao.updateStatus(orderGoodsTruckBind);
         goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoodsTruckBind.getOrderGoodsNo(), orderGoodsTruckBind.getTruckNo());
@@ -1487,10 +1499,14 @@ public class OrderChildServiceImpl implements OrderChildService {
     /**
      * 更新定向派单状态 (取消)
      */
-    private void updateOrderGoodsDirectCancel(OrderGoodsTruckBind orderGoodsTruckBind) {
+    private void updateOrderGoodsDirectCancel(OrderGoods orderGoods,OrderGoodsTruckBind orderGoodsTruckBind) {
         if (orderGoodsTruckBind == null) {
             return;
         }
+        if(Objects.equals(orderGoods.getVehicleUsage(),VehicleUsageEnum.Status.OWN.getCode())){
+            //定向平台车辆取消绑定，自由车辆状态绑定状态不变
+            return;
+        }
 
         orderGoodsTruckBind.setStatus(OrderGoodsTruckBind.Status.CANCEL.getCode());
         orderGoodsTruckBindDao.updateStatus(orderGoodsTruckBind);
@@ -2099,6 +2115,18 @@ public class OrderChildServiceImpl implements OrderChildService {
         return gdRouteDTOS;
     }
 
+    @Override
+    public IPage<CustomerComplaintOrderChildVO> pageCustomerComplaintOrderChild(PageParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        LocalDateTime monthAgo = LocalDateTime.now().minusMonths(1);
+        Page<OrderChild> page = orderChildDao.getMonthAgoByUserNo(loginUserInfo.getUserNo(),monthAgo,param);
+        Page<CustomerComplaintOrderChildVO> returnPage = orderChildStruct.covertPageCustomerComplaintOrderChildVO(
+                page);
+        if(CollectionUtils.isNotEmpty(returnPage.getRecords())){
+            returnPage.getRecords().forEach(item-> item.setStatusMsg(OrderChildEnum.Status.getMsgByCode(item.getStatus())));
+        }
+        return returnPage;
+    }
 
     private static String formatTimeStr(Integer n) {
         if (n > Long.MAX_VALUE) {

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

@@ -159,7 +159,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     @Override
     public void updateOrderGoodsReduceWeightAndStatus(OrderGoods orderGoods, OrderChild orderChild, Integer orderGoodsStatus) {
         orderGoodsDao.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), orderChild.getWeight(), orderGoodsStatus);
-        if (orderGoods.getResidueTransportWeight().compareTo(orderChild.getWeight()) <= 0) {
+        //货单没有辆，并且货单用车非自有车
+        if (orderGoods.getResidueTransportWeight().compareTo(orderChild.getWeight()) <= 0
+                && !Objects.equals(orderGoods.getVehicleUsage(),VehicleUsageEnum.Status.OWN.getCode())) {
             //释放其他车辆
             goodsOrderTruckRecordComponent.releaseDriverAndTruckBind(orderGoods.getOrderGoodsNo(), orderChild.getTruckNo());
         }
@@ -176,7 +178,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
 
             List<String> truckNoList = new ArrayList<>();
 
-            //查询当前用户是否是货主
+            //查询当前用户是否是车主
             Long driverUserNo = orderGoodsListParam.getDriverUserNo();
             Result<List<String>> ownTruckByUserNo = userClxFeign.getOwnTruckByUserNo(driverUserNo);
             log.info("通过用户编号:{} 查询本人车辆，查询结果:{}", driverUserNo, JSON.toJSONString(ownTruckByUserNo));
@@ -192,14 +194,13 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 log.warn("用户编号:{},查询车主车辆和作为司机的车辆全未查询到数据", driverUserNo);
                 return new Page<>();
             }
-            Optional<List<OrderGoodsTruckBind>> orderGoodsDriverTrucks = orderGoodsTruckBindDao.selectListByTruckNo(
+            //自有车辆的货单接单之后还可以再次看到
+            List<String> orderGoodsNoList = orderGoodsTruckBindDao.selectListByTruckNo(
                     truckNoList);
-            if (!orderGoodsDriverTrucks.isPresent() || orderGoodsDriverTrucks.get().isEmpty()) {
+            if (CollectionUtils.isEmpty(orderGoodsNoList)) {
                 log.warn("用户编号:{},无专属单", driverUserNo);
                 return new Page<>();
             }
-
-            List<String> orderGoodsNoList = orderGoodsDriverTrucks.get().stream().map(OrderGoodsTruckBind::getOrderGoodsNo).collect(Collectors.toList());
             return orderGoodsDao.exclusiveOrderPageGoodsList(orderGoodsListParam, orderGoodsNoList);
         }
     }

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

@@ -4,16 +4,21 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.message.feign.ClxMessageOpenapiFeign;
 import com.clx.message.req.message.AliSmsMessageReq;
+import com.clx.order.param.mq.FreezeTriggerMqParam;
+import com.clx.performance.common.MqWrapper;
 import com.clx.performance.component.IdGenerateSnowFlake;
 import com.clx.performance.config.ClxMessageConfig;
 import com.clx.performance.constant.RedisConstants;
+import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.*;
 import com.clx.performance.enums.IdTypeEnum;
 import com.clx.performance.enums.OwnerAccountEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.extranal.user.OwnerInfoService;
 import com.clx.performance.model.*;
 import com.clx.performance.param.app.CheckMobileParam;
 import com.clx.performance.param.app.InformationParam;
@@ -37,6 +42,7 @@ import com.clx.performance.vo.pc.OwnerAccountAllVO;
 import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
 import com.clx.performance.vo.pc.OwnerAccountVO;
 import com.clx.user.feign.OwnerFeign;
+import com.clx.user.enums.owner.FreezeSettingEnum;
 import com.clx.user.feign.OwnerInfoFeign;
 import com.clx.user.param.pc.owner.UpdateOwnerBindCardFeignParam;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
@@ -52,6 +58,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.core.MessageBuilder;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -62,6 +71,9 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 @Slf4j
 @Service
@@ -97,6 +109,10 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
     private final OwnerAccountPasswordDao ownerAccountPasswordDao;
 
 
+    private final RabbitTemplate rabbitTemplate;
+
+    private final OwnerInfoService ownerInfoService;
+
     @Override
     public IPage<OwnerAccountVO> pageList(PageOwnerAccountListParam param) {
         return ownerAccountDao.pageList(param);
@@ -353,8 +369,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
             //给对应账户增加金额
             BigDecimal topUpBalance = ownerTopUp.getTopUpBalance();
             LocalDateTime now = LocalDateTime.now();
+            Long ownerUserNo;
+            String ownerUserName;
             while (true) {
                 OwnerAccount account = ownerAccountDao.getAccountByOwnerUserNoAndAccountType(ownerTopUp.getOwnerUserNo(), param.getAccountType());
+                ownerUserNo = account.getOwnerUserNo();
+                ownerUserName = account.getOwnerUserName();
                 OwnerAccount update = new OwnerAccount();
                 update.setAccountBalance(topUpBalance);
                 update.setUsableBalance(topUpBalance);
@@ -387,8 +407,17 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
                     break;
                 }
             }
-
-
+            OwnerInfoFeignVO ownerInfo = ownerInfoService.getOwnerInfo(ownerUserNo);
+            //充值成功并且当前货主是冻结方式是自动冻结，则触发自动冻结的mq监听
+            if(Objects.equals(ownerInfo.getFreezeSetting(), FreezeSettingEnum.AUTO.getCode())){
+                log.info("货主编码:{},货主姓名:{},充值成功金额：{},发送自动冻结的mq消息",ownerUserNo,ownerUserName,topUpBalance);
+                FreezeTriggerMqParam mq = new FreezeTriggerMqParam();
+                mq.setUserNo(ownerUserNo);
+                Message message = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(mq)).getBytes()).build();
+                //设置延时5秒处理，防止事务未提交
+                message.getMessageProperties().setExpiration("5000");
+                rabbitTemplate.send(RabbitKeyConstants.FREEZE_TRIGGER_EXCHANGE, RabbitKeyConstants.FREEZE_TRIGGER_ROUTING_KEY,message);
+            }
         }
     }
 

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsTruckBindSqlProvider.java

 package com.clx.performance.sqlProvider;
 
+import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.performance.enums.OrderGoodsTruckBindEnum;
 import org.apache.ibatis.jdbc.SQL;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class OrderGoodsTruckBindSqlProvider {
 
@@ -33,5 +35,14 @@ public class OrderGoodsTruckBindSqlProvider {
 
         }}.toString();
     }
+    public String selectListByTruckNo(List<String> truckList){
+        return new SQL(){{
+            SELECT(" a.order_goods_no ");
+            FROM("order_goods_truck_bind a");
+            LEFT_OUTER_JOIN("order_goods b on a.order_goods_no = b.order_goods_no");
+            WHERE("a.truck_no IN ("  + truckList.stream().map(code -> "'"+code+"'").collect(Collectors.joining(","))+ ")" );
+            WHERE("b.vehicle_usage = " + VehicleUsageEnum.Status.OWN.getCode()  + " or a.`status` =" + OrderGoodsTruckBindEnum.Status.NORMAL.getCode());
+        }}.toString();
+    }
 
 }

performance-web/src/main/java/com/clx/performance/sqlProvider/customer/CustomerComplaintDetailSqlProvider.java

+package com.clx.performance.sqlProvider.customer;
+
+import com.clx.performance.param.pc.customer.PageCustomerComplaintDetailParam;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.jdbc.SQL;
+
+import java.util.Objects;
+
+/**
+ * @ClassName CustomerComplaintDetailSqlProvider
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/13 13:31
+ * @Version 1.0
+ */
+public class CustomerComplaintDetailSqlProvider {
+
+
+
+    public String pageCustomerComplaintDetail(PageCustomerComplaintDetailParam param) {
+        return new SQL(){{
+
+            SELECT( " a.id, a.driver_user_no ,a.driver_name,a.driver_mobile,a.child_no," +
+                    " a.complaint_type_id,a.content,a.picture,b.name," +
+                    " date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
+                    " date_format(a.modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime ");
+            FROM("customer_complaint_detail a");
+            LEFT_OUTER_JOIN("customer_complaint_type b on a.complaint_type_id = b.id");
+
+            if(Objects.nonNull(param.getComplaintTypeId())){
+                WHERE("a.complaint_type_id = #{param.complaintTypeId}");
+            }
+            if(StringUtils.isNotBlank(param.getChildNo())){
+                WHERE("a.child_no = #{param.childNo}");
+            }
+
+            if(StringUtils.isNotBlank(param.getDriverMobile())){
+                WHERE("a.driver_mobile = #{param.driverMobile}");
+            }
+
+            if(StringUtils.isNotBlank(param.getDriverName())){
+                WHERE("a.driver_name = #{param.driverName}");
+            }
+
+            if(StringUtils.isNotBlank(param.getBeginTime())){
+                WHERE("a.create_time >= #{param.beginTime}");
+            }
+            if(StringUtils.isNotBlank(param.getEndTime())){
+                WHERE("a.create_time <= #{param.endTime}");
+            }
+            ORDER_BY("a.create_time desc");
+        }}.toString();
+    }
+}

performance-web/src/main/java/com/clx/performance/strategy/GoodsOrderStrategy.java

 package com.clx.performance.strategy;
 
+import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.performance.param.pc.OrderGoodsChildParams;
 import com.clx.performance.param.pc.OrderGoodsParams;
 import com.clx.order.enums.OrderStopEnum;
@@ -12,15 +13,13 @@ import com.clx.performance.utils.SpringContextUtils;
 import com.msl.common.exception.ServiceSystemException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 
 import java.time.LocalDateTime;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -48,7 +47,8 @@ public abstract class GoodsOrderStrategy {
         List<OrderGoodsChildParams> orderGoodsChildParams = orderGoodsParams.getOrderGoodsChildParams();
         Set<String> set = new HashSet<>();
         for (OrderGoodsChildParams item : orderGoodsChildParams) {
-            if (CollectionUtils.isNotEmpty(item.getTruckList())) {
+            //定向车自由车辆不做拦截操作
+            if (!StringUtils.equals(item.getVehicleUsage(),String.valueOf(VehicleUsageEnum.Status.OWN.getCode())) && CollectionUtils.isNotEmpty(item.getTruckList())) {
                 int lastSize = set.size() + item.getTruckList().size();
                 set.addAll(item.getTruckList());
                 if (!Objects.equals(lastSize, set.size())) {
@@ -63,8 +63,7 @@ public abstract class GoodsOrderStrategy {
             if (CollectionUtils.isNotEmpty(binds)) {
                 List<String> repeatBind = binds.stream().map(OrderGoodsTruckBind::getTruckNo).collect(Collectors.toList());
                 String trucks = String.join(", ", repeatBind);
-                throw new ServiceSystemException(ResultEnum.DATA_ERROR, "已被定向单绑定车辆：" + trucks);
-            }
+                throw new ServiceSystemException(ResultEnum.DATA_ERROR, "已被定向单绑定车辆：" + trucks);            }
         }
         //根据不同的订单类型创建不同的货单
         LocalDateTime sendLazyTime = goodsOrderProcess(orderGoodsParams, orderInfo, now);

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

 package com.clx.performance.struct;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.open.sdk.callback.message.OrderChildMessage;
 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.pc.CarrierOrderChildDetailVO;
@@ -26,6 +28,5 @@ public interface OrderChildStruct {
 
     OrderChildMessage convertMessage(OrderChild item);
 
-
-
+    Page<CustomerComplaintOrderChildVO> covertPageCustomerComplaintOrderChildVO(Page<OrderChild> page);
 }

performance-web/src/main/java/com/clx/performance/struct/customer/CustomerComplaintDetailStruct.java

+package com.clx.performance.struct.customer;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.model.customer.CustomerComplaintDetail;
+import com.clx.performance.vo.pc.customer.CustomerComplaintDetailVO;
+import com.msl.common.utils.DateStructUtil;
+import com.msl.common.utils.DateUtils;
+import org.mapstruct.Mapper;
+
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {DateUtils.class})
+public interface CustomerComplaintDetailStruct {
+
+    Page<CustomerComplaintDetailVO> convertPage(Page<CustomerComplaintDetail> page);
+
+
+}

performance-web/src/main/java/com/clx/performance/struct/customer/CustomerComplaintTypeStruct.java

+package com.clx.performance.struct.customer;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.model.customer.CustomerComplaintType;
+import com.clx.performance.vo.pc.customer.CustomerComplaintTypeVO;
+import com.msl.common.utils.DateStructUtil;
+import com.msl.common.utils.DateUtils;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {DateUtils.class})
+public interface CustomerComplaintTypeStruct {
+    Page<CustomerComplaintTypeVO> convertPage(Page<CustomerComplaintType> page);
+
+    List<CustomerComplaintTypeVO> convertList(List<CustomerComplaintType> list);
+}