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

订单类型，名称变更

Browse Source
This commit is contained in:
Jerry Yan
2025-02-26 13:43:44 +08:00
parent e199e0e57b
commit 99f5adf841
12 changed files with 57 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -328,6 +328,7 @@ public class OrderServiceImpl implements OrderService {
// promo code
// coupon
order.setPayPrice(priceObj.getPrice());
order.setFaceId(priceObj.getFaceId());
if (order.getPayPrice().equals(BigDecimal.ZERO)) {
order.setStatus(OrderStateEnum.PAID.getState());
order.setPayAt(new Date());
@@ -370,17 +371,19 @@ public class OrderServiceImpl implements OrderService {
orderItem.setGoodsId(batchOrderReqVO.getFaceId());
orderItem.setGoodsType(1);
} else if (Long.valueOf(2L).equals(goods.getGoodsId())) {
orderItem.setGoodsId(batchOrderReqVO.getCouponId());
orderItem.setGoodsId(batchOrderReqVO.getFaceId());
orderItem.setGoodsType(2);
} else {
// templateId
orderItem.setGoodsId(goods.getGoodsId());
orderItem.setGoodsType(0);
orderItem.setGoodsType(-1);
}
return orderItem;
}).collect(Collectors.toList());
order.setSlashPrice(priceConfig.getSlashPrice());
order.setPrice(priceConfig.getPrice());
order.setPayPrice(priceConfig.getPrice());
order.setFaceId(batchOrderReqVO.getFaceId());
if (order.getPayPrice().equals(BigDecimal.ZERO)) {
order.setStatus(OrderStateEnum.PAID.getState());
order.setPayAt(new Date());

2
src/main/java/com/ycwl/basic/service/impl/pc/PriceConfigServiceImpl.java
View File

@@ -57,7 +57,7 @@ public class PriceConfigServiceImpl extends ServiceImpl<PriceConfigMapper, Price
List<String> goodsNames = new ArrayList<>();
for (String s : item.getGoodsIds().split(",")) {
if (StringUtils.equals(s, "1")) {
goodsNames.add("原片集");
goodsNames.add("录像集");
} else if (StringUtils.equals(s, "2")) {
goodsNames.add("照片集");
} else {