Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into…

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

@@ -136,6 +136,8 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         return update(lUdWrapper()
                 .eq(OrderChild::getId, item.getId())
                 .set(OrderChild::getCancelRemark, item.getCancelRemark())
+                .set(OrderChild::getCancelType, item.getCancelType())
+                .set(OrderChild::getCancelDetail, item.getCancelDetail())
                 .set(OrderChild::getCancelTime, item.getCancelTime())
                 .set(OrderChild::getFinishTime, item.getFinishTime())
                 .set(OrderChild::getStatus, item.getStatus())

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

@@ -1071,7 +1071,6 @@ public class OrderChildServiceImpl implements OrderChildService {
                     orderChild.getTruckNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         }
 
-        orderChild.setCancelRemark(param.getRemark());
         orderChild.setCancelTime(LocalDateTime.now());
         orderChild.setFinishTime(orderChild.getCancelTime());
         orderChild.setStatus(OrderChildEnum.Status.DRIVER_CANCEL.getCode());
@@ -1445,7 +1444,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
         if (orderChild.getLoadNet() != null) {return orderChild.getLoadNet();}
 
-        return orderChild.getTruckLoad();
+        return orderChild.getWeight();
     }
 
     /**

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

@@ -6,12 +6,15 @@ import com.clx.performance.dao.OrderGoodsLogDao;
 import com.clx.performance.model.OrderGoodsLog;
 import com.clx.performance.param.pc.OrderGoodsLogParam;
 import com.clx.performance.service.OrderGoodsLogService;
+import com.clx.performance.struct.OrderGoodsLogStruct;
 import com.clx.performance.vo.pc.OrderGoodsLogVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * @author kavin
  * Date 2023-10-26
@@ -24,6 +27,8 @@ public class OrderGoodsLogServiceImpl implements OrderGoodsLogService {
 
     OrderGoodsLogDao orderGoodsLogDao;
 
+    OrderGoodsLogStruct orderGoodsLogStruct;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void saveLog(String orderGoodsNo, Long userNo, String userName, String type, String remark) {
@@ -34,7 +39,12 @@ public class OrderGoodsLogServiceImpl implements OrderGoodsLogService {
 
     @Override
     public IPage<OrderGoodsLogVO> pageOrderGoodsLog(OrderGoodsLogParam param) {
-        Page<OrderGoodsLog>  page = orderGoodsLogDao.pageOrderGoodsLog(Page.of(param.getPage(), param.getPageSize()),param.getOrderGoodsNo());
-        return null;
+        Page<OrderGoodsLog> page = orderGoodsLogDao.pageOrderGoodsLog(Page.of(param.getPage(), param.getPageSize()),param.getOrderGoodsNo());
+        List<OrderGoodsLogVO> orderGoodsLogVOS = orderGoodsLogStruct.covertList(page.getRecords());
+        Page<OrderGoodsLogVO> result = new Page<>();
+        result.setTotal(page.getTotal());
+        result.setPages(page.getPages());
+        result.setRecords(orderGoodsLogVOS);
+        return result;
     }
 }

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

+package com.clx.performance.struct;
+
+import com.clx.performance.model.OrderGoodsLog;
+import com.clx.performance.vo.pc.OrderGoodsLogVO;
+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 OrderGoodsLogStruct {
+
+    List<OrderGoodsLogVO> covertList(List<OrderGoodsLog> list);
+}