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-13 10:24:30 +08:00
parent ea31cd43be
commit 0f0922e39b
7 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/cultural/heritage/controller/book/BookingDateController.java
View File

@ -70,8 +70,8 @@ public class BookingDateController {
// 删除这个预约日期关联的所有时间点 // 删除这个预约日期关联的所有时间点
QueryWrapper<BookingTime> queryWrapper = new QueryWrapper<>(); QueryWrapper<BookingTime> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("bookingDateId", id); queryWrapper.eq("bookingDateId", id);
boolean remove = bookingTimeService.remove(queryWrapper); bookingTimeService.remove(queryWrapper);
ThrowUtils.throwIf(!remove, ErrorCode.OPERATION_ERROR, "预约时间点删除失败"); // ThrowUtils.throwIf(!remove, ErrorCode.OPERATION_ERROR, "预约时间点删除失败");
// 删除这个预约日期 // 删除这个预约日期
boolean success = bookingDateService.removeById(id); boolean success = bookingDateService.removeById(id);

15
src/main/java/com/cultural/heritage/controller/book/PhotoCategoryController.java
View File

@ -149,18 +149,17 @@ public class PhotoCategoryController {
// 获取预约时间表 // 获取预约时间表
List<BookingTime> bookingTimeList = commonService.findByFieldInTargetField(bookingDateList, bookingTimeService, BookingDate::getId, "bookingDateId"); List<BookingTime> bookingTimeList = commonService.findByFieldInTargetField(bookingDateList, bookingTimeService, BookingDate::getId, "bookingDateId");
// 批量删除预约时间 // 批量删除预约时间
boolean removeTime = bookingTimeService.removeBatchByIds(bookingTimeList); bookingTimeService.removeBatchByIds(bookingTimeList);
ThrowUtils.throwIf(!removeTime, ErrorCode.OPERATION_ERROR, "预约时间删除失败"); // ThrowUtils.throwIf(!removeTime, ErrorCode.OPERATION_ERROR, "预约时间删除失败");
// 批量删除预约日期 // 批量删除预约日期
boolean removeDate = bookingDateService.removeBatchByIds(bookingDateList); bookingDateService.removeBatchByIds(bookingDateList);
ThrowUtils.throwIf(!removeDate, ErrorCode.OPERATION_ERROR, "预约日期批量删除失败"); // ThrowUtils.throwIf(!removeDate, ErrorCode.OPERATION_ERROR, "预约日期批量删除失败");
// 删除该类别下所有写真产品 // 删除该类别下所有写真产品
if (!photoProductsList.isEmpty()) { photoProductsService.removeBatchByIds(photoProductsList);
boolean remove = photoProductsService.removeBatchByIds(photoProductsList); // ThrowUtils.throwIf(!remove, ErrorCode.OPERATION_ERROR, "写真产品批量删除失败");
ThrowUtils.throwIf(!remove, ErrorCode.OPERATION_ERROR, "写真产品批量删除失败");
}
// 删除写真类别 // 删除写真类别
boolean result = photoCategoryService.removeById(id); boolean result = photoCategoryService.removeById(id);
ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR, "写真类别删除失败"); ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR, "写真类别删除失败");

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

