磅单审核

performance-api/src/main/java/com/clx/performance/enums/OrderChildEnum.java

@@ -25,9 +25,9 @@ public enum OrderChildEnum {
         UNLOAD(80, "收货待确认"),
 
         POUND_AUDIT_FAIL(90, "磅单审核驳回"),
-        UNSETTLED(90, "待结算"),
+        UNSETTLED(100, "待结算"),
 
-        COMPLETE(100, "完成"),
+        COMPLETE(110, "完成"),
 
         DRIVER_CANCEL(210, "司机取消"),
         PLATFORM_CANCEL(220, "平台取消"),

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

+package com.clx.performance.enums;
+
+import com.msl.common.enums.ResultEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum PerformanceResultEnum implements ResultEnum {
+
+
+
+    /**
+     * 系统
+     */
+    SIGN_NULL(1001, "签名不存在"),
+    SIGN_ERROR(1002, "签名错误"),
+    TIMESTAMP_ERROR(1003, "请求不在时间范围内"),
+    INCREMENT_ERROR(1004, "编码生成失败"),
+    HTTP_ERROR(1005, "HTTP请求失败"),
+    LOCK_ERROR(1006,"加锁失败"),
+    TRY_LOCK_ERROR(1007,"操作频繁,请稍后重试"),
+    FEIGN_ERROR(1008, "服务调用失败"),
+    /**
+     * 通用
+     */
+    USER_NULL(1101, "用户不存在"),
+    MOBILE_NULL(1102, "手机号码未注册"),
+    USER_NOT_REGISTER(1103, "用户尚未注册"),
+    USER_NOT_AUTH(1104, "用户暂未实名"),
+    DATA_NOT_FIND(1105, "数据不存在"),
+    DATA_REPEAT(1106, "数据重复"),
+
+
+
+
+    ;
+    private final int code;
+    private final String msg;
+}

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

+package com.clx.performance.param.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * @Author liruixin
+ * @create 2023-09-19 13:33
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PoundAuditParam  {
+
+    @NotBlank(message = "运单编号不能为空")
+    @ApiModelProperty(value="运单编号",example = "201457878")
+    private String childNo;
+
+    @ApiModelProperty(value="审核驳回类型：1装车 2卸车 3装车+卸车",example = "1")
+    private Integer rejectType;
+
+    @ApiModelProperty(value="驳回原因",example = "驳回原因")
+    private String remark;
+
+    @NotNull(message = "审核状态不能为空")
+    @ApiModelProperty(value="审核状态 0-待审核，1-审核失败， 2-审核成功",example = "1")
+    private Integer status;
+
+    @ApiModelProperty(value="装货净重",example = "11")
+    private BigDecimal loadNet;
+
+    @ApiModelProperty(value="卸货净重",example = "22")
+    private BigDecimal unloadNet;
+
+
+}

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

+package com.clx.performance.vo.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildPoundAuditDetailVO {
+
+    @ApiModelProperty(value="运单编号",example = "41441")
+    private String childNo;
+
+    @ApiModelProperty(value="装货净重",example = "10")
+    private BigDecimal loadNet;
+
+    @ApiModelProperty(value="卸货净重",example = "41")
+    private BigDecimal unloadNet;
+
+    @ApiModelProperty(value="审核状态 0-待审核，1-审核失败， 2-审核成功",example = "1")
+    private Integer status;
+
+    @ApiModelProperty(value="备注",example = "41441")
+    private String remark;
+
+    @ApiModelProperty(value="审核驳回类型：1装车 2卸车 3装车+卸车",example = "1")
+    private Integer rejectType;
+
+    @ApiModelProperty(value="装车磅单图片")
+    private List<String> loadImages;
+
+    @ApiModelProperty(value="卸车磅单图片")
+    private List<String> unloadImages;
+
+
+
+}
\ No newline at end of file

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

+package com.clx.performance.vo.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildPoundLogVO {
+
+
+    @ApiModelProperty(value="审核状态 0-待审核，1-审核失败， 2-审核成功",example = "1")
+    private Integer status;
+
+    @ApiModelProperty(value="操作时间",example = "2020-01-01 10:10:10")
+    private String createTime;
+
+    @ApiModelProperty(value="审核人",example = "李瑞")
+    private String createName;
+
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/OrderChildPoundAuditVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/PageOrderChildPoundAuditVO.java

@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 @NoArgsConstructor
-public class OrderChildPoundAuditVO  {
+public class PageOrderChildPoundAuditVO {
 
     @ApiModelProperty(value="运单编号",example = "41441")
     private String childNo;

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

@@ -2,8 +2,11 @@ package com.clx.performance.controller.pc;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.PagePoundAuditParam;
+import com.clx.performance.param.pc.PoundAuditParam;
+import com.clx.performance.service.OrderChildPoundAuditService;
 import com.clx.performance.service.OrderChildService;
-import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
+import com.clx.performance.vo.pc.OrderChildPoundAuditDetailVO;
+import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import com.msl.common.base.PageData;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
@@ -16,10 +19,12 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.constraints.NotBlank;
+
 
 @Slf4j
 @RestController
-@RequestMapping(value="/pc/carrier/poundaudit")
+@RequestMapping(value="/pc/carrier/poundAudit")
 @Validated
 @Api(tags = "承运端-运单")
 @AllArgsConstructor
@@ -27,10 +32,27 @@ public class OrderChildPoundAuditController {
 
     private final OrderChildService orderChildService;
 
+    private final OrderChildPoundAuditService orderChildPoundAuditService;
+
     @ApiOperation(value = "磅单审核列表",notes = "<br>By:李瑞新")
     @PostMapping("/pagePoundAuditList")
-    public Result<PageData<OrderChildPoundAuditVO>> pagePoundAuditList(@RequestBody PagePoundAuditParam param) {
-        IPage<OrderChildPoundAuditVO> page = orderChildService.pagePoundAuditList(param);
+    public Result<PageData<PageOrderChildPoundAuditVO>> pagePoundAuditList(@RequestBody PagePoundAuditParam param) {
+        IPage<PageOrderChildPoundAuditVO> page = orderChildService.pagePoundAuditList(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
+
+
+    @ApiOperation(value = "磅单审核详情",notes = "<br>By:李瑞新")
+    @PostMapping("/getPoundAuditDetail")
+    public Result<OrderChildPoundAuditDetailVO> pagePoundAuditList(@NotBlank(message = "运单编号不能为空") String childNo) {
+        return Result.ok(orderChildPoundAuditService.getPoundAuditDetail(childNo));
+    }
+
+
+    @ApiOperation(value = "磅单审核接口",notes = "<br>By:李瑞新")
+    @PostMapping("/updatePoundAudit")
+    public Result updatePoundAudit(@RequestBody @Validated PoundAuditParam param) {
+        orderChildPoundAuditService.updatePoundAudit(param);
+        return Result.ok();
+    }
 }

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

+package com.clx.performance.controller.pc;
+
+import com.clx.performance.service.OrderChildPoundLogService;
+import com.clx.performance.vo.pc.OrderChildPoundLogVO;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/poundLog")
+@Validated
+@Api(tags = "承运端-运单")
+@AllArgsConstructor
+public class OrderChildPoundLogController {
+
+
+    private final OrderChildPoundLogService orderChildPoundLogService;
+
+    @ApiOperation(value = "磅单审核日志列表",notes = "<br>By:李瑞新")
+    @PostMapping("/getPoundLogList")
+    public Result<List<OrderChildPoundLogVO>> getPoundLogList(@NotBlank(message = "运单编号不能为空") String childNo) {
+        return Result.ok(orderChildPoundLogService.getPoundLogList(childNo));
+    }
+
+}

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.param.pc.PagePoundAuditParam;
-import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
+import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 
@@ -29,7 +29,10 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     long countOfCancel(Long userNo, LocalDateTime startTime, LocalDateTime endTime);
 
-    IPage<OrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param);
+    IPage<PageOrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param);
+
+
+    boolean updatePoundAuditStatus(OrderChild item);
 
 
 }

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

@@ -2,8 +2,11 @@ package com.clx.performance.dao;
 
 import com.clx.performance.mapper.OrderChildImageMapper;
 import com.clx.performance.model.OrderChildImage;
+import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 
+import java.util.List;
+
 /**
  * @Author: aiqinguo
  * @Description: 运单图片
@@ -16,4 +19,6 @@ public interface OrderChildImageDao extends BaseDao<OrderChildImageMapper, Order
     boolean deleteUnload(String childNo);
     boolean deleteLoadAndUnload(String childNo);
 
+    Optional<List<OrderChildImage>> getImages(String childNo, Integer type);
+
 }

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

@@ -2,8 +2,10 @@ package com.clx.performance.dao;
 
 import com.clx.performance.mapper.OrderChildPoundAuditMapper;
 import com.clx.performance.model.OrderChildPoundAudit;
+import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 
+
 /**
  * @Author: aiqinguo
  * @Description: 磅单审核表
@@ -12,5 +14,5 @@ import com.msl.common.dao.BaseDao;
  */
 public interface OrderChildPoundAuditDao extends BaseDao<OrderChildPoundAuditMapper, OrderChildPoundAudit, Integer> {
 
-
+    Optional<OrderChildPoundAudit> getPoundAuditDetail(String childNo);
 }

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

@@ -4,6 +4,8 @@ import com.clx.performance.mapper.OrderChildPoundLogMapper;
 import com.clx.performance.model.OrderChildPoundLog;
 import com.msl.common.dao.BaseDao;
 
+import java.util.List;
+
 /**
  * @Author: aiqinguo
  * @Description: 磅单日志表
@@ -12,5 +14,5 @@ import com.msl.common.dao.BaseDao;
  */
 public interface OrderChildPoundLogDao extends BaseDao<OrderChildPoundLogMapper, OrderChildPoundLog, Integer> {
 
-
+    List<OrderChildPoundLog> getPoundLogList(String childNo);
 }

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

@@ -7,7 +7,7 @@ import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.param.pc.PagePoundAuditParam;
-import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
+import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
@@ -71,8 +71,19 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     }
 
     @Override
-    public IPage<OrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param) {
-        Page<OrderChildPoundAuditVO> page = Page.of(param.getPage(), param.getPageSize());
+    public IPage<PageOrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param) {
+        Page<PageOrderChildPoundAuditVO> page = Page.of(param.getPage(), param.getPageSize());
         return baseMapper.pagePoundAuditList(page,param);
     }
+
+    @Override
+    public boolean updatePoundAuditStatus(OrderChild item) {
+        return update(lUdWrapper()
+                .eq(OrderChild::getChildNo, item.getChildNo())
+                .set(OrderChild::getStatus, item.getStatus())
+                .set(OrderChild::getPoundStatus, item.getPoundStatus())
+                .set(OrderChild::getLoadNet, item.getLoadNet())
+                .set(OrderChild::getUnloadNet, item.getUnloadNet())
+        );
+    }
 }

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

@@ -3,9 +3,12 @@ package com.clx.performance.dao.impl;
 import com.clx.performance.dao.OrderChildImageDao;
 import com.clx.performance.mapper.OrderChildImageMapper;
 import com.clx.performance.model.OrderChildImage;
+import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @Author: aiqinguo
  * @Description: 运单表
@@ -40,4 +43,11 @@ public class OrderChildImageImpl extends BaseDaoImpl<OrderChildImageMapper, Orde
         );
 
     }
