Compare commits

..

4 Commits

Author SHA1 Message Date
0432b99524 feat(OrderMapper): 查询订单时按支付时间倒序排列在queryTypeOrder查询中添加order by pay_at desc子句,
All checks were successful
ZhenTu-BE/pipeline/head This commit looks good
确保返回的订单记录按支付时间从新到旧排序,便于业务逻辑处理和展示最新订单信息。
2025-09-20 15:51:33 +08:00
da71e6d16f debug 2025-09-20 15:51:22 +08:00
f29217ac1f fix(FaceServiceImpl):修复视频模板封面URL设置问题当视频模板封面URL为空时,使用图片列表第一项的URL进行设置,避免空值导致的问题。 2025-09-20 15:51:19 +08:00
638da8cd3d Revert "feat(PriceBiz): 新增商品类型字段并完善商品列表逻辑"
This reverts commit 7ca59a1b0b.
2025-09-20 15:51:10 +08:00
7 changed files with 9 additions and 23 deletions

View File

@@ -1,8 +1,6 @@
package com.ycwl.basic.biz;
import com.ycwl.basic.model.mobile.order.IsBuyBatchRespVO;
import com.ycwl.basic.model.mobile.order.IsBuyRespVO;
import com.ycwl.basic.model.mobile.scenic.content.ContentPageVO;
import com.ycwl.basic.model.pc.coupon.entity.CouponEntity;
import com.ycwl.basic.model.pc.couponRecord.resp.CouponRecordQueryResp;
import com.ycwl.basic.model.pc.face.entity.FaceEntity;
@@ -17,17 +15,14 @@ import com.ycwl.basic.repository.FaceRepository;
import com.ycwl.basic.repository.PriceRepository;
import com.ycwl.basic.repository.ScenicRepository;
import com.ycwl.basic.repository.TemplateRepository;
import com.ycwl.basic.service.pc.FaceService;
import org.apache.commons.lang3.Strings;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
@Component
@@ -43,9 +38,6 @@ public class PriceBiz {
@Autowired
private FaceRepository faceRepository;
@Autowired
@Lazy
private FaceService faceService;
@Autowired
private CouponBiz couponBiz;
public List<GoodsListRespVO> listGoodsByScenic(Long scenicId) {
@@ -56,16 +48,15 @@ public class PriceBiz {
GoodsListRespVO goods = new GoodsListRespVO();
goods.setGoodsId(template.getId());
goods.setGoodsName(template.getName());
goods.setGoodsType(0);
return goods;
}).forEach(goodsList::add);
ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(scenicId);
if (scenicConfig != null) {
if (!Boolean.TRUE.equals(scenicConfig.getDisableSourceVideo())) {
goodsList.add(new GoodsListRespVO(1L, "录像集", 1));
goodsList.add(new GoodsListRespVO(1L, "录像集"));
}
if (!Boolean.TRUE.equals(scenicConfig.getDisableSourceImage())) {
goodsList.add(new GoodsListRespVO(2L, "照片集", 2));
goodsList.add(new GoodsListRespVO(2L, "照片集"));
}
}
return goodsList;
@@ -149,14 +140,6 @@ public class PriceBiz {
respVO.setBuy(Integer.valueOf(1).equals(orderEntity.getStatus()));
}
}
if (type == -1 && !respVO.isBuy()) {
// 查找所有内容是否购买。
List<ContentPageVO> list = faceService.faceContentList(faceId);
boolean notBuy = list.stream().anyMatch(item -> Integer.valueOf(0).equals(item.getIsBuy()));
if (!notBuy) {
respVO.setBuy(true);
}
}
respVO.setShare(false);
if (face == null || !face.getMemberId().equals(userId)) {
respVO.setShare(true);

View File

@@ -169,7 +169,7 @@ public class TemplateBiz {
}
}
log.info("filterTaskParams: templateId:{}, original keys:{}, filtered keys:{}, placeholder counts:{}",
log.debug("filterTaskParams: templateId:{}, original keys:{}, filtered keys:{}, placeholder counts:{}",
templateId, allTaskParams.keySet().size(), filteredParams.keySet().size(), placeholderCounts);
return filteredParams;

View File

@@ -25,7 +25,7 @@ public class CouponController {
@GetMapping("/{scenicId}/goodsList")
public ApiResponse<List<GoodsListRespVO>> scenicGoodsList(@PathVariable Long scenicId) {
List<GoodsListRespVO> data = priceBiz.listGoodsByScenic(scenicId);
data.add(new GoodsListRespVO(-1L, "一口价", -1));
data.add(new GoodsListRespVO(-1L, "一口价"));
return ApiResponse.success(data);
}

View File

@@ -10,5 +10,4 @@ import lombok.NoArgsConstructor;
public class GoodsListRespVO {
private Long goodsId;
private String goodsName;
private Integer goodsType;
}

View File

@@ -46,7 +46,7 @@ public class BundleDiscountServiceImpl implements IBundleDiscountService {
}
}
log.info("检测到 {} 个可用的打包优惠", bundleDiscounts.size());
log.debug("检测到 {} 个可用的打包优惠", bundleDiscounts.size());
} catch (Exception e) {
log.error("检测打包优惠失败", e);

View File

@@ -768,6 +768,9 @@ public class FaceServiceImpl implements FaceService {
sourceImageContent.setSourceType(2);
sourceImageContent.setLockType(-1);
sourceImageContent.setTemplateCoverUrl(list.getFirst().getUrl());
if (Strings.isBlank(sourceVideoContent.getTemplateCoverUrl())) {
sourceVideoContent.setTemplateCoverUrl(list.getFirst().getUrl());
}
}
});

View File

@@ -489,6 +489,7 @@
</select>
<select id="queryTypeOrder" resultType="com.ycwl.basic.model.pc.order.entity.OrderEntity">
select * from `order` where member_id = #{userId} and face_id = #{faceId} and type = #{orderType} and price_config_id = #{priceConfigId}
order by pay_at desc
limit 1
</select>
<select id="getUserOrderItem" resultType="com.ycwl.basic.model.pc.order.entity.OrderEntity">