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

放入奖品库合并

See merge request quanshu/mp-server!287

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

@@ -95,7 +95,8 @@ public class UserExchangeOrderServiceImpl extends ServiceImpl<UserExchangeOrderM
     List<UserPrizeStorage> userPrizeStorageList = userPrizeStorageService.list(new LambdaQueryWrapper<UserPrizeStorage>()
         .eq(UserPrizeStorage::getUserId, userId)
         .eq(UserPrizeStorage::getGoodsId, goodsId)
-        .eq(UserPrizeStorage::getSkuId, skuId)
+        .eq(null != skuId, UserPrizeStorage::getSkuId, skuId)
+        .isNull(null == skuId, UserPrizeStorage::getSkuId)
         .eq(UserPrizeStorage::getStatus, PrizeStorageStatusEnum.NOT_DISTRIBUTED));
     if (CollectionUtils.isEmpty(userPrizeStorageList)) {
       UserPrizeStorage userPrizeStorage = new UserPrizeStorage();