修改统计bug和部分功能修改

Pu Zhibing

2025-03-27 e7a4c604b4703caf135ec3d360106e7cf028cc89

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java

@@ -18,6 +18,8 @@
import com.ruoyi.order.vo.OrderSaleNum;
import com.ruoyi.order.vo.VerifiableShopVo;
import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.mapper.ShopBalanceStatementCopyMapper;
import com.ruoyi.other.mapper.ShopGiveawayTemporaryMapper;
import com.ruoyi.other.mapper.ShopMapper;
import com.ruoyi.other.service.*;
import com.ruoyi.other.util.GeodesyUtil;
@@ -89,6 +91,9 @@
    private TechnicianService technicianService;
    @Resource
    private ReceiverBankChannelService receiverBankChannelService;
    
    @Resource
    private ShopGiveawayTemporaryMapper shopGiveawayTemporaryMapper;



@@ -885,6 +890,15 @@
            serverGiveawayMoney = serverGiveawayMoney.add(shop.getServerGiveawayMoney());
            giveawayMoney = giveawayMoney.add(shop.getGiveawayMoney().add(shop.getLowerLevelGiveawayMoney()));
        }
        LambdaQueryWrapper<ShopGiveawayTemporary> wrapper = new LambdaQueryWrapper<>();
        if(null != shopId && 0 != shopId){
            wrapper.eq(ShopGiveawayTemporary::getShopId, shopId);
        }
        List<ShopGiveawayTemporary> list = shopGiveawayTemporaryMapper.selectList(wrapper);
        BigDecimal reduce = list.stream().map(ShopGiveawayTemporary::getServerGiveawayMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
        serverGiveawayMoney = serverGiveawayMoney.add(reduce);
        BigDecimal reduce1 = list.stream().map(ShopGiveawayTemporary::getGiveawayMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
        giveawayMoney = giveawayMoney.add(reduce1);
        Map<String, BigDecimal> map = new HashMap<>();
        map.put("serverGiveawayMoney", serverGiveawayMoney);
        map.put("giveawayMoney", giveawayMoney);