Merge remote-tracking branch 'origin/v4.9_create_goods_child_20230918' into…

performance-api/src/main/java/com/clx/order/params/OrderGoodsChildParams.java

@@ -6,6 +6,7 @@ import lombok.Setter;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Getter
 @Setter
@@ -43,12 +44,15 @@ public class OrderGoodsChildParams {
     private String seniorLogisticsManagerName;
 
 
-    @ApiModelProperty(value = "定向运单失效时间", example = "2023-09-09 12:00:01", required = true)
-    private String directionalExpireTime;
+//    @ApiModelProperty(value = "定向运单失效时间", example = "2023-09-09 12:00:01", required = true)
+//    private String directionalExpireTime;
 
     @ApiModelProperty("创建人用户编号")
     private Long userNo;
 
     @ApiModelProperty("创建人姓名")
     private String userName;
+
+    @ApiModelProperty("车辆列表")
+    private List<String> trackList;
 }

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

@@ -15,7 +15,7 @@ public enum OrderChildEnum {
 
         CREATED(10, "已接单"),
 
-        PAYING(20, "支付中"),
+        PAY(20, "支付"),
 
         GO_TO_SEND(30, "前往货源地"),
         ARRIVE_SEND(40, "到达货源地"),
@@ -24,7 +24,7 @@ public enum OrderChildEnum {
         ARRIVE_RECEIVE(70 , "到达目的地"),
         UNLOAD(80, "收货待确认"),
 
-        UNSETTLED(90, "待结算"),
+        UNSETTLE(90, "待结算"),
 
         COMPLETE(100, "完成"),
 

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

@@ -12,20 +12,27 @@ public enum OrderChildLogEnum {
     @Getter
     @AllArgsConstructor
     public enum Type {
-        CREATED(1, "接单成功"),
+        CREATED(11, "接单成功"),
 
-        GO_TO_SEND(21, "前往货源地"),
-        ARRIVE_SEND(22, "到达货源地"),
-        GO_TO_RECEIVE(23, "前往目的地"),
-        ARRIVE_RECEIVE(24 , "到达目的地"),
+        PAY(21, "支付成功"),
 
-        LOAD(31, "提交装货信息"),
-        UNLOAD(32, "提交卸货信息"),
-        RELOAD(33, "修改装货信息"),
-        REUNLOAD(34, "修改卸货信息"),
-        RELOAD_AND_REUNLOAD(35, "修改装货、卸货信息"),
+        GO_TO_SEND(31, "前往货源地"),
+        ARRIVE_SEND(32, "到达货源地"),
+        GO_TO_RECEIVE(33, "前往目的地"),
+        ARRIVE_RECEIVE(34 , "到达目的地"),
 
-        DRIVER_CONFIRM(41, "司机确认收货"),
+        LOAD(41, "提交装货信息"),
+        UNLOAD(42, "提交卸货信息"),
+        RELOAD(43, "修改装货信息"),
+        REUNLOAD(44, "修改卸货信息"),
+        RELOAD_AND_REUNLOAD(45, "修改装货、卸货信息"),
+
+        DRIVER_CONFIRM(51, "司机确认收货"),
+
+        SETTLEMENT(61, "结算成功"),
+
+        POUND_AUDIT(71, "磅单审核通过"),
+        POUND_AUDIT_REJECT(72, "磅单审核驳回"),
 
         COMPLETE(100, "完成"),
 

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

@@ -35,6 +35,7 @@ public enum PerformanceResultEnum implements ResultEnum {
 
     ORDER_NO_FOUND(1200, "货单不存在"),
     ORDER_WEIGHT_LACK(1200, "剩余数量不足"),
+    ORDER_INVALID(1200, "无效的货单"),
 
 
     ORDER_CHILD_NO_FOUND(1301, "运单不存在"),

performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java

+package com.clx.performance.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@FeignClient(name = "clx-performance")
+public interface PerformanceFeign {
+
+    /**
+     * 通过货单号获取定向车辆
+     *
+     * @param orderGoodsNo
+     * @return
+     */
+    @GetMapping(value = {"clx-performance/feign/orderGoodsDriverTruck/getTrucksByOrderGoodsNo"})
+    List<Integer> getTrucksByOrderGoodsNo(@RequestParam("orderGoodsNo") @NotBlank(message = "货单编号不可为空") String orderGoodsNo);
+
+}

performance-api/src/main/java/com/clx/performance/param/app/PageOrderChildParam.java → performance-api/src/main/java/com/clx/performance/param/app/PageOrderChildOfDriverParam.java

@@ -11,30 +11,21 @@ import lombok.ToString;
 @Setter
 @NoArgsConstructor
 @ToString
-public class PageOrderChildParam extends PageParam {
+public class PageOrderChildOfDriverParam extends PageParam {
 
-    @ApiModelProperty(value="运单编号",example = "1000000")
-    private String childNo;
-
-    @ApiModelProperty(value="司机姓名",example = "张三")
-    private String driverName;
-
-    @ApiModelProperty(value="司机手机号",example = "13000000000")
-    private String driverMobile;
-
-    @ApiModelProperty(value="发货地址",example = "北京")
-    private String sendAddress;
-
-    @ApiModelProperty(value="收货地址",example = "黄羊城")
-    private String receiveAddress;
+    @ApiModelProperty(value = "搜索内容", example = "北京")
+    private String content;
 
     @ApiModelProperty(value="状态",example = "1")
     private Integer status;
 
-    @ApiModelProperty(value="开始时间",example = "2020-01-01 10:10:10")
+    @ApiModelProperty(value="开始时间")
     private String beginTime;
 
-    @ApiModelProperty(value = "结束时间",example = "2020-01-01 10:10:10")
+    @ApiModelProperty(value = "结束时间")
     private String endTime;
 
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+
 }

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

@@ -31,6 +31,8 @@ public class OrderChildVO {
     private Long userNo;
     @ApiModelProperty(value = "货主用户编号", example = "")
     private Long ownerUserNo;
+    @ApiModelProperty(value = "货主名称", example = "")
+    private String ownerName;
     @ApiModelProperty(value = "运单编号", example = "")
     private String childNo;
     @ApiModelProperty(value = "货单编号", example = "")
@@ -83,10 +85,13 @@ public class OrderChildVO {
     @ApiModelProperty(value = "拉运重量（单位吨）", example = "")
     private BigDecimal weight;
 
-    @ApiModelProperty(value = "磅单审核状态", example = "")
+    @ApiModelProperty(value = "取消原因", example = "")
+    private String cancelRemark;
+    @ApiModelProperty(value = "磅单审核状态 0 待审核 1 审核通过 2 审核驳回", example = "")
     private Integer poundStatus;
     @ApiModelProperty(value = "状态", example = "")
     private Integer status;
+
     @ApiModelProperty(value = "支付时间", example = "")
     private String payTime;
     @ApiModelProperty(value = "装车时间", example = "")

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

@@ -41,9 +41,15 @@ public class OrderGoodsVO {
     @ApiModelProperty("剩余拉运吨数")
     private BigDecimal residueTransportWeight;
 
+    @ApiModelProperty("已拉运吨数")
+    private BigDecimal alreadyTransportWeight;
+
     @ApiModelProperty("发货地址ID")
     private Integer sendAddressId;
 
+    @ApiModelProperty(value = "发货地址全称")
+    private String sendAddressAll;
+
     @ApiModelProperty("发货地址简称")
     private String sendAddressShorter;
 
@@ -56,6 +62,9 @@ public class OrderGoodsVO {
     @ApiModelProperty("收货地址ID")
     private Integer receiveAddressId;
 
+    @ApiModelProperty(value="收货地址全称")
+    private String reveiveAddressAll;
+
     @ApiModelProperty("收货地址简称")
     private String receiveAddressShorter;
 

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

@@ -123,7 +123,7 @@ public class AppDriverOrderChildController {
 
     @ApiOperation(value = "分页查询运单列表",notes = "<br>By:艾庆国")
     @PostMapping("/pageOrderChild")
-    public Result<PageData<OrderChildVO>> pageOrderChild(@RequestBody PageOrderChildParam param) {
+    public Result<PageData<OrderChildVO>> pageOrderChild(@RequestBody PageOrderChildOfDriverParam param) {
         IPage<OrderChildVO> page = orderChildService.pageOrderChild(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }

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

@@ -65,7 +65,7 @@ public class AppGoodsOrderController {
     @GetMapping("/getOrderGoodsInfo")
     @UnitCovert(param = false)
     public Result<OrderGoodsVO> getOrderGoodsInfo(@RequestParam String orderGoodsNo) {
-        return Result.ok(orderGoodsService.getOrderGoodsInfoByOrderGoodsNo(orderGoodsNo));
+        return Result.ok(orderGoodsService.getOrderGoodsInfoByOrderGoodsNoForAPP(orderGoodsNo));
     }
 
 }

performance-web/src/main/java/com/clx/performance/controller/feign/TruckFeignController.java

+package com.clx.performance.controller.feign;
+
+import com.clx.performance.service.OrderGoodsDriverTruckService;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@RestController
+@RequestMapping("/feign/orderGoodsDriverTruck")
+@Validated
+@Api(tags = "定向车辆Feign")
+@AllArgsConstructor
+public class TruckFeignController {
+
+    private final OrderGoodsDriverTruckService truckService;
+
+    @GetMapping({"/getTrucksByOrderGoodsNo"})
+    Result<List<Integer>> getTrucksByOrderGoodsNo(@RequestParam("orderGoodsNo") @NotNull(message = "货单编号不可为空") String orderGoodsNo){
+        return Result.ok(truckService.getTrucksByOrderGoodsNo(orderGoodsNo));
+    }
+
+}

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

@@ -128,9 +128,9 @@ public class GoodsOrderController {
 
                     orderGoods.setLastArriveSendTime(DateUtils.parseDateTime(child.getLastArriveSendTime()).get());
                     //定向运单失效时间
-                    orderGoods.setDirectionalExpireTime(DateUtils.parseDateTime(child.getDirectionalExpireTime()).get());
-                    orderGoods.setSeniorLogisticsManagerId(child.getSeniorLogisticsManagerId());
-                    orderGoods.setSeniorLogisticsManagerName(child.getSeniorLogisticsManagerName());
+//                    orderGoods.setDirectionalExpireTime(DateUtils.parseDateTime(child.getDirectionalExpireTime()).get());
+//                    orderGoods.setSeniorLogisticsManagerId(child.getSeniorLogisticsManagerId());
+//                    orderGoods.setSeniorLogisticsManagerName(child.getSeniorLogisticsManagerName());
 
                     orderGoods.setOrderNo(orderNo);
                     orderGoods.setOrderGoodsType(OrderGoodsTypeEnum.Status.PLATFORM.getCode());
@@ -192,9 +192,9 @@ public class GoodsOrderController {
 
                     orderGoods.setLastArriveSendTime(DateUtils.parseDateTime(child.getLastArriveSendTime()).get());
                     //定向运单失效时间
-                    orderGoods.setDirectionalExpireTime(DateUtils.parseDateTime(child.getDirectionalExpireTime()).get());
-                    orderGoods.setSeniorLogisticsManagerId(child.getSeniorLogisticsManagerId());
-                    orderGoods.setSeniorLogisticsManagerName(child.getSeniorLogisticsManagerName());
+//                    orderGoods.setDirectionalExpireTime(DateUtils.parseDateTime(child.getDirectionalExpireTime()).get());
+//                    orderGoods.setSeniorLogisticsManagerId(child.getSeniorLogisticsManagerId());
+//                    orderGoods.setSeniorLogisticsManagerName(child.getSeniorLogisticsManagerName());
 
                     orderGoods.setOrderNo(orderNo);
                     orderGoods.setOrderGoodsType(OrderGoodsTypeEnum.Status.PLATFORM.getCode());
@@ -253,15 +253,16 @@ public class GoodsOrderController {
     @GetMapping("/getOrderGoodsInfo")
     @UnitCovert(param = false)
     public Result<OrderGoodsVO> getOrderGoodsInfo(@RequestParam String orderGoodsNo) {
-        return Result.ok(orderGoodsService.getOrderGoodsInfoByOrderGoodsNo(orderGoodsNo));
+        return Result.ok(orderGoodsService.getOrderGoodsInfoByOrderGoodsNoForPC(orderGoodsNo));
     }
 
     @ApiOperation(value = "查看货单列表", notes = "<br>By:胡宇帆")
     @PostMapping("/pageOrderGoodsList")
     @UnitCovert(param = false)
-    public Result<PageData<OrderGoodsVO>> pageOrderGoodsList(@RequestBody @Validated PageOrderGoodsListParam param) {
+    public Result<PageData<OrderGoodsVO>> pageOrderGoodsList(@RequestBody PageOrderGoodsListParam param) {
         if (StringUtils.isNotBlank(param.getOrderGoodsNo())) {
             param.setOrderGoodsType(param.getOrderGoodsNo().substring(0, 2));
+            param.setOrderNo(param.getOrderGoodsNo().substring(2));
         }
         IPage<OrderGoodsVO> page = orderGoodsService.pageOrderGoodsList(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());

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

@@ -44,7 +44,7 @@ public class OrderChildPoundAuditController {
 
     @ApiOperation(value = "磅单审核详情",notes = "<br>By:李瑞新")
     @PostMapping("/getPoundAuditDetail")
-    public Result<OrderChildPoundAuditDetailVO> pagePoundAuditList(@NotBlank(message = "运单编号不能为空") String childNo) {
+    public Result<OrderChildPoundAuditDetailVO> getPoundAuditDetail(@NotBlank(message = "运单编号不能为空") String childNo) {
         return Result.ok(orderChildPoundAuditService.getPoundAuditDetail(childNo));
     }
 

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

@@ -3,7 +3,9 @@ package com.clx.performance.dao;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.param.app.PageOrderChildOfDriverParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
+import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
@@ -18,18 +20,19 @@ import java.time.LocalDateTime;
  */
 public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Integer> {
 
+    boolean updateStatus(OrderChild item);
     boolean updateCancel(OrderChild item);
-    boolean updateLoad(OrderChild item);
 
+    boolean updateLoad(OrderChild item);
     boolean updateUnload(OrderChild item);
     boolean updateLoadAndUnload(OrderChild item);
-    boolean updateDriverConfirm(OrderChild item);
-    boolean updateStatus(OrderChild item);
 
     Optional<OrderChild> getByChildNo(String childNo);
 
     long countOfCancel(Long userNo, LocalDateTime startTime, LocalDateTime endTime);
 
+    IPage<OrderChildVO> pageOrderChildOfDriver(PageOrderChildOfDriverParam param);
+
     IPage<PageOrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param);
 
 

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

@@ -2,11 +2,14 @@ package com.clx.performance.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.performance.mapper.OrderGoodsMapper;
+import com.clx.performance.model.OrderGoods;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
-import com.clx.performance.mapper.OrderGoodsMapper;
-import com.clx.performance.model.OrderGoods;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
 
 /**
  * @author kavin
@@ -14,11 +17,16 @@ import com.clx.performance.model.OrderGoods;
  * Time 16:45
  */
 public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Integer> {
+    boolean updateWeight(@Param("orderId")Integer orderId, @Param("weight") BigDecimal weight);
+
     Long getMaxOrderGoodsId(String type);
 
     Optional<OrderGoods> getByOrderGoodsNo(String orderGoodsNo);
 
-    Optional<OrderGoods> getOrderGoodsInfoByOrderGoodsNo(String orderGoodsNo);
+    Optional<OrderGoods> getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo);
+
+    Optional<OrderGoods> getOrderGoodsInfoByOrderGoodsNoForAPP(String orderGoodsNo);
+
 
     IPage<OrderGoodsVO> pageOrderGoodsList(PageOrderGoodsListParam param);
 }

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

@@ -4,10 +4,13 @@ import com.msl.common.dao.BaseDao;
 import com.clx.performance.mapper.OrderGoodsDriverTruckMapper;
 import com.clx.performance.model.OrderGoodsDriverTruck;
 
+import java.util.List;
+
 /**
  * @author kavin
  * Date 2023-09-17
  * Time 16:45
  */
 public interface OrderGoodsDriverTruckDao extends BaseDao<OrderGoodsDriverTruckMapper, OrderGoodsDriverTruck, Integer> {
+    List<Integer> getTrucksByOrderGoodsNo(String orderGoodsNo);
 }

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

@@ -6,7 +6,9 @@ import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.param.app.PageOrderChildOfDriverParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
+import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
@@ -22,6 +24,15 @@ import java.time.LocalDateTime;
  */
 @Repository
 public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild, Integer> implements OrderChildDao {
+
+    @Override
+    public boolean updateStatus(OrderChild item) {
+        return update(lUdWrapper()
+                .eq(OrderChild::getChildNo, item.getChildNo())
+                .set(OrderChild::getStatus, item.getStatus())
+        );
+    }
+
     @Override
     public boolean updateCancel(OrderChild item) {
         return update(lUdWrapper()
@@ -54,6 +65,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
 
                 .set(OrderChild::getUnloadTime, item.getUnloadTime())
                 .set(OrderChild::getWeight, item.getWeight())
+                .set(OrderChild::getPoundStatus, item.getPoundStatus())
                 .set(OrderChild::getStatus, item.getStatus())
         );
     }
@@ -76,21 +88,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         );
     }
 
-    @Override
-    public boolean updateDriverConfirm(OrderChild item) {
-        return update(lUdWrapper()
-                .eq(OrderChild::getChildNo, item.getChildNo())
-                .set(OrderChild::getStatus, item.getStatus())
-        );
-    }
-
-    @Override
-    public boolean updateStatus(OrderChild item) {
-        return update(lUdWrapper()
-                .eq(OrderChild::getChildNo, item.getChildNo())
-                .set(OrderChild::getStatus, item.getStatus())
-        );
-    }
 
     @Override
     public Optional<OrderChild> getByChildNo(String childNo) {
@@ -112,6 +109,12 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         );
     }
 
+    @Override
+    public IPage<OrderChildVO> pageOrderChildOfDriver(PageOrderChildOfDriverParam param) {
+        Page<OrderChildVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageOrderChildOfDriver(page,param);
+    }
+
     @Override
     public IPage<PageOrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param) {
         Page<PageOrderChildPoundAuditVO> page = Page.of(param.getPage(), param.getPageSize());

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

@@ -3,17 +3,17 @@ package com.clx.performance.dao.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.params.PageOrderGoodsListParam;
-import com.clx.order.vo.feign.FeignPageOrderVO;
 import com.clx.performance.dao.OrderGoodsDao;
-import com.clx.performance.vo.pc.OrderGoodsVO;
-import com.msl.common.dao.BaseDao;
-import com.msl.common.dao.impl.BaseDaoImpl;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.math.BigDecimal;
+
 /**
  * @author kavin
  * Date 2023-09-17
@@ -22,6 +22,11 @@ import org.springframework.stereotype.Repository;
 @Repository
 public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods, Integer> implements OrderGoodsDao {
 
+    @Override
+    public boolean updateWeight(@Param("orderId")Integer orderId, @Param("weight") BigDecimal weight) {
+         return baseMapper.updateWeight(orderId, weight)>0;
+    }
+
     @Override
     public Long getMaxOrderGoodsId(String type) {
         return baseMapper.getMaxOrderGoodsId(type);
@@ -31,16 +36,27 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     public Optional<OrderGoods> getByOrderGoodsNo(String orderGoodsNo) {
         return Optional.of(orderGoodsNo)
                 .map(item -> lQrWrapper()
-                        .eq(OrderGoods::getUserNo, item)
+                        .eq(OrderGoods::getOrderGoodsNo, item)
+                )
+                .map(super::getOne);
+    }
+
+    @Override
+    public Optional<OrderGoods> getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo) {
+        return Optional.of(orderGoodsNo)
+                .map(item -> lQrWrapper()
+                        .eq(OrderGoods::getOrderGoodsType, item.substring(0,2))
+                        .eq(OrderGoods::getOrderGoodsNo, item.substring(2))
                 )
                 .map(super::getOne);
     }
 
     @Override
-    public Optional<OrderGoods> getOrderGoodsInfoByOrderGoodsNo(String orderGoodsNo) {
+    public Optional<OrderGoods> getOrderGoodsInfoByOrderGoodsNoForAPP(String orderGoodsNo) {
         return Optional.of(orderGoodsNo)
                 .map(item -> lQrWrapper()
-                        .eq(OrderGoods::getOrderGoodsNo, item)
+                        .eq(OrderGoods::getOrderGoodsType, item.substring(0,2))
+                        .eq(OrderGoods::getOrderGoodsNo, item.substring(2))
                 )
                 .map(super::getOne);
     }

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

@@ -7,6 +7,8 @@ import com.clx.performance.mapper.OrderGoodsDriverTruckMapper;
 import com.clx.performance.model.OrderGoodsDriverTruck;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author kavin
  * Date 2023-09-17
@@ -14,4 +16,8 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public class OrderGoodsDriverTruckDaoImpl extends BaseDaoImpl<OrderGoodsDriverTruckMapper, OrderGoodsDriverTruck, Integer> implements OrderGoodsDriverTruckDao {
+    @Override
+    public List<Integer> getTrucksByOrderGoodsNo(String orderGoodsNo) {
+        return baseMapper.getTrucksByOrderGoodsNo(orderGoodsNo);
+    }
 }

performance-web/src/main/java/com/clx/performance/listener/OrderGoodsDriverTruckListener.java

+//package com.clx.performance.listener;
+//
+//import com.clx.performance.constant.RabbitKeyConstants;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.amqp.rabbit.annotation.RabbitListener;
+//import org.springframework.stereotype.Component;
+//
+//@Component
+//@Slf4j
+//public class OrderGoodsDriverTruckListener {
+//
+//
+//    @RabbitListener(queues = RabbitKeyConstants.ORDER_ON_DEAD_QUEUE)
+//    public void onMessage(String message) throws Exception {
+//        log.info("处理订单状态由已挂单变为挂弹中监听器执行,订单ID为{}", message);
+//        if (StringUtils.isBlank(message)) {
+//            return;
+//        }
+//        OrderInfo orderInfo = orderInfoDao.getByOrderNo(message);
+//        if (orderInfo == null) {
+//            log.info("处理订单状态由已挂单变为挂弹中监听器未查询到订单数据,消息为{}", message);
+//            return;
+//        }
+//        if (OrderEnum.Status.POST_ORDER.getCode().equals(orderInfo.getOrderStatus())) {
+//            log.info("处理订单状态由已挂单变为挂单中监听器执行,从状态{}-----变更为{}", OrderEnum.Status.POST_ORDER.getName(), OrderEnum.Status.ON_ORDER.getName());
+//            orderInfoDao.updateOrderStatusById(orderInfo.getId(), OrderEnum.Status.ON_ORDER.getCode());
+//        }
+//    }
+//}

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

@@ -4,8 +4,10 @@ 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.OrderChild;
+import com.clx.performance.param.app.PageOrderChildOfDriverParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.sqlProvider.OrderChildSqlProvider;
+import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,6 +18,14 @@ import org.apache.ibatis.annotations.SelectProvider;
 @Mapper
 public interface OrderChildMapper extends BaseMapper<OrderChild> {
 
+    /**
+     * 司机运单列表
+     * @see OrderChildSqlProvider#pageOrderChildOfDriver(Page, PageOrderChildOfDriverParam)
+     */
+    @SelectProvider(type = OrderChildSqlProvider.class, method = "pageOrderChildOfDriver")
+    IPage<OrderChildVO> pageOrderChildOfDriver(@Param("page") Page<OrderChildVO> page, @Param("param") PageOrderChildOfDriverParam param);
+
+
     @SelectProvider(type = OrderChildSqlProvider.class, method = "pagePoundAuditList")
     IPage<PageOrderChildPoundAuditVO> pagePoundAuditList(@Param("page") Page<PageOrderChildPoundAuditVO> page, @Param("param") PagePoundAuditParam param);
 

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

@@ -2,6 +2,10 @@ package com.clx.performance.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.clx.performance.model.OrderGoodsDriverTruck;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * @author kavin
@@ -9,4 +13,7 @@ import com.clx.performance.model.OrderGoodsDriverTruck;
  * Time 16:45
  */
 public interface OrderGoodsDriverTruckMapper extends BaseMapper<OrderGoodsDriverTruck> {
+
+    @Select("select truck_id from order_goods_driver_truck where order_goods_no=#{orderGoodsNo}")
+    List<Integer> getTrucksByOrderGoodsNo(@Param("orderGoodsNo") String orderGoodsNo);
 }

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

@@ -7,7 +7,11 @@ import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.sqlProvider.OrderGoodsSqlProvider;
 import com.clx.performance.vo.pc.OrderGoodsVO;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.Update;
+
+import java.math.BigDecimal;
 
 /**
  * @author kavin
@@ -16,6 +20,11 @@ import org.apache.ibatis.annotations.SelectProvider;
  */
 public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
 
+    @Update(" update order_goods set " +
+            " residue_transport_weight = residue_transport_weight-#{weight}, " +
+            " where id = #{orderId}")
+    int updateWeight(@Param("orderId")Integer orderId, @Param("weight")BigDecimal weight);
+
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "getMaxOrderGoodsId")
     Long getMaxOrderGoodsId(String type);
 

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

@@ -29,6 +29,7 @@ public class OrderChild implements HasKey<Integer> {
     private Integer id;                             //id
     private Long userNo;                            //用户编号
     private Long ownerUserNo;                       //货主用户编号
+    private String ownerName;                       //货主名称
     private String childNo;                         //运单编号
     private String orderGoodsNo;                    //货单编号
     private String orderNo;                         //订单编号
@@ -58,7 +59,8 @@ public class OrderChild implements HasKey<Integer> {
     private BigDecimal unloadNet;                   //卸货净重（单位吨）
     private BigDecimal weight;                      //拉运重量（单位吨）
 
-    private Integer poundStatus;                    //磅单审核状态
+    private String cancelRemark;                    //取消原因
+    private Integer poundStatus;                    //磅单审核状态  0 待审核 1 审核通过 2 审核驳回
     private Integer status;                         //状态
 
     private LocalDateTime payTime;                         //支付时间

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

@@ -51,6 +51,10 @@ public class OrderGoods implements HasKey<Integer> {
     @ApiModelProperty("剩余拉运吨数")
     private BigDecimal residueTransportWeight;
 
+    @TableField("already_transport_weight")
+    @ApiModelProperty("已拉运吨数")
+    private BigDecimal alreadyTransportWeight;
+
     @TableField("send_address_id")
     @ApiModelProperty("发货地址ID")
     private Integer sendAddressId;

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

@@ -33,7 +33,7 @@ public interface OrderChildService {
 
     OrderChildVO getOrderChildInfo(String childNo);
 
-    IPage<OrderChildVO> pageOrderChild(PageOrderChildParam param);
+    IPage<OrderChildVO> pageOrderChild(PageOrderChildOfDriverParam param);
 
     IPage<PageOrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param);
 

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

 package com.clx.performance.service;
 
 
+import java.util.List;
 
 /**
  * @author kavin
@@ -8,4 +9,10 @@ package com.clx.performance.service;
  * Time 16:45
  */
 public interface OrderGoodsDriverTruckService {
+
+    /**
+     * 通过货单号获取定向车辆
+     */
+    List<Integer> getTrucksByOrderGoodsNo(String orderGoodsNo);
+
 }

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

@@ -13,7 +13,9 @@ import com.msl.common.result.Result;
  * Time 16:45
  */
 public interface OrderGoodsService {
-    OrderGoodsVO getOrderGoodsInfoByOrderGoodsNo(String orderGoodsNo);
+    OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo);
+
+    OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForAPP(String orderGoodsNo);
 
     IPage<OrderGoodsVO> pageOrderGoodsList(PageOrderGoodsListParam param);
 }

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

@@ -5,7 +5,6 @@ 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;
@@ -14,12 +13,10 @@ 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.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -71,23 +68,34 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         OrderChild orderChild = orderChildDao.getByChildNo(param.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
         OrderChildPoundAudit poundAuditDetail = orderChildPoundAuditDao.getPoundAuditDetail(param.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        poundAuditDetail.setStatus(param.getStatus());
-        if(Objects.equals(param.getStatus(),OrderChildPoundAudit.AuditStatus.FAIL.getCode())){
         poundAuditDetail.setStatus(param.getStatus());
         poundAuditDetail.setRejectType(param.getRejectType());
         poundAuditDetail.setRemark(param.getRemark());
-        }
+        poundAuditDetail.setId(null);
+
+        if(Objects.equals(param.getStatus(),OrderChildPoundAudit.AuditStatus.FAIL.getCode())){
+            poundAuditDetail.setLoadNet(orderChild.getLoadNet());
+            poundAuditDetail.setUnloadNet(orderChild.getUnloadNet());
+        }else{
             if(Objects.nonNull(param.getLoadNet())){
                 poundAuditDetail.setLoadNet(param.getLoadNet());
+            }else{
+                poundAuditDetail.setLoadNet(orderChild.getLoadNet());
             }
+
             if(Objects.nonNull(param.getUnloadNet())){
                 poundAuditDetail.setUnloadNet(param.getUnloadNet());
+            }else{
+                poundAuditDetail.setUnloadNet(orderChild.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();
+                .remark(OrderChildPoundAudit.AuditStatus.getByCode(param.getStatus()).get().getMsg()).createBy(loginUserInfo.getUserNo()).createName(loginUserInfo.getUserName()).build();
 
         orderChildPoundLogDao.saveEntity(poundLog);
 

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

 package com.clx.performance.service.impl;
 
+import com.clx.performance.dao.OrderGoodsDriverTruckDao;
 import com.clx.performance.service.OrderGoodsDriverTruckService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author kavin
  * Date 2023-09-17
  * Time 16:45
  */
+@Slf4j
 @Service
+@AllArgsConstructor
 public class OrderGoodsDriverTruckServiceImpl  implements OrderGoodsDriverTruckService {
+
+    private final OrderGoodsDriverTruckDao orderGoodsDriverTruckDao;
+
+    @Override
+    public List<Integer> getTrucksByOrderGoodsNo(String orderGoodsNo) {
+        return orderGoodsDriverTruckDao.getTrucksByOrderGoodsNo(orderGoodsNo);
+    }
 }

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

 package com.clx.performance.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.order.feign.OrderFeign;
 import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.struct.OrderGoodsStruct;
@@ -25,9 +27,27 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     @Autowired
     private OrderGoodsStruct orderGoodsStruct;
 
+    @Autowired
+    private OrderFeign orderFeign;
+
+    @Override
+    public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo) {
+        OrderGoodsVO orderGoodsVO = orderGoodsDao.getOrderGoodsInfoByOrderGoodsNoForPC(orderGoodsNo).map(orderGoodsStruct::convert).get();
+        String orderNo = orderGoodsVO.getOrderNo();
+        FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
+        orderGoodsVO.setReveiveAddressAll(orderInfoFeign.getReveiveAddressAll());
+        orderGoodsVO.setSendAddressAll(orderInfoFeign.getSendAddressAll());
+        return orderGoodsVO;
+    }
+
     @Override
-    public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNo(String orderGoodsNo) {
-        return orderGoodsDao.getOrderGoodsInfoByOrderGoodsNo(orderGoodsNo).map(orderGoodsStruct::convert).get();
+    public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForAPP(String orderGoodsNo) {
+        OrderGoodsVO orderGoodsVO = orderGoodsDao.getOrderGoodsInfoByOrderGoodsNoForAPP(orderGoodsNo).map(orderGoodsStruct::convert).get();
+        String orderNo = orderGoodsVO.getOrderNo();
+        FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
+        orderGoodsVO.setReveiveAddressAll(orderInfoFeign.getReveiveAddressAll());
+        orderGoodsVO.setSendAddressAll(orderInfoFeign.getSendAddressAll());
+        return orderGoodsVO;
     }
 
     @Override

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

@@ -2,7 +2,9 @@ package com.clx.performance.sqlProvider;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.app.PageOrderChildOfDriverParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
+import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
@@ -12,9 +14,36 @@ import java.util.Objects;
 
 public class OrderChildSqlProvider {
 
+    public String pageOrderChildOfDriver(@Param("page") Page<OrderChildVO> page, @Param("param") PageOrderChildOfDriverParam param) {
+        return new SQL(){{
+            SELECT("child_no,goods_name,freight_price," +
+                    "send_address,receive_address," +
+                    "driver_name,driver_mobile," +
+                    "weight," +
+                    "cancel_remark," +
+                    "pound_status,status," +
+                    "date_format(load_deadline, '%Y-%m-%d %H:%i:%s') as loadDeadline," +
+                    "date_format(unload_time, '%Y-%m-%d %H:%i:%s') as unloadTime "
+            );
+            FROM("order_child ");
+            WHERE("(user_no = #{param.userNo} or driver_user_no = #{param.userNo}) ");
+            if (StringUtils.isNotBlank(param.getContent())) {WHERE("(" +
+                    "    owner_name like CONCAT(#{param.content},'%') " +
+                    " or truck_no like CONCAT(#{param.content},'%') " +
+                    " or driver_name like CONCAT(#{param.content},'%') " +
+                    " or send_address like CONCAT(#{param.content},'%') " +
+                    " or receive_address like CONCAT(#{param.content},'%') " +
+                    ")");}
+
+            if (Objects.nonNull(param.getStatus())) {WHERE("status = #{param.status}");}
+
+            ORDER_BY("create_time desc");
+        }}.toString();
+    }
+
     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," +
+            SELECT("child_no,status,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," +
                     "date_format(load_time, '%Y-%m-%d %H:%i:%s') as loadTime," +
                     "date_format(unload_time, '%Y-%m-%d %H:%i:%s') as unloadTime ");

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

@@ -19,9 +19,9 @@ public class OrderGoodsSqlProvider {
 
     public String pageOrderGoodsList(@Param("page") Page<FeignPageOrderVO> page, @Param("param") PageOrderGoodsListParam param) {
         String sql = new SQL() {{
-            SELECT("a.id, a.order_no, a.order_goods_type " +
-                    " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
-                    " a.residue_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
+            SELECT("a.id, a.order_no, a.order_goods_type," +
+                    " concat(a.order_goods_type,a.order_goods_no) as order_goods_no, a.order_goods_status, a.extract_weight, " +
+                    " a.residue_transport_weight,a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
                     " a.send_latitude,a.receive_address_id, a.receive_address_shorter,a.receive_longitude,a.receive_latitude," +
                     "a.goods_id, a.goods_name, a.pending_order_way," +
                     " date_format(a.directional_expire_time, '%Y-%m-%d %H:%i:%s') as directional_expire_time ," +
@@ -30,9 +30,8 @@ public class OrderGoodsSqlProvider {
                     " date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time," +
                     " date_format(a.modified_time, '%Y-%m-%d %H:%i:%s') as modified_time," +
                     "a.extract_way,a.need_truck_num,a.senior_logistics_manager_id,a.senior_logistics_manager_name,a.pending_order_freight," +
-                    "a.user_no,a.user_name," +
-                    "a.valid_freight_price ");
-            FROM("order_info a");
+                    "a.user_no,a.user_name");
+            FROM("order_goods a");
 
             if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {
                 WHERE("a.create_time >= #{param.beginTime}");