@ -183,11 +183,11 @@ public class PhotoProductsController {
// 获取预约时间列表 // 获取预约时间列表
List<BookingTime> bookingTimeList = commonService.findByFieldInTargetField(bookingDateList, bookingTimeService, BookingDate::getId, "bookingDateId"); List<BookingTime> bookingTimeList = commonService.findByFieldInTargetField(bookingDateList, bookingTimeService, BookingDate::getId, "bookingDateId");
// 删除写真产品下的预约时间 // 删除写真产品下的预约时间
boolean remove = bookingTimeService.removeBatchByIds(bookingTimeList); bookingTimeService.removeBatchByIds(bookingTimeList);
ThrowUtils.throwIf(!remove, ErrorCode.OPERATION_ERROR, "预约时间批量删除失败"); // ThrowUtils.throwIf(!remove, ErrorCode.OPERATION_ERROR, "预约时间批量删除失败");
// 删除写真产品下的预约日期 // 删除写真产品下的预约日期
boolean success = bookingDateService.removeBatchByIds(bookingDateList); bookingDateService.removeBatchByIds(bookingDateList);
ThrowUtils.throwIf(!success, ErrorCode.OPERATION_ERROR, "预约日期批量删除失败"); // ThrowUtils.throwIf(!success, ErrorCode.OPERATION_ERROR, "预约日期批量删除失败");
// 删除写真产品 // 删除写真产品
boolean result = photoProductsService.removeById(id); boolean result = photoProductsService.removeById(id);
ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR, "写真产品删除失败"); ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR, "写真产品删除失败");
@ -215,11 +215,11 @@ public class PhotoProductsController {
// 获取写真产品的预约时间 // 获取写真产品的预约时间
List<BookingTime> bookingTimeList = commonService.findByFieldInTargetField(bookingDateList, bookingTimeService, BookingDate::getId, "bookingDateId"); List<BookingTime> bookingTimeList = commonService.findByFieldInTargetField(bookingDateList, bookingTimeService, BookingDate::getId, "bookingDateId");
// 删除写真产品下的预约时间 // 删除写真产品下的预约时间
boolean remove = bookingTimeService.removeBatchByIds(bookingTimeList); bookingTimeService.removeBatchByIds(bookingTimeList);
ThrowUtils.throwIf(!remove, ErrorCode.OPERATION_ERROR, "预约时间批量删除失败"); // ThrowUtils.throwIf(!remove, ErrorCode.OPERATION_ERROR, "预约时间批量删除失败");
// 删除写真产品下的预约日期 // 删除写真产品下的预约日期
boolean success = bookingDateService.removeBatchByIds(bookingDateList); bookingDateService.removeBatchByIds(bookingDateList);
ThrowUtils.throwIf(!success, ErrorCode.OPERATION_ERROR, "预约日期批量删除失败"); // ThrowUtils.throwIf(!success, ErrorCode.OPERATION_ERROR, "预约日期批量删除失败");
// 批量删除写真产品 // 批量删除写真产品
boolean result = photoProductsService.removeBatchByIds(idList); boolean result = photoProductsService.removeBatchByIds(idList);
ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR, "写真产品批量删除失败"); ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR, "写真产品批量删除失败");

4
src/main/java/com/cultural/heritage/controller/good/AppointmentDateController.java
View File

