Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-14 3cade8b4d589dba5dbc44212c42ec26526470233

Merge remote-tracking branch 'origin/master'

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -524,6 +524,7 @@
        AppUser byId = appUserService.lambdaQuery()
                .eq(AppUser::getPhone, phone)
                .eq(AppUser::getDelFlag,0)
                .eq(AppUser::getStatus,1)
                .one();
        if (byId == null) {
            return R.fail("搜索失败，手机号错误。");

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java

@@ -54,14 +54,16 @@
        // 过滤商城购物
        List<BalanceChangeRecord> collect = balanceChangeRecordIPage.getRecords().stream().filter(e -> e.getChangeType() != 5).collect(Collectors.toList());
        for (BalanceChangeRecord changeRecord : collect) {
            BigDecimal subtract = changeRecord.getBeforeAmount().subtract(changeRecord.getAfterAmount());
            if (subtract.compareTo(BigDecimal.ZERO)>0){
                // 减少
                changeRecord.setChangeAmountString("-￥"+changeRecord.getChangeAmount());
            }else if (subtract.compareTo(BigDecimal.ZERO)<0){
                changeRecord.setChangeAmountString("+￥"+changeRecord.getChangeAmount());
            }else{
                changeRecord.setChangeAmountString("￥"+changeRecord.getChangeAmount());
            if (changeRecord.getBeforeAmount()!=null && changeRecord.getAfterAmount()!=null){
                BigDecimal subtract = changeRecord.getBeforeAmount().subtract(changeRecord.getAfterAmount());
                if (subtract.compareTo(BigDecimal.ZERO)>0){
                    // 减少
                    changeRecord.setChangeAmountString("-￥"+changeRecord.getChangeAmount());
                }else if (subtract.compareTo(BigDecimal.ZERO)<0){
                    changeRecord.setChangeAmountString("+￥"+changeRecord.getChangeAmount());
                }else{
                    changeRecord.setChangeAmountString("￥"+changeRecord.getChangeAmount());
                }
            }
        }
        balanceChangeRecordIPage.setRecords(collect);

 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml

@@ -29,7 +29,9 @@
            tau.phone userPhone,
            tbcr.change_type,
            tbcr.create_time,
            tbcr.change_amount
            tbcr.change_amount,
        tbcr.beforeAmount,
        tbcr.afterAmount
        FROM
            t_balance_change_record tbcr
                LEFT JOIN t_app_user tau ON tbcr.app_user_id = tau.id

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsBargainPriceServiceImpl.java

@@ -94,6 +94,7 @@
        //添加明细
        List<GoodsBargainPriceDetail> list = vo.getList();
        for (GoodsBargainPriceDetail goodsBargainPriceDetail : list) {
            goodsBargainPriceDetail.setId(null);
            goodsBargainPriceDetail.setGoodsBargainPriceId(bargainPrice.getId());
        }
        goodsBargainPriceDetailService.saveBatch(list);