bug
jiangqs
2023-08-06 85bbd80dd1e1599d7fea677aad705bad4f8b042b
bug
5个文件已修改
8 ■■■■ 已修改文件
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsTotalServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopTotalServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
@@ -550,7 +550,7 @@
     */
    @Override
    public void changeActivityTotal(ActivityTotalChangeDto activityTotalChangeDto){
        log.debug("活动统计变化---"+activityTotalChangeDto.toString());
        RLock lock = redissonClient.getLock("activity_clock_"+activityTotalChangeDto.getActivityId());
        try {
            lock.lock(30, TimeUnit.SECONDS);
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsTotalServiceImpl.java
@@ -32,6 +32,7 @@
     */
    @Override
    public void changeGoodsTotal(List<GoodsTotalChangeDto> goodsTotalChangeDtoList){
        log.debug("商品统计变动"+goodsTotalChangeDtoList.toString());
        if (goodsTotalChangeDtoList != null && !goodsTotalChangeDtoList.isEmpty()) {
            // 创建一个空的GoodsTotal对象
            GoodsTotal goodsTotal;
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -1024,6 +1024,7 @@
     */
    @Override
    public void memberIntegralChange(MemberIntegralChangeDto memberIntegralChangeDto) {
        log.info("会员积分变动---"+memberIntegralChangeDto.toString());
        MemberTotal memberTotal = memberTotalService.getById(memberIntegralChangeDto.getMemberId());
        Integer recordType = memberIntegralChangeDto.getRecordType();
        Integer changeType = memberIntegralChangeDto.getChangeType();
@@ -1490,6 +1491,7 @@
     */
    @Override
    public void changeMemberTotal(MemberTotalChangeDto memberTotalChangeDto) {
        log.info("会员统计变动---"+memberTotalChangeDto.toString());
        Member member = this.getByUserId(memberTotalChangeDto.getUserId());
        MemberTotal memberTotal = memberTotalService.getById(member.getMemberId());
        //积分变动
@@ -1857,6 +1859,7 @@
     */
    @Override
    public Boolean changeIntegral(IntegralChangeDto integralChangeDto){
        log.info("会员积分变动---"+integralChangeDto.toString());
        Member member = this.getByUserId(integralChangeDto.getUserId());
        Integer integralType = integralChangeDto.getIntegralType();
        Integer changeIntegral = integralChangeDto.getChangeIntegral();
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -3675,6 +3675,7 @@
            goodsTotalChangeDtoList.add(goodsTotalChangeDto);
        }
        //更新商品统计
        remoteGoodsService.changeGoodsTotal(goodsTotalChangeDtoList);
        // 更新商户统计信息
        ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
        shopTotalChangeDto.setShopId(order.getShopId());
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopTotalServiceImpl.java
@@ -57,6 +57,7 @@
    //更新商户统计实现
    private void handleShopTotal(ShopTotalChangeDto shopTotalChangeDto){
        log.debug("商户统计变动"+shopTotalChangeDto.toString());
        ShopTotal shopTotal = this.getById(shopTotalChangeDto.getShopId());
        //订单变化
        BigDecimal payMoney = BigDecimal.ZERO;