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

更新了优惠券模块

Browse Source
This commit is contained in:
chen-xin-zhi 2025-03-01 08:57:37 +08:00
parent d7c4dfa3b7
commit e9707e9c4d
9 changed files with 69 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/cultural/heritage/constant/OrderStatusConstant.java
View File

@ -21,7 +21,4 @@ public interface OrderStatusConstant {
String PAYMENT_REFUNDED = "已退款";
String PENDING_CONSUME = "待消费";
}

42
src/main/java/com/cultural/heritage/controller/book/PhotoProductsController.java
View File

@ -10,6 +10,7 @@ import com.cultural.heritage.annotation.AuthCheck;
import com.cultural.heritage.common.BaseResponse;
import com.cultural.heritage.common.ErrorCode;
import com.cultural.heritage.common.ResultUtils;
import com.cultural.heritage.constant.OrderStatusConstant;
import com.cultural.heritage.constant.UserConstant;
import com.cultural.heritage.exception.BusinessException;
import com.cultural.heritage.exception.ThrowUtils;
@ -20,15 +21,16 @@ import com.cultural.heritage.model.dto.bookingTime.BookingTimeAddRequest;
import com.cultural.heritage.model.dto.photoProducts.PhotoProductsAddRequest;
import com.cultural.heritage.model.dto.photoProducts.PhotoProductsQueryRequest;
import com.cultural.heritage.model.dto.photoProducts.PhotoProductsUpdateRequest;
import com.cultural.heritage.model.entity.AdvanceOrder;
import com.cultural.heritage.model.entity.BookingDate;
import com.cultural.heritage.model.entity.BookingTime;
import com.cultural.heritage.model.entity.PhotoProducts;
import com.cultural.heritage.model.vo.bookingDate.BookingDateVO;
import com.cultural.heritage.model.vo.bookingTime.BookingTimeVO;
import com.cultural.heritage.model.vo.photoProducts.PhotoProductsVO;
import com.cultural.heritage.service.book.AdvanceOrderService;
import com.cultural.heritage.service.book.BookingDateService;
import com.cultural.heritage.service.book.BookingTimeService;
import com.cultural.heritage.service.book.PhotoCategoryService;
import com.cultural.heritage.service.book.PhotoProductsService;
import com.cultural.heritage.service.common.CommonService;
import io.swagger.v3.oas.annotations.Operation;
@ -43,7 +45,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/photoProducts")
@ -56,22 +60,26 @@ public class PhotoProductsController {
private PhotoProductsService photoProductsService;
@Resource
private PhotoCategoryService photoCategoryService;
@Resource
private BookingDateService bookingDateService;
@Resource
private BookingTimeService bookingTimeService;
@Resource
private CommonService commonService;
@Resource
private AdvanceOrderService advanceOrderService;
/**
* Web端管理员添加写真产品
* @param photoProductsAddRequest 写真产品添加请求体
@ -302,6 +310,18 @@ public class PhotoProductsController {
if (commonRequest == null || commonRequest.getId() <= 0) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
}
// 获取所有写真预约类订单
Map<String, Integer> isOccupiedMap = new HashMap<>();
QueryWrapper<AdvanceOrder> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("orderStatus", OrderStatusConstant.PENDING_PAYMENT).or().eq("orderStatus", OrderStatusConstant.PENDING_SHIPMENT);
List<AdvanceOrder> advanceOrderList = advanceOrderService.list(queryWrapper);
for (AdvanceOrder advanceOrder : advanceOrderList) {
String specificDate = advanceOrder.getSpecificDate();
String timePoint = advanceOrder.getTimePoint();
isOccupiedMap.put(specificDate + "&" + timePoint, 1);
}
Long id = commonRequest.getId();
PhotoProducts photoProducts = photoProductsService.getById(id);
ThrowUtils.throwIf(photoProducts == null || photoProducts.getIsShelves() == 0, ErrorCode.OPERATION_ERROR, "该商品已被删除或者已下架");
@ -347,18 +367,24 @@ public class PhotoProductsController {
String today = DateUtil.today();
int result = DateUtil.compare(DateUtil.parse(specificDate), DateUtil.parse(today));
if (result < 0) continue;
// 如果预约日期相同，过滤掉预约时间
// 如果预约日期相同，过滤掉预约时间以及被占用的时间
List<BookingTimeVO> bookingTimeVOS = bookingDateVO.getBookingTimeVOList();
if (result == 0) {
List<BookingTimeVO> bookingTimeVOS = bookingDateVO.getBookingTimeVOList();
bookingTimeVOS = bookingTimeVOS.stream().filter(bookingTimeVO -> {
String timePoint = bookingTimeVO.getTimePoint() + ":00";
DateTime targetTime = DateUtil.parse(timePoint, "HH:mm:ss");
DateTime now = DateUtil.date();
DateTime currentTime = DateUtil.parse(now.toString("HH:mm:ss"), "HH:mm:ss");
return currentTime.compareTo(targetTime) < 0;
return currentTime.compareTo(targetTime) < 0 && isOccupiedMap.get(specificDate + "&" + timePoint) == null;
}).toList();
} else {
bookingTimeVOS = bookingTimeVOS.stream().filter(bookingTimeVO -> {
String timePoint = bookingTimeVO.getTimePoint();
return isOccupiedMap.get(specificDate + "&" + timePoint) == null;
}).toList();
if (bookingTimeVOS.isEmpty()) continue;
}
if (bookingTimeVOS.isEmpty()) continue;
bookingDateVO.setBookingTimeVOList(bookingTimeVOS);
bookingDateVOList.add(bookingDateVO);
}

7
src/main/java/com/cultural/heritage/controller/good/GoodController.java
View File

@ -613,9 +613,10 @@ public class GoodController {
@Operation(summary = "小程序端展示服务类商品卡片", description = "参数：无，权限：所有人，方法名：listServiceGoodCardVO")
public BaseResponse<List<ServiceGoodCardVO>> listServiceGoodCardVO(HttpServletRequest request) {
userService.getLoginUser(request);
QueryWrapper<Good> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("isGoodType", 0);
List<Good> goodList = goodService.list(queryWrapper);
Map<String, Object> map = new HashMap<>();
map.put("isGoodType", 0);
map.put("isShelves", 1);
List<Good> goodList = commonService.findByFieldEqTargetFields(map, goodService);
List<ServiceGoodCardVO> serviceGoodCardVOS = commonService.convertList(goodList, ServiceGoodCardVO.class);
return ResultUtils.success(serviceGoodCardVOS);
}

22
src/main/java/com/cultural/heritage/controller/order/AdvanceOrderController.java
View File

@ -203,12 +203,32 @@ public class AdvanceOrderController {
List<AdvanceOrder> advanceOrderList = advanceOrderService.list(queryWrapper);
// 封装成写真预约订单VO
List<AdvanceOrderVO> advanceOrderVOS = commonService.convertList(advanceOrderList, AdvanceOrderVO.class);
Collections.reverse(advanceOrderList);
Collections.reverse(advanceOrderVOS);
return ResultUtils.success(advanceOrderVOS);
}
/**
* 小程序端用户根据id删除写真预约订单
* @return 是否删除成功
*/
@PostMapping("/delete")
@Operation(summary = "小程序端用户根据id删除写真预约订单", description = "参数：无, 权限：所有人，方法名：delAdvanceOrderById")
public BaseResponse<Boolean> delAdvanceOrderById(@RequestBody CommonRequest commonRequest, HttpServletRequest request) {
if (commonRequest == null) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
}
userService.getLoginUser(request);
Long id = commonRequest.getId();
AdvanceOrder advanceOrder = advanceOrderService.getById(id);
ThrowUtils.throwIf(advanceOrder == null || !advanceOrder.getOrderStatus().equals(OrderStatusConstant.TRANSACTION_CLOSED), ErrorCode.OPERATION_ERROR, "订单不存在或状态错误");
boolean result = advanceOrderService.removeById(id);
ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR, "订单删除失败");
return ResultUtils.success(true);
}
}