+
+    @Override
+    public Optional<List<OrderChildImage>> getImages(String childNo, Integer type) {
+        return Optional.ofEmpty(list(lQrWrapper()
+                .eq(OrderChildImage::getChildNo, childNo)
+                .eq(OrderChildImage::getType, type)));
+    }
 }

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

@@ -3,9 +3,11 @@ package com.clx.performance.dao.impl;
 import com.clx.performance.dao.OrderChildPoundAuditDao;
 import com.clx.performance.mapper.OrderChildPoundAuditMapper;
 import com.clx.performance.model.OrderChildPoundAudit;
+import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
+
 /**
  * @Author: aiqinguo
  * @Description: 磅单审核表
@@ -14,5 +16,11 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public class OrderChildPoundAuditDaoImpl extends BaseDaoImpl<OrderChildPoundAuditMapper, OrderChildPoundAudit, Integer> implements OrderChildPoundAuditDao {
-
+    @Override
+    public Optional<OrderChildPoundAudit> getPoundAuditDetail(String childNo) {
+        return Optional.ofNullable(super.getOne(lQrWrapper()
+                .eq(OrderChildPoundAudit::getChildNo, childNo)
+                .orderByDesc(OrderChildPoundAudit::getId)
+                .last("lim1t 1")));
+    }
 }

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

@@ -6,6 +6,8 @@ import com.clx.performance.model.OrderChildPoundLog;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @Author: aiqinguo
  * @Description: 磅单日志表
@@ -14,5 +16,8 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public class OrderChildPoundLogDaoImpl extends BaseDaoImpl<OrderChildPoundLogMapper, OrderChildPoundLog, Integer> implements OrderChildPoundLogDao {
-
+    @Override
+    public List<OrderChildPoundLog> getPoundLogList(String childNo) {
+        return list(lQrWrapper().eq(OrderChildPoundLog::getChildNo,childNo));
+    }
 }

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.sqlProvider.OrderChildSqlProvider;
-import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
+import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;
@@ -17,6 +17,6 @@ import org.apache.ibatis.annotations.SelectProvider;
 public interface OrderChildMapper extends BaseMapper<OrderChild> {
 
     @SelectProvider(type = OrderChildSqlProvider.class, method = "pagePoundAuditList")
-    IPage<OrderChildPoundAuditVO> pagePoundAuditList(@Param("page") Page<OrderChildPoundAuditVO> page, @Param("param") PagePoundAuditParam param);
+    IPage<PageOrderChildPoundAuditVO> pagePoundAuditList(@Param("page") Page<PageOrderChildPoundAuditVO> page, @Param("param") PagePoundAuditParam param);
 
 }
\ No newline at end of file

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

@@ -5,11 +5,14 @@ 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.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Optional;
 
 /**
 * @Author: aiqinguo
@@ -41,4 +44,43 @@ public class OrderChildPoundAudit implements HasKey<Integer> {
         return id;
     }
 
+
+    @Getter
+    @AllArgsConstructor
+    public enum AuditStatus {
+
+        AUDIT(0, "待审核"),
+        FAIL(1, "审核失败"),
+        SUCCESS(2, "审核成功")
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<OrderChildPoundAudit.AuditStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+
+    @Getter
+    @AllArgsConstructor
+    public enum RejectType {
+
+
+        LOAD_FAIL(1, "装车"),
+        UNLOAD_FAIL(2, "卸车"),
+        LOAD_UNLOAD_FAIL(3, "装车+卸车"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<OrderChildPoundAudit.RejectType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
 }
\ No newline at end of file

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

@@ -5,10 +5,10 @@ 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 lombok.ToString;
+import lombok.*;
+
+import java.util.Arrays;
+import java.util.Optional;
 
 /**
 * @Author: aiqinguo
@@ -21,6 +21,8 @@ import lombok.ToString;
 @Setter
 @NoArgsConstructor
 @TableName(autoResultMap = true)
+@Builder
+@AllArgsConstructor
 public class OrderChildPoundLog implements HasKey<Integer> {
 
     @TableId(value = "id", type = IdType.AUTO)
@@ -40,4 +42,24 @@ public class OrderChildPoundLog implements HasKey<Integer> {
         return id;
     }
 
+
+    @Getter
+    @AllArgsConstructor
+    public enum CreateType {
+
+
+        OWNER(1, "货主"),
+        CARRIER(2, "承运端"),
+        DRIVER(3, "司机"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<CreateType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
 }
\ No newline at end of file

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

 package com.clx.performance.service;
 
 
-
+import com.clx.performance.param.pc.PoundAuditParam;
+import com.clx.performance.vo.pc.OrderChildPoundAuditDetailVO;
 
 /**
  * @author liruixin
  * Date 2023-09-19
  * Time 13:25
  */
