Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!637

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

@@ -176,19 +176,18 @@ 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 = 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())
-                        .eq(GoodsSku::getSkuId, goodsSku.getSkuId())
-                        .eq(GoodsSku::getQuantity, goodsSku.getGoodsId())
-                        .eq(GoodsSku::getProperties, orderItem.getProperties()));
-
-                Assert.isTrue(updateSku, "现金购买商品取消订单更新SKU库存失败。goodsId:" + goodsSku.getGoodsId() + ",skuId:" + goodsSku.getSkuId());
+                GoodsSku 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())
+                            .eq(GoodsSku::getSkuId, goodsSku.getSkuId())
+                            .eq(GoodsSku::getQuantity, goodsSku.getGoodsId())
+                            .eq(GoodsSku::getProperties, orderItem.getProperties()));
+
+                    Assert.isTrue(updateSku, "现金购买商品取消订单更新SKU库存失败。goodsId:" + goodsSku.getGoodsId() + ",skuId:" + goodsSku.getSkuId());
+                }
             } else {
                 Goods goods = goodsService.getById(orderItem.getGoodsId());
                 // 更新库存