Skip to content

C
clx-performance
提交 82467cbd authored 作者: 马路路's avatar 马路路
浏览文件
操作

Merge remote-tracking branch 'origin/v29.6_ultimate_interaction_20241017' into dev_jdk17

# Conflicts: # clx-performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java # clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
上级 085fdb8e 099eb6ed
隐藏空白字符变更
内嵌 并排
正在显示 包含 145 行增加 和 32 行删除
clx-performance-web/src/main/java/com/clx/performance/controller/app/AppGoodsOrderController.java
浏览文件 @ 82467cbd
......@@ -76,4 +76,10 @@ public class AppGoodsOrderController {
public Result<List<OrderGoodsAPPVO>> getCancelOrderGoods(@RequestParam(value = "userNo") Long userNo) {
return Result.ok(orderGoodsTruckBindService.getCancelOrderGoods(userNo));
}
@Operation(summary = "司机端获取当日已接单（包含已取消）", description = "br>By:马路路")
@GetMapping("/getTodayOrderGoodsSum")
public Result<Integer> getTodayOrderGoodsSum () {
return Result.ok(orderGoodsService.getTodayOrderGoodsSum());
}
}
clx-performance-web/src/main/java/com/clx/performance/controller/pc/collect/CarrierDriverCollectTransportIntentionController.java
浏览文件 @ 82467cbd
package com.clx.performance.controller.pc.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.app.collect.CarrierDriverCollectTransportIntentionDetailParam;
import com.clx.performance.param.app.collect.CarrierDriverCollectTransportIntentionListParam;
import com.clx.performance.param.app.collect.CarrierDriverCollectTransportIntentionParam;
import com.clx.performance.service.collect.CollectDriverTransportIntentionService;
......@@ -10,13 +11,11 @@ import com.msl.common.base.PageData;
import com.msl.common.result.Result;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.constraints.NotNull;
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 org.springframework.web.bind.annotation.*;
import java.util.List;
......@@ -36,7 +35,7 @@ public class CarrierDriverCollectTransportIntentionController {
return Result.ok();
}
@Operation(summary = "编辑更新/拖动更新", description = "<br>By:马路路")
@Operation(summary = "编辑更新", description = "<br>By:马路路")
@PostMapping("/update")
public Result<Object> updateCarrierDriverCollectTransportIntention(@RequestBody @Validated CarrierDriverCollectTransportIntentionParam param) {
collectDriverTransportIntentionService.updateCarrierDriverCollectTransportIntention(param);
......@@ -45,7 +44,7 @@ public class CarrierDriverCollectTransportIntentionController {
@Operation(summary = "删除", description = "<br>By:马路路")
@PostMapping("/delete")
public Result<Object> deleteCarrierDriverCollectTransportIntention(@RequestBody List<Integer> param) {
public Result<Object> deleteCarrierDriverCollectTransportIntention(@RequestBody List<CarrierDriverCollectTransportIntentionDetailParam> param) {
collectDriverTransportIntentionService.deleteCarrierDriverCollectTransportIntention(param);
return Result.ok();
}
......@@ -66,8 +65,16 @@ public class CarrierDriverCollectTransportIntentionController {
@Operation(summary = "查看选项详情", description = "<br>By:马路路")
@PostMapping("/detail")
public Result<List<CarrierDriverCollectTransportIntentionRecordVO>> detailCarrierDriverCollectTransportIntention(@RequestBody Integer param) {
public Result<List<CarrierDriverCollectTransportIntentionRecordVO>> detailCarrierDriverCollectTransportIntention(@RequestBody CarrierDriverCollectTransportIntentionDetailParam param) {
return Result.ok(collectDriverTransportIntentionService.detailCarrierDriverCollectTransportIntention(param));
}
@Operation(summary = "进行中数据调整顺序", description = "<br>By:马路路")
@GetMapping("/updateAdjustOrder")
public Result<Object> updateAdjustOrder (@RequestParam("adjustOrderOneId") @NotNull(message = "调整订单1的id不能为空") Integer adjustOrderId,
@RequestParam("adjustOrderTwoId") @NotNull(message = "调整订单2的id不能为空") Integer adjustOrderBeforeId) {
collectDriverTransportIntentionService.updateAdjustOrder(adjustOrderId,adjustOrderBeforeId);
return Result.ok();
}
}
clx-performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
浏览文件 @ 82467cbd
......@@ -179,10 +179,9 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
Integer sendSystemAddressId, Integer receiveSystemAddressId,
String beginTime);
MonthInComeAndOrderedVO statisticsTruckMonth(LocalDateTime startTime, LocalDateTime endTime, String truckNo);
List<OrderChild> listByChildNoList(List<String> childNoList);
MonthInComeAndOrderedVO statisticsTruckMonth(LocalDateTime startTime, LocalDateTime endTime, String truckNo);
List<OrderChild> listByOrderGoodsNoAndStatus(String orderGoodsNo, List<Integer> statusList);
......@@ -210,8 +209,9 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
List<OrderChild> listCompleteByOrderNos(List<String> strings);
List<OrderChild> listChidNosByStatus(List<Integer> status);
List<OrderChild> listBeforeUnloadOrderChild(LocalDateTime startTime,LocalDateTime endTime);
List<OrderChild> listChidNosByStatus(List<Integer> status);
List<OrderGoodsNotCancelChildDTO> countValidByOrderGoodsNoList(List<String> orderGoodsList);
......@@ -225,4 +225,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
int countTakeByOrderGoodsNo(String orderGoodsNo);
List<OrderChild> listNoCancelOrderChild(String orderNo);
int countTodayOrderGoodsSumByUserNo(Long userNo);
}
clx-performance-web/src/main/java/com/clx/performance/dao/collect/CollectDriverTransportIntentionDao.java
浏览文件 @ 82467cbd
......@@ -18,4 +18,6 @@ public interface CollectDriverTransportIntentionDao extends BaseDao<CollectDrive
IPage<CollectDriverTransportIntention> listByCondition(CarrierDriverCollectTransportIntentionListParam param);
IPage<CollectDriverTransportIntention> listEnableInfo(AppCarrierDriverCollectTransportIntentionParam param);
void updateRecordOrder(Long sortNo, boolean isUp);
}
clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
浏览文件 @ 82467cbd
......@@ -578,6 +578,11 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
beginTime);
}
@Override
public List<OrderChild> listByChildNoList(List<String> childNoList) {
return list(lQrWrapper().in(OrderChild :: getChildNo,childNoList));
}
@Override
public MonthInComeAndOrderedVO statisticsTruckMonth(LocalDateTime startTime, LocalDateTime endTime, String truckNo) {
return baseMapper.statisticsTruckMonth(startTime,endTime,truckNo);
......@@ -638,8 +643,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
return baseMapper.sumUnloadNumByOrderGoodsNoList(orderGoodsNoList);
}
@Override
public List<OrderChild> listByOrderNo(String orderNo,List<Integer> status) {
return list(lQrWrapper()
......@@ -690,7 +693,14 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
);
}
@Override
public List<OrderChild> listBeforeUnloadOrderChild(LocalDateTime startTime,LocalDateTime endTime) {
return list(lQrWrapper()
.lt(OrderChild :: getStatus, OrderChildEnum.Status.ARRIVE_RECEIVE.getCode())
.ge(OrderChild :: getCreateTime,startTime)
.le(OrderChild :: getCreateTime,endTime)
);
}
@Override
public List<OrderChild> listChidNosByStatus(List<Integer> status) {
......@@ -699,8 +709,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
);
}
@Override
public List<OrderGoodsNotCancelChildDTO> countValidByOrderGoodsNoList(List<String> orderGoodsList) {
return baseMapper.countValidByOrderGoodsNoList(orderGoodsList);
......@@ -711,7 +719,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
baseMapper.batchUpdateCancel(canCancelOrderChildList);
}
@Override
public List<OrderChild> findListByChildNoList(List<String> childNoList) {
return list(lQrWrapper()
......@@ -738,4 +745,9 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
);
}
@Override
public int countTodayOrderGoodsSumByUserNo(Long userNo) {
return baseMapper.countTodayOrderGoodsSumByUserNo(userNo);
}
}
clx-performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectDriverTransportIntentionDaoImpl.java
浏览文件 @ 82467cbd
package com.clx.performance.dao.impl.collect;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.collect.CollectDriverTransportIntentionDao;
......@@ -44,4 +45,16 @@ public class CollectDriverTransportIntentionDaoImpl extends BaseDaoImpl<CollectD
return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()), query);
}
@Override
public void updateRecordOrder(Long seq, boolean isUp) {
LambdaUpdateWrapper<CollectDriverTransportIntention> update = new LambdaUpdateWrapper<>();
if (isUp) {
update.gt(CollectDriverTransportIntention::getSortNo, seq);
} else {
update.ge(CollectDriverTransportIntention::getSortNo, seq);
}
update.setSql("sort_no = sort_no + 1");
baseMapper.update(null, update);
}
}
clx-performance-web/src/main/java/com/clx/performance/mapper/OrderChildMapper.java
浏览文件 @ 82467cbd
......@@ -197,4 +197,8 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
" where order_goods_no=#{orderGoodsNo} and status in(50,60,70,80,90,100)")
int countLoadByOrderGoodsNo(@Param("orderGoodsNo") String orderGoodsNo);
@Select("select count(*) from order_child " +
" where user_no=#{userNo} and status in(10,110) AND create_time >= CURDATE()\n" +
" AND create_time <= CURDATE() + INTERVAL 1 DAY - INTERVAL 1 SECOND")
int countTodayOrderGoodsSumByUserNo(Long userNo);
}
\ No newline at end of file
clx-performance-web/src/main/java/com/clx/performance/model/collect/CollectDriverTransportIntention.java
浏览文件 @ 82467cbd
......@@ -28,7 +28,7 @@ public class CollectDriverTransportIntention implements HasKey<Integer> {
@TableField("sort_no")
@Schema(description="排序编号")
private Integer sortNo;
private Long sortNo;
@TableField("collect_name")
@Schema(description="问题名称")
......
clx-performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java
浏览文件 @ 82467cbd
......@@ -116,4 +116,6 @@ public interface OrderGoodsService {
BigDecimal calcOrderGoodsResidueWeight(BigDecimal extractWeight,BigDecimal alreadyWeight);
Integer getTodayOrderGoodsSum();
}
clx-performance-web/src/main/java/com/clx/performance/service/collect/CollectDriverTransportIntentionService.java
浏览文件 @ 82467cbd
......@@ -2,6 +2,7 @@ package com.clx.performance.service.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.app.collect.AppCarrierDriverCollectTransportIntentionParam;
import com.clx.performance.param.app.collect.CarrierDriverCollectTransportIntentionDetailParam;
import com.clx.performance.param.app.collect.CarrierDriverCollectTransportIntentionListParam;
import com.clx.performance.param.app.collect.CarrierDriverCollectTransportIntentionParam;
import com.clx.performance.vo.pc.collect.CarrierDriverCollectTransportIntentionRecordVO;
......@@ -21,11 +22,13 @@ public interface CollectDriverTransportIntentionService {
Integer enableCarrierDriverCollectTransportIntention(CarrierDriverCollectTransportIntentionParam param);
Integer deleteCarrierDriverCollectTransportIntention(List<Integer> param);
Integer deleteCarrierDriverCollectTransportIntention(List<CarrierDriverCollectTransportIntentionDetailParam> param);
IPage<CarrierDriverCollectTransportIntentionVO> listCarrierDriverCollectTransportIntention(CarrierDriverCollectTransportIntentionListParam param);
List<CarrierDriverCollectTransportIntentionRecordVO> detailCarrierDriverCollectTransportIntention(Integer param);
List<CarrierDriverCollectTransportIntentionRecordVO> detailCarrierDriverCollectTransportIntention(CarrierDriverCollectTransportIntentionDetailParam param);
IPage<CarrierDriverCollectTransportIntentionVO> listCarrierDriverCollectTransportIntentionAll(AppCarrierDriverCollectTransportIntentionParam param);
void updateAdjustOrder(Integer adjustOrderId, Integer adjustOrderBeforeId);
}
clx-performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java
浏览文件 @ 82467cbd
......@@ -1074,4 +1074,11 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
BigDecimal weight2 = Objects.nonNull(alreadyWeight)?alreadyWeight:BigDecimal.ZERO;
return weight1.subtract(weight2);
}
@Override
public Integer getTodayOrderGoodsSum() {
return orderChildDao.countTodayOrderGoodsSumByUserNo(TokenUtil.getLoginUserInfo().getUserNo());
}
}
clx-performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectDriverTransportIntentionServiceImpl.java
浏览文件 @ 82467cbd
......@@ -4,18 +4,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.collect.CollectDriverTransportIntentionDao;
import com.clx.performance.dao.collect.CollectDriverTransportIntentionRecordDao;
import com.clx.performance.enums.ResultEnum;
import com.clx.performance.enums.collect.CollectDriverTransportIntentionEnum;
import com.clx.performance.model.collect.CollectDriverTransportIntention;
import com.clx.performance.model.collect.CollectDriverTransportIntentionRecord;
import com.clx.performance.param.app.collect.AppCarrierDriverCollectTransportIntentionParam;
import com.clx.performance.param.app.collect.CarrierDriverCollectTransportIntentionListParam;
import com.clx.performance.param.app.collect.CarrierDriverCollectTransportIntentionParam;
import com.clx.performance.param.app.collect.CarrierDriverCollectTransportIntentionRecordParam;
import com.clx.performance.param.app.collect.*;
import com.clx.performance.service.collect.CollectDriverTransportIntentionService;
import com.clx.performance.struct.collect.CollectDriverTransportIntentionDaoStruct;
import com.clx.performance.struct.collect.CollectDriverTransportIntentionRecordDaoStruct;
import com.clx.performance.vo.pc.collect.CarrierDriverCollectTransportIntentionRecordVO;
import com.clx.performance.vo.pc.collect.CarrierDriverCollectTransportIntentionVO;
import com.msl.common.base.Optional;
import com.msl.common.exception.ServiceSystemException;
import com.msl.user.utils.TokenUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
......@@ -53,7 +53,7 @@ public class CollectDriverTransportIntentionServiceImpl implements CollectDriver
CollectDriverTransportIntention collectDriverTransportIntention = new CollectDriverTransportIntention();
// 默认排序
collectDriverTransportIntention.setSortNo(1);
collectDriverTransportIntention.setSortNo(0L);
collectDriverTransportIntention.setCollectName(param.getCollectName());
collectDriverTransportIntention.setCollectDescribe(param.getCollectDescribe());
collectDriverTransportIntention.setCollectCheckType(param.getCollectCheckType());
......@@ -145,23 +145,31 @@ public class CollectDriverTransportIntentionServiceImpl implements CollectDriver
@Override
@Transactional(rollbackFor = Exception.class)
public Integer deleteCarrierDriverCollectTransportIntention(List<Integer> param) {
public Integer deleteCarrierDriverCollectTransportIntention(List<CarrierDriverCollectTransportIntentionDetailParam> param) {
if (CollectionUtils.isEmpty(param)) {
// todo
}
Set<Integer> paramsIds = param.stream()
.map(CarrierDriverCollectTransportIntentionDetailParam::getCollectDriverTransportIntentionId)
.collect(Collectors.toSet());
// 1.删除主表信息
collectDriverTransportIntentionDao.deleteInField(CollectDriverTransportIntention::getId, param);
collectDriverTransportIntentionDao.deleteInField(CollectDriverTransportIntention::getId, paramsIds);
// 2.删除子表信息
boolean result = collectDriverTransportIntentionRecordDao.deleteInField(CollectDriverTransportIntentionRecord::getCollectDriverTransportIntentionId, param);
boolean result = collectDriverTransportIntentionRecordDao
.deleteInField(CollectDriverTransportIntentionRecord::getCollectDriverTransportIntentionId, paramsIds);
return result ? 1 : 0;
}
@Override
public IPage<CarrierDriverCollectTransportIntentionVO> listCarrierDriverCollectTransportIntention(CarrierDriverCollectTransportIntentionListParam param) {
IPage<CollectDriverTransportIntention> page = collectDriverTransportIntentionDao.listByCondition(param);
List<CarrierDriverCollectTransportIntentionVO> list= collectDriverTransportIntentionDaoStruct.covertList(page.getRecords());
List<CarrierDriverCollectTransportIntentionVO> list = collectDriverTransportIntentionDaoStruct.covertList(page.getRecords());
return new Page<CarrierDriverCollectTransportIntentionVO>().setPages(page.getPages()).setTotal(page.getTotal()).setRecords(list);
}
@Override
public List<CarrierDriverCollectTransportIntentionRecordVO> detailCarrierDriverCollectTransportIntention(Integer param) {
public List<CarrierDriverCollectTransportIntentionRecordVO> detailCarrierDriverCollectTransportIntention(CarrierDriverCollectTransportIntentionDetailParam param) {
List<CollectDriverTransportIntentionRecord> list = collectDriverTransportIntentionRecordDao
.listByField(CollectDriverTransportIntentionRecord::getCollectDriverTransportIntentionId, param);
List<CarrierDriverCollectTransportIntentionRecordVO> listVO = collectDriverTransportIntentionRecordDaoStruct.covertList(list);
......@@ -193,13 +201,44 @@ public class CollectDriverTransportIntentionServiceImpl implements CollectDriver
// 构建map
Map<Integer, List<CarrierDriverCollectTransportIntentionRecordVO>> recordVoMap =
recordVOList.stream().collect(Collectors
.groupingBy(CarrierDriverCollectTransportIntentionRecordVO :: getCollectDriverTransportIntentionId));
.groupingBy(CarrierDriverCollectTransportIntentionRecordVO::getCollectDriverTransportIntentionId));
// 遍历主编数据，构建子表数据
for(CarrierDriverCollectTransportIntentionVO vo : listVO) {
for (CarrierDriverCollectTransportIntentionVO vo : listVO) {
if (recordVoMap.containsKey(vo.getId())) {
vo.setCollectIntentionRecordList(recordVoMap.get(vo.getId()));
}
}
return new Page<CarrierDriverCollectTransportIntentionVO>().setPages(page.getPages()).setTotal(page.getTotal()).setRecords(listVO);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void updateAdjustOrder(Integer adjustOrderId, Integer adjustOrderBeforeId) {
Optional<CollectDriverTransportIntention> one = collectDriverTransportIntentionDao.getEntityByKey(adjustOrderId);
//如果上调，这条记录传的是移动数据后面的记录id，如果下调，这条记录传的是移动数据前面的记录id
Optional<CollectDriverTransportIntention> two = collectDriverTransportIntentionDao.getEntityByKey(adjustOrderBeforeId);
if(!one.isPresent() || !two.isPresent()){
throw new ServiceSystemException(ResultEnum.DATA_NOT_FIND);
}
boolean isUp = false;
//通过seq判断是上调还是下调
if(one.get().getSortNo() < two.get().getSortNo()){
isUp = true;
}
//上调：大于two 这条记录的seq + 1 ； 下调：大于等于two这条记录的seq + 1 ;
collectDriverTransportIntentionDao.updateRecordOrder(two.get().getSortNo(),isUp);
if(isUp){ //上调
//调整的记录使用 two 的seq + 1;
CollectDriverTransportIntention updateOne = new CollectDriverTransportIntention();
updateOne.setId(one.get().getId());
updateOne.setSortNo(two.get().getSortNo() + 1);
collectDriverTransportIntentionDao.updateEntityByKey(updateOne);
}else{ //下调
//调整的记录使用 two 的seq;
CollectDriverTransportIntention updateOne = new CollectDriverTransportIntention();
updateOne.setId(one.get().getId());
updateOne.setSortNo(two.get().getSortNo());
collectDriverTransportIntentionDao.updateEntityByKey(updateOne);
}
}
}
performance-api/src/main/java/com/clx/performance/param/app/collect/CarrierDriverCollectTransportIntentionDetailParam.java 0 → 100644
浏览文件 @ 82467cbd
package com.clx.performance.param.app.collect;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
public class CarrierDriverCollectTransportIntentionDetailParam {
@Schema(description="收集司机拉运意向id")
private Integer collectDriverTransportIntentionId;
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论