cup 2 년 전
부모
커밋
a73e1f2b3d

+ 5 - 4
mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserPrizeRecoveryController.java

@@ -91,11 +91,12 @@ public class UserPrizeRecoveryController extends BaseApiController {
         // 兑换价格
         Integer exchangePrice = 0;
 
+        GoodsSku goodsSku = null;
         if (!Objects.isNull(userPrizeStorage.getSkuId())) {
-            GoodsSku goodsSku = goodsSkuService.getById(userPrizeStorage.getSkuId());
-            if (Objects.isNull(goodsSku)) {
-                return AjaxResult.error("sku信息有误");
-            }
+            goodsSku = goodsSkuService.getById(userPrizeStorage.getSkuId());
+        }
+
+        if (Objects.nonNull(goodsSku)) {
             if (!BigDecimal.ZERO.equals(goodsSku.getDiscountRate())) {
                 discountRate = goodsSku.getDiscountRate();
             }

+ 4 - 1
mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderServiceImpl.java

@@ -178,8 +178,11 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
     if (DeliverOrderResourceEnum.PAYMENT.equals(userDeliverOrder.getResource())) {
         // 恢复商品库存状态
         for (UserDeliverOrderItem orderItem : orderItemList) {
+            GoodsSku goodsSku = null;
             if (Objects.nonNull(orderItem.getSkuId()) && orderItem.getSkuId() != 0) {
-                GoodsSku goodsSku = goodsSkuService.getById(orderItem.getSkuId());
+                goodsSku = goodsSkuService.getById(orderItem.getSkuId());
+            }
+            if (Objects.nonNull(goodsSku)) {
                 boolean updateSku = goodsSkuService.update(new LambdaUpdateWrapper<GoodsSku>()
                         .set(GoodsSku::getQuantity, goodsSku.getQuantity() + orderItem.getGoodsNum())
                         .set(GoodsSku::getSoldQty, goodsSku.getSoldQty() - orderItem.getGoodsNum())