admin1/jiangchengfeiyi-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

this is 3.24 update

Browse Source
This commit is contained in:
chen-xin-zhi 2025-03-25 21:59:14 +08:00
parent 4a83d795e9
commit 5d11ef86d2
2 changed files with 1 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/main/java/com/cultural/heritage/controller/order/OrderController.java
View File

@ -257,29 +257,6 @@ public class OrderController {
orderVO.setOrderItemList(orderItemsTempList); orderVO.setOrderItemList(orderItemsTempList);
} }
// TODO
// for (OrderVO orderVO : orderVOS) {
// boolean isGeneral = orderService.isGeneralGood(orderVO.getOrderType());
// List<OrderItems> orderItemList = orderVO.getOrderItemList();
// for (OrderItems orderItems : orderItemList) {
// GoodSnapshot goodSnapshot = orderItems.getGoodSnapshot();
// String goodImg = goodSnapshot.getGoodImg();
// if (isGeneral) {
// String[] goodImgArr = goodImg.split(";");
// for (int i = 0; i < goodImgArr.length; i++) {
// goodImgArr[i] = FileConstant.SERVER_HOST + goodImgArr[i];
// }
// String joinImg = String.join(";", goodImgArr);
// goodSnapshot.setGoodImg(joinImg);
// } else {
// goodSnapshot.setGoodImg(FileConstant.SERVER_HOST + goodSnapshot.getGoodImg());
// }
// orderItems.setGoodSnapshot(goodSnapshot);
// }
// orderVO.setOrderItemList(orderItemList);
// }
Page<OrderVO> orderVOPage = new Page<>(); Page<OrderVO> orderVOPage = new Page<>();
orderVOPage.setRecords(orderVOS); orderVOPage.setRecords(orderVOS);
orderVOPage.setTotal(page.getTotal()); orderVOPage.setTotal(page.getTotal());
@ -333,28 +310,6 @@ public class OrderController {
orderVO.setOrderItemList(orderItemsList); orderVO.setOrderItemList(orderItemsList);
return orderVO; return orderVO;
}).toList(); }).toList();
// TODO
// for (OrderVO orderVO : orderVOS) {
// boolean isGeneral = orderService.isGeneralGood(orderVO.getOrderType());
// List<OrderItems> orderItemList = orderVO.getOrderItemList();
// for (OrderItems orderItems : orderItemList) {
// GoodSnapshot goodSnapshot = orderItems.getGoodSnapshot();
// String goodImg = goodSnapshot.getGoodImg();
// if (isGeneral) {
// String[] goodImgArr = goodImg.split(";");
// for (int i = 0; i < goodImgArr.length; i++) {
// goodImgArr[i] = FileConstant.SERVER_HOST + goodImgArr[i];
// }
// String joinImg = String.join(";", goodImgArr);
// goodSnapshot.setGoodImg(joinImg);
// } else {
// goodSnapshot.setGoodImg(FileConstant.SERVER_HOST + goodSnapshot.getGoodImg());
// }
// orderItems.setGoodSnapshot(goodSnapshot);
// }
// orderVO.setOrderItemList(orderItemList);
// }
return ResultUtils.success(orderVOS); return ResultUtils.success(orderVOS);
} }
@ -402,25 +357,6 @@ public class OrderController {
BeanUtils.copyProperties(order, orderVO); BeanUtils.copyProperties(order, orderVO);
List<OrderItems> orderItemsList = commonService.findByFieldEqTargetField("orderId", orderId, orderItemService); List<OrderItems> orderItemsList = commonService.findByFieldEqTargetField("orderId", orderId, orderItemService);
orderVO.setOrderItemList(orderItemsList); orderVO.setOrderItemList(orderItemsList);
// TODO
// boolean isGeneral = orderService.isGeneralGood(orderVO.getOrderType());
// List<OrderItems> orderItemList = orderVO.getOrderItemList();
// for (OrderItems orderItems : orderItemList) {
// GoodSnapshot goodSnapshot = orderItems.getGoodSnapshot();
// String goodImg = goodSnapshot.getGoodImg();
// if (isGeneral) {
// String[] goodImgArr = goodImg.split(";");
// for (int i = 0; i < goodImgArr.length; i++) {
// goodImgArr[i] = FileConstant.SERVER_HOST + goodImgArr[i];
// }
// String joinImg = String.join(";", goodImgArr);
// goodSnapshot.setGoodImg(joinImg);
// } else {
// goodSnapshot.setGoodImg(FileConstant.SERVER_HOST + goodSnapshot.getGoodImg());
// }
// orderItems.setGoodSnapshot(goodSnapshot);
// }
// orderVO.setOrderItemList(orderItemList);
return ResultUtils.success(orderVO); return ResultUtils.success(orderVO);
} }

2
src/main/java/com/cultural/heritage/utils/TimeSplitterUtils.java
View File

@ -7,7 +7,7 @@ public class TimeSplitterUtils {
public static List<Long> splitTime(long totalSeconds) { public static List<Long> splitTime(long totalSeconds) {
List<Long> timeIntervals = new ArrayList<>(); List<Long> timeIntervals = new ArrayList<>();
long oneDayInSeconds = 86400; // 1天的秒数 long oneDayInSeconds = 864000; // 10天的秒数
// 拆分完整的天数 // 拆分完整的天数
while (totalSeconds >= oneDayInSeconds) { while (totalSeconds >= oneDayInSeconds) {