修改物流信息导入模板

luofl

2025-02-24 199861555473ab50f2fafa3d58e42e64e838c039

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

@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.api.model.BalanceChangeRecordCopy;
import com.ruoyi.account.api.model.BalancePayment;
import com.ruoyi.account.service.*;
import com.ruoyi.account.util.payment.PaymentUtil;
@@ -47,6 +48,8 @@
    @Resource
    private BalanceChangeRecordService balanceChangeRecordService;
    @Resource
    private BalanceChangeRecordCopyService balanceChangeRecordCopyService;
    @Resource
    private TokenService tokenService;
    @Resource
    private WalletService walletService;
@@ -83,7 +86,7 @@
     */
    @ApiOperation(value = "变更明细", notes = "变更明细")
    @GetMapping("change")
    public R<IPage<BalanceChangeRecord>> change(@ApiParam(value = "变更类型")
    public R<IPage<BalanceChangeRecordCopy>> change(@ApiParam(value = "变更类型")
                                               @RequestParam(required = false) Integer changeType,
                                                Integer pageCurr,
                                                Integer pageSize,
@@ -107,14 +110,14 @@
            endTime = lastDayOfMonth.atTime(LocalTime.MAX);
        }

        Page<BalanceChangeRecord> page = balanceChangeRecordService.page(Page.of(pageCurr, pageSize), new LambdaQueryWrapper<BalanceChangeRecord>()
                .eq(changeType != null, BalanceChangeRecord::getChangeType, changeType)
                .between(startTime != null, BalanceChangeRecord::getCreateTime, startTime, endTime)
                .eq(BalanceChangeRecord::getAppUserId, userId).orderByDesc(BalanceChangeRecord::getCreateTime));
        Page<BalanceChangeRecordCopy> page = balanceChangeRecordCopyService.page(Page.of(pageCurr, pageSize), new LambdaQueryWrapper<BalanceChangeRecordCopy>()
                .eq(changeType != null, BalanceChangeRecordCopy::getChangeType, changeType)
                .between(startTime != null, BalanceChangeRecordCopy::getCreateTime, startTime, endTime)
                .eq(BalanceChangeRecordCopy::getAppUserId, userId).orderByDesc(BalanceChangeRecordCopy::getCreateTime));

        List<BalanceChangeRecord> list = page.getRecords();
        List<BalanceChangeRecordCopy> list = page.getRecords();

        List<Long> orderIds = list.stream().map(BalanceChangeRecord::getOrderId).collect(Collectors.toList());
        List<Long> orderIds = list.stream().map(BalanceChangeRecordCopy::getOrderId).collect(Collectors.toList());
        if (CollectionUtil.isNotEmpty(orderIds)){
            R<List<Order>> r = remoteOrderGoodsClient.getOrderListByIds(orderIds);
            if (!R.isSuccess(r)){