Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

xiaoyong931011

2021-09-28 788fab0d567999583e535175f0a9f65273237f4b

Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java

@@ -167,9 +167,7 @@
        redisUtils.set(redisKey, token, 360000);
        Map<String, Object> authInfo = new HashMap<>();
        authInfo.put("token", token);
        if ("dev".equals(active)) {
            authInfo.put("rasToken", generateAsaToken(token));
        }
        authInfo.put("rasToken", generateAsaToken(token));
        return new FebsResponse().success().data(authInfo);
    }


 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java

@@ -101,7 +101,12 @@
            }

            if (sku.getStock() < item.getCnt()) {
                throw new FebsException("库存不足");
                throw new FebsException(sku.getSkuName() + "库存不足");
            }

            MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId());
            if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) {
                throw new FebsException(mallGoods.getGoodsName() + "已下架");
            }

            MallOrderItem orderItem = new MallOrderItem();