+
 public interface OrderChildPoundAuditService  {
+
+    OrderChildPoundAuditDetailVO getPoundAuditDetail(String childNo);
+
+
+    void updatePoundAudit(PoundAuditParam param);
 }

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

 package com.clx.performance.service;
 
 
+import com.clx.performance.vo.pc.OrderChildPoundLogVO;
+
+import java.util.List;
 
 /**
  * @author liruixin
@@ -8,4 +11,6 @@ package com.clx.performance.service;
  * Time 13:25
  */
 public interface OrderChildPoundLogService {
+
+    List<OrderChildPoundLogVO> getPoundLogList(String childNo);
 }

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.app.*;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.vo.app.SaveOrderChildVO;
-import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
+import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 
 
 /**
@@ -31,6 +31,6 @@ public interface OrderChildService {
 
     void updateCancel(OrderChildCancelParam param);
 
-    IPage<OrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param);
+    IPage<PageOrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param);
 
 }

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

 package com.clx.performance.service.impl;
 
 
-
+import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.OrderChildImageDao;
+import com.clx.performance.dao.OrderChildPoundAuditDao;
+import com.clx.performance.dao.OrderChildPoundLogDao;
+import com.clx.performance.enums.OrderChildEnum;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderChildImage;
+import com.clx.performance.model.OrderChildPoundAudit;
+import com.clx.performance.model.OrderChildPoundLog;
+import com.clx.performance.param.pc.PoundAuditParam;
 import com.clx.performance.service.OrderChildPoundAuditService;
+import com.clx.performance.vo.pc.OrderChildPoundAuditDetailVO;
+import com.msl.common.enums.ResultCodeEnum;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @author liruixin
  * Date 2023-09-19
  * Time 13:25
  */
