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

优化

See merge request quanshu/mp-server!743

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

@@ -129,7 +129,7 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
             // 现金购买需要校验和锁库存
             if (Objects.nonNull(prizeStorage.getSkuId()) && prizeStorage.getSkuId() != 0) {
                 GoodsSku goodsSku = goodsSkuService.getById(prizeStorage.getSkuId());
-                if (goodsSku.getQuantity() - prizeStorage.getGoodsNum() < 0) {
+                if (goodsSku.getQuantity() < prizeStorage.getGoodsNum()) {
                     throw new ServiceException(prizeStorage.getTitle() + "库存不足,请重新下单");
                 }
 
@@ -143,7 +143,7 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
                 Assert.isTrue(updateSku, "现金购买商品更新SKU库存失败。goodsId:" + goodsSku.getGoodsId() + ",skuId:" + goodsSku.getSkuId());
 
             } else {
-                if (goods.getQuantity() - prizeStorage.getGoodsNum() < 0) {
+                if (goods.getQuantity() < prizeStorage.getGoodsNum()) {
                     throw new ServiceException(prizeStorage.getTitle() + "库存不足,请重新下单");
                 }
                 // 更新库存