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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
longbinbin
2024-12-06 10:56:06 +08:00
parent 2b919a3c9f e1c95fb137
commit 6076809948
14 changed files with 398 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
/**
* @Author：longbinbin
@@ -60,9 +61,9 @@ public class OrderServiceImpl implements OrderService {
Long orderId = SnowFlakeUtil.getLongId();
order.setId(orderId);
int add = orderMapper.add(order);
if (add == 0) {
if (add == NumberConstant.ZERO) {
return ApiResponse.fail("订单添加失败");
}else {
} else {
List<OrderItemDTO> orderItemList = order.getOrderItemList();
List<OrderItemEntity> orderItems = new ArrayList<>();
orderItemList.forEach(orderItemDTO -> {
@@ -71,7 +72,7 @@ public class OrderServiceImpl implements OrderService {
orderItemEntity.setOrderId(orderId);
});
int addOrderItems = orderMapper.addOrderItems(orderItems);
if (addOrderItems == 0) {
if (addOrderItems == NumberConstant.ZERO) {
log.error("订单明细添加失败");
return ApiResponse.fail("订单添加失败");
}
@@ -82,7 +83,7 @@ public class OrderServiceImpl implements OrderService {
@Override
public ApiResponse<Integer> update(OrderAddOrUpdateReq query) {
int update = orderMapper.update(query);
if (update == 0) {
if (update == NumberConstant.ZERO) {
return ApiResponse.fail("订单更新失败");
}
return ApiResponse.success(update);
@@ -100,7 +101,9 @@ public class OrderServiceImpl implements OrderService {
if (orderStateEnum.getType() == NumberConstant.ONE) {
orderAddOrUpdateReq.setRefundStatus(orderStateEnum.getState());
orderAddOrUpdateReq.setRefundAt(new Date());
orderAddOrUpdateReq.setRefundReason(refundReason);
if (Objects.nonNull(refundReason)) {
orderAddOrUpdateReq.setRefundReason(refundReason);
}
} else if (orderStateEnum.getType() == NumberConstant.TWO) {
int state = orderStateEnum.getState();
orderAddOrUpdateReq.setPayAt(new Date());
@@ -113,7 +116,7 @@ public class OrderServiceImpl implements OrderService {
}
@Override
public ApiResponse getOrderCountByUserId(Long userId) {
public ApiResponse<?> getOrderCountByUserId(Long userId) {
OrderReqQuery query = new OrderReqQuery();
query.setMemberId(userId);
return orderMapper.getOrderCount(query);
@@ -125,8 +128,8 @@ public class OrderServiceImpl implements OrderService {
List<OrderAppRespVO> list = orderMapper.appList(orderReqQuery);
for (OrderAppRespVO appRespVO : list) {
List<OrderItemVO> orderItemList = appRespVO.getOrderItemList();
if(orderItemList!= null && orderItemList.size() > 0){
OrderItemVO itemVO = orderItemList.get(0);
if (orderItemList != null && !orderItemList.isEmpty()) {
OrderItemVO itemVO = orderItemList.get(NumberConstant.ZERO);
appRespVO.setScenicName(itemVO.getScenicName());
appRespVO.setGoodsName(itemVO.getGoodsName());
}
@@ -137,10 +140,10 @@ public class OrderServiceImpl implements OrderService {
@Override
public ApiResponse<OrderAppRespVO> appDetail(Long id) {
OrderAppRespVO orderAppRespVO=orderMapper.appDetail(id);
OrderAppRespVO orderAppRespVO = orderMapper.appDetail(id);
List<OrderItemVO> orderItemList = orderAppRespVO.getOrderItemList();
if(orderItemList!= null && orderItemList.size() > 0){
OrderItemVO itemVO = orderItemList.get(0);
if (orderItemList != null && !orderItemList.isEmpty()) {
OrderItemVO itemVO = orderItemList.get(NumberConstant.ZERO);
orderAppRespVO.setScenicName(itemVO.getScenicName());
orderAppRespVO.setGoodsName(itemVO.getGoodsName());
}