Merge branch 'v21.1_jianzhuang_20240807' into dev

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

@@ -68,8 +68,8 @@ public class OrderCancelController {
     @ApiOperation(value = "运单处理记录", notes = "<br>By:姜武杰")
     @PostMapping("/orderChildOperateRecord")
     public Result<PageData<OrderChildOperateRecordVO>> orderChildOperateRecord(@RequestBody OrderChildCancelRecordParam param) {
-        // TODO 待实现
-        return null;
+        IPage<OrderChildOperateRecordVO> page = orderCancelService.orderChildOperateRecord(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
 
     @ApiOperation(value = "客服解除装车限制", notes = "<br>By:姜武杰")

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

+package com.clx.performance.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.OrderChildOperateRecordMapper;
+import com.clx.performance.model.OrderChildOperateRecord;
+import com.clx.performance.param.pc.OrderChildCancelRecordParam;
+import com.clx.performance.vo.app.OrderChildVO;
+import com.clx.performance.vo.pc.OrderChildOperateRecordVO;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @author jiangwujie
+ * Date 2024-08-08
+ * Time 11:20
+ */
+public interface OrderChildOperateRecordDao extends BaseDao<OrderChildOperateRecordMapper, OrderChildOperateRecord, Integer> {
+    IPage<OrderChildOperateRecordVO> orderChildOperateRecord(OrderChildCancelRecordParam param);
+}

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

+package com.clx.performance.dao.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.OrderChildOperateRecordDao;
+import com.clx.performance.mapper.OrderChildOperateRecordMapper;
+import com.clx.performance.model.OrderChildOperateRecord;
+import com.clx.performance.param.pc.OrderChildCancelRecordParam;
+import com.clx.performance.vo.app.OrderChildVO;
+import com.clx.performance.vo.pc.OrderChildOperateRecordVO;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author jiangwujie
+ * Date 2024-08-08
+ * Time 11:20
+ */
+@Repository
+public class OrderChildOperateRecordDaoImpl extends BaseDaoImpl<OrderChildOperateRecordMapper, OrderChildOperateRecord, Integer> implements OrderChildOperateRecordDao {
+    @Override
+    public IPage<OrderChildOperateRecordVO> orderChildOperateRecord(OrderChildCancelRecordParam param) {
+        Page<OrderChildOperateRecordVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.orderChildOperateRecord(page, param);
+    }
+}

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

+package com.clx.performance.mapper;
+
+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.OrderChildOperateRecord;
+import com.clx.performance.param.pc.OrderChildCancelRecordParam;
+import com.clx.performance.sqlProvider.OrderChildOperateRecordSqlProvider;
+import com.clx.performance.sqlProvider.OrderChildSqlProvider;
+import com.clx.performance.vo.app.OrderChildVO;
+import com.clx.performance.vo.pc.OrderChildOperateRecordVO;
+import org.apache.ibatis.annotations.SelectProvider;
+
+/**
+ * @author jiangwujie
+ * Date 2024-08-08
+ * Time 11:20
+ */
+public interface OrderChildOperateRecordMapper extends BaseMapper<OrderChildOperateRecord> {
+
+    @SelectProvider(type = OrderChildOperateRecordSqlProvider.class, method = "orderChildOperateRecord")
+    IPage<OrderChildOperateRecordVO> orderChildOperateRecord(Page<OrderChildOperateRecordVO> page, OrderChildCancelRecordParam param);
+}

performance-web/src/main/java/com/clx/performance/model/OrderChildOperateRecord.java

+package com.clx.performance.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author jiangwujie
+ * Date 2024-08-08
+ * Time 11:20
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("order_child_operate_record")
+public class OrderChildOperateRecord implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("child_no")
+    @ApiModelProperty("运单编号")
+    private String childNo;
+
+    @TableField("type")
+    @ApiModelProperty("操作类型 1 取消运单 2 解除装车限制")
+    private Integer type;
+
+    @TableField("truck_no")
+    @ApiModelProperty("主车牌照")
+    private String truckNo;
+
+    @TableField("driver_name")
+    @ApiModelProperty("司机名称")
+    private String driverName;
+
+    @TableField("driver_mobile")
+    @ApiModelProperty("司机手机号")
+    private String driverMobile;
+
+    @TableField("send_address")
+    @ApiModelProperty("货源地")
+    private String sendAddress;
+
+    @TableField("receive_address")
+    @ApiModelProperty("目的地")
+    private String receiveAddress;
+
+    @TableField("good_type_name")
+    @ApiModelProperty("货物类型名称")
+    private String goodTypeName;
+
+    @TableField("remark")
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @TableField("operate_time")
+    @ApiModelProperty("操作时间")
+    private LocalDateTime operateTime;
+
+    @TableField("operator")
+    @ApiModelProperty("操作人")
+    private String operator;
+
+    @TableField("created_time")
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createdTime;
+
+    @TableField("modified_time")
+    @ApiModelProperty("更新时间")
+    private LocalDateTime modifiedTime;
+
+    @Override
+    @KeyColumn("id")
+    public Integer gainKey() {
+        return this.id;
+    }
+}

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

@@ -5,6 +5,7 @@ import com.clx.performance.param.pc.ArtificialCancelOrderQueryParam;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.param.pc.OrderChildCancelRecordParam;
 import com.clx.performance.vo.app.OrderChildVO;
+import com.clx.performance.vo.pc.OrderChildOperateRecordVO;
 
 public interface OrderCancelService {
 
@@ -48,4 +49,11 @@ public interface OrderCancelService {
     OrderChildVO findArtificialCancelOrder(ArtificialCancelOrderQueryParam param);
 
     IPage<OrderChildVO> orderChildCancelRecord(OrderChildCancelRecordParam param);
+
+    /**
+     * 异常运单处理记录
+     * @param param
+     * @return
+     */
+    IPage<OrderChildOperateRecordVO> orderChildOperateRecord(OrderChildCancelRecordParam param);
 }

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

+package com.clx.performance.service;
+
+/**
+ * @author jiangwujie
+ * Date 2024-08-08
+ * Time 11:20
+ */
+public interface OrderChildOperateRecordService {
+}

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

@@ -16,6 +16,7 @@ import com.clx.performance.component.OrderCancelComponent;
 import com.clx.performance.component.OwnerAccountComponent;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.OrderChildOperateRecordDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dto.OrderCancelDTO;
 import com.clx.performance.enums.*;
@@ -30,6 +31,7 @@ import com.clx.performance.service.*;
 import com.clx.performance.service.child.OrderChildPostService;
 import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.performance.vo.mq.OrderTruckBindCancelParam;
+import com.clx.performance.vo.pc.OrderChildOperateRecordVO;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.clx.user.enums.owner.FreezeSettingEnum;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
@@ -86,6 +88,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
     private final OwnerAccountComponent ownerAccountComponent;
 
+    private final OrderChildOperateRecordDao orderChildOperateRecordDao;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -644,5 +648,10 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         return page;
     }
 
+    @Override
+    public IPage<OrderChildOperateRecordVO> orderChildOperateRecord(OrderChildCancelRecordParam param) {
+        return orderChildOperateRecordDao.orderChildOperateRecord(param);
+    }
+
 
 }
\ No newline at end of file

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

+package com.clx.performance.service.impl;
+
+import com.clx.performance.service.OrderChildOperateRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author jiangwujie
+ * Date 2024-08-08
+ * Time 11:20
+ */
+@Service
+public class OrderChildOperateRecordServiceImpl implements OrderChildOperateRecordService {
+}

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

+package com.clx.performance.sqlProvider;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.pc.OrderChildCancelRecordParam;
+import com.clx.performance.vo.app.OrderChildVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.jdbc.SQL;
+
+public class OrderChildOperateRecordSqlProvider {
+
+    public String orderChildOperateRecord(@Param("page") Page<OrderChildVO> page, @Param("param") OrderChildCancelRecordParam param) {
+        return new SQL() {{
+            SELECT("id," +
+                    "child_no," +
+                    "type," +
+                    "truck_no," +
+                    "driver_name," +
+                    "driver_mobile," +
+                    "send_address," +
+                    "receive_address," +
+                    "good_type_name," +
+                    "remark," +
+                    "operate_time date_format(operate_time, '%Y-%m-%d %H:%i:%s') as operateTime," +
+                    "operator"
+            );
+            FROM("order_child_operate_record ");
+            ORDER_BY("create_time desc");
+        }}.toString();
+    }
+}

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

@@ -207,8 +207,7 @@ public class OrderChildSqlProvider {
                 OrderChildEnum.Status.ARRIVE_SEND.getCode(),
                 OrderChildEnum.Status.LOAD.getCode(),
                 OrderChildEnum.Status.GO_TO_RECEIVE.getCode(),
-                OrderChildEnum.Status.ARRIVE_RECEIVE.getCode(),
-                OrderChildEnum.Status.UNLOAD.getCode()
+                OrderChildEnum.Status.ARRIVE_RECEIVE.getCode()
         );
         conditions.add("status IN (" + StringUtils.join(statuses, ", ") + ")");
         sql.append("AND ");