+@Slf4j
 @Service
+@AllArgsConstructor
 public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditService {
+
+    private final OrderChildImageDao orderChildImageDao;
+
+    private final OrderChildPoundAuditDao orderChildPoundAuditDao;
+
+    private final OrderChildPoundLogDao orderChildPoundLogDao;
+
+    private final OrderChildDao orderChildDao;
+
+
+    @Override
+    public OrderChildPoundAuditDetailVO getPoundAuditDetail(String childNo) {
+        OrderChildPoundAudit poundAuditDetail = orderChildPoundAuditDao.getPoundAuditDetail(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        List<OrderChildImage> loadImages = orderChildImageDao.getImages(childNo, OrderChildImage.Type.LOAD.getCode()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        List<OrderChildImage> unloadImages = orderChildImageDao.getImages(childNo, OrderChildImage.Type.UNLOAD.getCode()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        OrderChildPoundAuditDetailVO vo = new OrderChildPoundAuditDetailVO();
+        vo.setChildNo(childNo);
+        vo.setLoadImages(loadImages.stream().map(OrderChildImage::getImage).collect(Collectors.toList()));
+        vo.setUnloadImages(unloadImages.stream().map(OrderChildImage::getImage).collect(Collectors.toList()));
+        vo.setLoadNet(poundAuditDetail.getLoadNet());
+        vo.setUnloadNet(poundAuditDetail.getUnloadNet());
+        vo.setStatus(poundAuditDetail.getStatus());
+        vo.setRemark(poundAuditDetail.getRemark());
+        vo.setRejectType(poundAuditDetail.getRejectType());
+        return vo;
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updatePoundAudit(PoundAuditParam param) {
+
+        OrderChild orderChild = orderChildDao.getByChildNo(param.getChildNo()).orElseThrow(ResultCodeEnum.FAIL);
+
+        OrderChildPoundAudit poundAuditDetail = orderChildPoundAuditDao.getPoundAuditDetail(param.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        poundAuditDetail.setStatus(param.getStatus());
+        orderChild.setStatus(OrderChildEnum.Status.UNSETTLED.getCode());
+        if(Objects.equals(param.getStatus(),OrderChildPoundAudit.AuditStatus.FAIL)){
+            poundAuditDetail.setStatus(param.getStatus());
+            poundAuditDetail.setRejectType(param.getRejectType());
+            poundAuditDetail.setRemark(param.getRemark());
+            orderChild.setStatus(OrderChildEnum.Status.POUND_AUDIT_FAIL.getCode());
+        }
+        if(Objects.nonNull(param.getLoadNet())){
+            poundAuditDetail.setLoadNet(param.getLoadNet());
+        }
+        if(Objects.nonNull(param.getUnloadNet())){
+            poundAuditDetail.setUnloadNet(param.getUnloadNet());
+        }
+        orderChildPoundAuditDao.saveEntity(poundAuditDetail);
+
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        OrderChildPoundLog poundLog = OrderChildPoundLog.builder().childNo(param.getChildNo()).status(param.getStatus()).createType(OrderChildPoundLog.CreateType.CARRIER.getCode())
+                .createBy(loginUserInfo.getUserNo()).createName(loginUserInfo.getUserName()).build();
+
+        orderChildPoundLogDao.saveEntity(poundLog);
+
+        if(Objects.nonNull(param.getLoadNet())){
+            orderChild.setLoadNet(param.getLoadNet());
+        }
+        if(Objects.nonNull(param.getUnloadNet())){
+            orderChild.setUnloadNet(param.getUnloadNet());
+        }
+        orderChild.setPoundStatus(param.getStatus());
+        orderChildDao.updatePoundAuditStatus(orderChild);
+
+    }
 }

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

 package com.clx.performance.service.impl;
 
 
-
+import com.clx.performance.dao.OrderChildPoundLogDao;
+import com.clx.performance.model.OrderChildPoundLog;
 import com.clx.performance.service.OrderChildPoundLogService;
+import com.clx.performance.struct.OrderChildPoundLogStruct;
+import com.clx.performance.vo.pc.OrderChildPoundLogVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author liruixin
  * Date 2023-09-19
  * Time 13:25
  */
+@Slf4j
 @Service
+@AllArgsConstructor
 public class OrderChildPoundLogServiceImpl  implements OrderChildPoundLogService {
+
+    private final OrderChildPoundLogDao orderChildPoundLogDao;
+
+    private final OrderChildPoundLogStruct orderChildPoundLogStruct;
+
+    @Override
+    public List<OrderChildPoundLogVO> getPoundLogList(String childNo) {
+        List<OrderChildPoundLog> poundLogList = orderChildPoundLogDao.getPoundLogList(childNo);
+        return orderChildPoundLogStruct.convert(poundLogList);
+    }
 }

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

@@ -14,7 +14,7 @@ import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.OrderChildService;
 import com.clx.performance.vo.app.SaveOrderChildVO;
-import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
+import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import com.msl.common.enums.ResultCodeEnum;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.utils.DateUtils;
@@ -476,7 +476,7 @@ public class OrderChildServiceImpl implements OrderChildService {
     }
 
     @Override
-    public IPage<OrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param) {
+    public IPage<PageOrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param) {
         return orderChildDao.pagePoundAuditList(param);
     }
 }

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

@@ -3,7 +3,7 @@ package com.clx.performance.sqlProvider;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.param.pc.PagePoundAuditParam;
-import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
+import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;
@@ -12,7 +12,7 @@ import java.util.Objects;
 
 public class OrderChildSqlProvider {
 
-    public String pagePoundAuditList(@Param("page") Page<OrderChildPoundAuditVO> page, @Param("param") PagePoundAuditParam param) {
+    public String pagePoundAuditList(@Param("page") Page<PageOrderChildPoundAuditVO> page, @Param("param") PagePoundAuditParam param) {
         return new SQL(){{
             SELECT("child_no,goods_name,send_address,receive_address,driver_name,driver_mobile,load_net,unload_net," +
                     "pound_status,date_format(pay_time, '%Y-%m-%d %H:%i:%s') as payTime," +

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

+package com.clx.performance.struct;
+
+import com.clx.performance.model.OrderChildPoundLog;
+import com.clx.performance.vo.pc.OrderChildPoundLogVO;
+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 OrderChildPoundLogStruct {
+
+    List<OrderChildPoundLogVO> convert(List<OrderChildPoundLog> item);
+
+}