diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/card/AppCardController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/card/AppCardController.java index 07a8a6c7..220bad6e 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/card/AppCardController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/card/AppCardController.java @@ -161,7 +161,7 @@ public class AppCardController { @Operation(summary = "管理充值") public CommonResult rechargeByAdmin(@RequestBody RechargeVO vo) { BillingRespMoneyVO haveWithoutMoney = billingService.getHaveWithoutMoney(SecurityFrameworkUtils.getLoginUserId()); - if (haveWithoutMoney.getWithoutMoney().compareTo(BigDecimal.ZERO)!=0){ + if (haveWithoutMoney.getWithoutMoney().compareTo(BigDecimal.ZERO)>0){ throw exception(BILLING_NOT_COMPLETE); } cardService.rechargeByAdmin(vo); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java index 0e4cf3ee..521e10a6 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java @@ -198,7 +198,9 @@ public class AppStoreController { @Operation(summary = "添加二维码订单") public String payByCodeOrder(@RequestBody StoreOrderDto dto) { AddReqVO addReqVO = orderService.codePay(dto); - memberAsyncService.batchRecord(addReqVO); + if(CollectionUtil.isNotEmpty(addReqVO.getList())){ + memberAsyncService.batchRecord(addReqVO); + } return JsonUtils.toJsonString(StoreResult.success(null)); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java index 38a493e5..2f18ab67 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.member.service.storeorder; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -54,6 +55,7 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -232,6 +234,9 @@ public class StoreOrderServiceImpl implements StoreOrderService { addReqVO.setOutType(OutTypeEnum.SELL.getCode()); List infos = new ArrayList<>(); for (StoreGoodsDto detail : dto.getEquipmentGoodsCustoms()){ + if(detail.getGoodsId() == null){ + continue; + } GoodsInfoReqVO vo = new GoodsInfoReqVO(); BeanUtil.copyProperties(detail,vo); vo.setCarteenId(storeId); @@ -239,7 +244,9 @@ public class StoreOrderServiceImpl implements StoreOrderService { infos.add(vo); } addReqVO.setList(infos); - storeGoodsInventoryService.createStoreGoodsInventory(addReqVO); + if(CollectionUtil.isNotEmpty(infos)){ + storeGoodsInventoryService.createStoreGoodsInventory(addReqVO); + } StoreOrderDO order = createOrder(dto,StoreOrderStatusEnum.COMPLETE.getCode()); Double totalPrice = order.getTotalPrice();