q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
Jerry Yan
2025-03-01 11:51:15 +08:00
parent 94bf358a2d
commit 8428907db4
13 changed files with 181 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java
View File

@ -100,6 +100,14 @@ public class OrderServiceImpl implements OrderService {
return ApiResponse.success(pageInfo);
}
@Override
public ApiResponse<PageInfo<OrderRespVO>> pageQueryDetail(OrderReqQuery query) {
PageHelper.startPage(query.getPageNum(), query.getPageSize());
List<OrderRespVO> list = orderMapper.listDetail(query);
PageInfo<OrderRespVO> pageInfo = new PageInfo<>(list);
return ApiResponse.success(pageInfo);
}
@Override
public ApiResponse<List<OrderRespVO>> list(OrderReqQuery query) {
return ApiResponse.success(orderMapper.list(query));
@ -144,13 +152,13 @@ public class OrderServiceImpl implements OrderService {
WXPayOrderReqVO wxPayOrderReqVO = new WXPayOrderReqVO();
String goodsName = null;
if (orderItems.size() > 1) {
goodsName = "多项景区VLOG商品";
goodsName = "多项景区Vloh商品";
} else {
int type = orderItems.get(NumberConstant.ZERO).getGoodsType();
if (type == NumberConstant.ZERO) {
goodsName = "景区VLog视频";
goodsName = "景区Vlog视频";
} else if (type == NumberConstant.ONE) {
goodsName = "景区原片包";
goodsName = "景区录像包";
} else if (type == NumberConstant.TWO) {
goodsName = "景区照片包";
}

1
src/main/java/com/ycwl/basic/service/pc/OrderService.java
View File

@ -23,6 +23,7 @@ import java.util.List;
*/
public interface OrderService {
ApiResponse<PageInfo<OrderRespVO>> pageQuery(OrderReqQuery query);
ApiResponse<PageInfo<OrderRespVO>> pageQueryDetail(OrderReqQuery query);
ApiResponse<List<OrderRespVO>> list(OrderReqQuery query);

14
src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java
View File

@ -52,6 +52,7 @@ import com.ycwl.basic.repository.VideoTaskRepository;
import com.ycwl.basic.service.task.TaskService;
import com.ycwl.basic.storage.StorageFactory;
import com.ycwl.basic.storage.adapters.IStorageAdapter;
import com.ycwl.basic.storage.enums.StorageAcl;
import com.ycwl.basic.storage.utils.StorageUtil;
import com.ycwl.basic.task.VideoPieceGetter;
import com.ycwl.basic.repository.TemplateRepository;
@ -580,6 +581,16 @@ public class TaskTaskServiceImpl implements TaskService {
}
videoMapper.add(video);
}
IStorageAdapter adapter;
ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(task.getScenicId());
if (scenicConfig != null && scenicConfig.getStoreType() != null) {
adapter = StorageFactory.get(scenicConfig.getStoreType());
adapter.loadConfig(JSONObject.parseObject(scenicConfig.getStoreConfigJson(), Map.class));
} else {
adapter = StorageFactory.use("video");
}
String filename = StorageUtil.joinPath(StorageConstant.VLOG_PATH, task.getId() + "_" + task.getScenicId() + ".mp4");
adapter.setAcl(StorageAcl.PUBLIC_READ, filename);
int isBuy = 0;
FaceEntity face = faceRepository.getFace(task.getFaceId());
if (face != null) {
@ -592,8 +603,7 @@ public class TaskTaskServiceImpl implements TaskService {
}
if (isBuy != 1) {
// 判断景区新生成免费送逻辑
ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(task.getScenicId());
if (Integer.valueOf(2).equals(scenicConfig.getTemplateNewVideoType())) {
if (scenicConfig != null && Integer.valueOf(2).equals(scenicConfig.getTemplateNewVideoType())) {
log.info("景区{}启用：templateNewVideoType：全新视频不需要重新购买", task.getScenicId());
// 全新视频，不需要重新购买，旧视频在我的里面查看
List<MemberVideoEntity> entityList = videoMapper.listRelationByFaceAndTemplate(face.getMemberId(), face.getId(), task.getTemplateId());