2
src/main/java/com/cultural/heritage/model/entity/BookingTime.java
View File

@ -35,11 +35,13 @@ public class BookingTime implements Serializable {
*/
private Long bookingDateId;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/

1
src/main/java/com/cultural/heritage/model/vo/bookingTime/BookingTimeVO.java
View File

@ -24,6 +24,7 @@ public class BookingTimeVO implements Serializable {
private Long bookingDateId;
@Serial
private static final long serialVersionUID = 1L;
}

7
src/main/java/com/cultural/heritage/service/book/impl/AdvanceOrderServiceImpl.java
View File

@ -128,9 +128,10 @@ public class AdvanceOrderServiceImpl extends ServiceImpl<AdvanceOrderMapper, Adv
ThrowUtils.throwIf(result >= 0, ErrorCode.OPERATION_ERROR, "当前预约时间已过期");
QueryWrapper<AdvanceOrder> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("specificDate", specificDate);
queryWrapper.eq("timePoint", timePoint);
queryWrapper.eq("orderStatus", OrderStatusConstant.PENDING_CONSUME);
queryWrapper.eq("specificDate", specificDate)
.eq("timePoint", timePoint)
.and(wrapper -> wrapper.eq("orderStatus", OrderStatusConstant.PENDING_PAYMENT)
.or().eq("orderStatus", OrderStatusConstant.PENDING_SHIPMENT));
AdvanceOrder order = this.getOne(queryWrapper);
ThrowUtils.throwIf(order != null, ErrorCode.OPERATION_ERROR, "当前时间已约满");
}

5
src/main/java/com/cultural/heritage/service/good/impl/GoodServiceImpl.java
View File

@ -220,9 +220,8 @@ public class GoodServiceImpl extends ServiceImpl<GoodMapper, Good> implements Go
Long pendingId = pendingServiceGood.getId();
QueryWrapper<PendingServiceOrder> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("pendingId", pendingId);
queryWrapper.eq("orderItemStatus", OrderStatusConstant.PENDING_SHIPMENT);
queryWrapper.or().eq("orderItemStatus", OrderStatusConstant.PENDING_PAYMENT);
queryWrapper.eq("pendingId", pendingId)
.and(wrapper -> wrapper.eq("orderItemStatus", OrderStatusConstant.PENDING_SHIPMENT).or().eq("orderItemStatus", OrderStatusConstant.PENDING_PAYMENT));
List<PendingServiceOrder> pendingServiceOrderList = pendingServiceOrderService.list(queryWrapper);
Integer totalNumber = 0;
for (PendingServiceOrder pendingServiceOrder : pendingServiceOrderList) {

2
src/main/java/com/cultural/heritage/service/wx/impl/WeChatServiceImpl.java
View File

@ -191,7 +191,7 @@ public class WeChatServiceImpl implements WeChatService {
AdvanceOrder advanceOrder = getAdvanceOrderInfoByOrderNumber(orderNumber);
// 修改订单状态
modifyAdvanceOrderStatus(advanceOrder, OrderStatusConstant.PENDING_CONSUME);
modifyAdvanceOrderStatus(advanceOrder, OrderStatusConstant.PENDING_SHIPMENT);
System.out.println("---------------------------微信支付回调（结束）-------------------------------");
return true;
}