@ -90,8 +90,8 @@ public class AppointmentDateController {
// 删除这个预约日期关联的所有时间段 // 删除这个预约日期关联的所有时间段
QueryWrapper<TimePeriod> queryWrapper = new QueryWrapper<>(); QueryWrapper<TimePeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("appointmentDateId", id); queryWrapper.eq("appointmentDateId", id);
boolean remove = timePeriodService.remove(queryWrapper); timePeriodService.remove(queryWrapper);
ThrowUtils.throwIf(!remove, ErrorCode.OPERATION_ERROR, "预约时间段删除失败"); // ThrowUtils.throwIf(!remove, ErrorCode.OPERATION_ERROR, "预约时间段删除失败");
// 删除这个预约日期 // 删除这个预约日期
boolean success = appointmentDateService.removeById(id); boolean success = appointmentDateService.removeById(id);

12
src/main/java/com/cultural/heritage/controller/good/CategoryController.java
View File

@ -101,8 +101,8 @@ public class CategoryController {
String typeName = category.getTypeName(); String typeName = category.getTypeName();
List<Good> goodList = commonService.findByFieldEqTargetField("type", typeName, goodService); List<Good> goodList = commonService.findByFieldEqTargetField("type", typeName, goodService);
boolean isSuccess = goodService.removeBatchByIds(goodList); goodService.removeBatchByIds(goodList);
ThrowUtils.throwIf(!isSuccess, ErrorCode.OPERATION_ERROR, "商品批量删除失败"); // ThrowUtils.throwIf(!isSuccess, ErrorCode.OPERATION_ERROR, "商品批量删除失败");
// 删除当前类别 // 删除当前类别
boolean result = categoryService.removeById(id); boolean result = categoryService.removeById(id);
@ -130,8 +130,8 @@ public class CategoryController {
List<Good> goodList = commonService.findByFieldInTargetField(categoryList, goodService, Category::getTypeName, "type"); List<Good> goodList = commonService.findByFieldInTargetField(categoryList, goodService, Category::getTypeName, "type");
// 批量删除商品 // 批量删除商品
boolean result = goodService.removeBatchByIds(goodList); goodService.removeBatchByIds(goodList);
ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR, "商品批量删除失败"); // ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR, "商品批量删除失败");
// 批量删除当前类别 // 批量删除当前类别
boolean remove = categoryService.removeBatchByIds(categoryList); boolean remove = categoryService.removeBatchByIds(categoryList);
@ -176,8 +176,8 @@ public class CategoryController {
// 修改原有类别下所有商品的类名 // 修改原有类别下所有商品的类名
UpdateWrapper<Good> goodUpdateWrapper = new UpdateWrapper<>(); UpdateWrapper<Good> goodUpdateWrapper = new UpdateWrapper<>();
goodUpdateWrapper.eq("type", originTypeName).set("type", targetTypeName); goodUpdateWrapper.eq("type", originTypeName).set("type", targetTypeName);
boolean update = goodService.update(goodUpdateWrapper); goodService.update(goodUpdateWrapper);
ThrowUtils.throwIf(!update, ErrorCode.OPERATION_ERROR, "商品类名更新失败"); // ThrowUtils.throwIf(!update, ErrorCode.OPERATION_ERROR, "商品类名更新失败");
return ResultUtils.success(true, "类别更新成功"); return ResultUtils.success(true, "类别更新成功");
} }

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

@ -66,7 +66,7 @@ public interface WeChatService {
RefundNotification getRefundInfo(HttpServletRequest request); RefundNotification getRefundInfo(HttpServletRequest request);
/** /**
* 退款回调（商品类） * 全额退款回调（商品类）
*/ */
boolean refundCallback(RefundNotification refundNotification); boolean refundCallback(RefundNotification refundNotification);

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

@ -419,8 +419,8 @@ public class WeChatServiceImpl implements WeChatService {
Good good = goodService.getById(id); Good good = goodService.getById(id);
ThrowUtils.throwIf(good == null, ErrorCode.OPERATION_ERROR, "当前商品不存在"); ThrowUtils.throwIf(good == null, ErrorCode.OPERATION_ERROR, "当前商品不存在");
good.setInventory(good.getInventory() + orderItems.getQuantity()); good.setInventory(good.getInventory() + orderItems.getQuantity());
boolean update = goodService.updateById(good); goodService.updateById(good);
ThrowUtils.throwIf(!update, ErrorCode.OPERATION_ERROR, "商品库存恢复失败"); // ThrowUtils.throwIf(!update, ErrorCode.OPERATION_ERROR, "商品库存恢复失败");
} }
System.out.println("---------------------------微信退款回调（结束）-------------------------------"); System.out.println("---------------------------微信退款回调（结束）-------------------------------");
return true; return true;
@ -508,12 +508,11 @@ public class WeChatServiceImpl implements WeChatService {
private void dealUserPointsByGood(Order order, boolean isAdd) { private void dealUserPointsByGood(Order order, boolean isAdd) {
BigDecimal totalAmount = order.getTotalAmount(); BigDecimal totalAmount = order.getTotalAmount();
CouponSnapshot couponSnapshot = order.getCouponSnapshot(); CouponSnapshot couponSnapshot = order.getCouponSnapshot();
if (isAdd) { if (couponSnapshot != null) {
if (couponSnapshot != null) { BigDecimal conditionAmount = couponSnapshot.getConditionAmount();
BigDecimal conditionAmount = couponSnapshot.getConditionAmount(); totalAmount = totalAmount.add(conditionAmount);
totalAmount = totalAmount.add(conditionAmount);
}
} }
totalAmount = totalAmount.multiply(new BigDecimal("100"));
userService.addOrSubUserPoints(order.getUserId(), isAdd, totalAmount.intValue()); userService.addOrSubUserPoints(order.getUserId(), isAdd, totalAmount.intValue());
} }
@ -523,6 +522,7 @@ public class WeChatServiceImpl implements WeChatService {
*/ */
private void dealUserPointsByPhoto(AdvanceOrder advanceOrder, boolean isAdd) { private void dealUserPointsByPhoto(AdvanceOrder advanceOrder, boolean isAdd) {
BigDecimal totalAmount = advanceOrder.getTotalAmount(); BigDecimal totalAmount = advanceOrder.getTotalAmount();
totalAmount = totalAmount.multiply(new BigDecimal("100"));
userService.addOrSubUserPoints(advanceOrder.getUserId(), isAdd, totalAmount.intValue()); userService.addOrSubUserPoints(advanceOrder.getUserId(), isAdd, totalAmount.intValue());
} }
@ -760,8 +760,8 @@ public class WeChatServiceImpl implements WeChatService {
good.setInventory(quantity + inventory); good.setInventory(quantity + inventory);
good.setUpdateTime(DateUtil.date()); good.setUpdateTime(DateUtil.date());
} }
boolean updateBatch = goodService.updateBatchById(goodList); goodService.updateBatchById(goodList);
ThrowUtils.throwIf(!updateBatch, ErrorCode.SYSTEM_ERROR, "商品库存恢复失败"); // ThrowUtils.throwIf(!updateBatch, ErrorCode.SYSTEM_ERROR, "商品库存恢复失败");
} }