bug修改

无关风月

2025-02-28 2f8e70ad2884d2b6b7443dfae0af11ae9cfc8b99

 manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java

@@ -2,6 +2,7 @@


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.authority.model.SecUser;
@@ -21,7 +22,9 @@
import org.springframework.web.bind.annotation.*;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;

@@ -57,6 +60,7 @@
    private LoginInfoUtil loginInfoUtil;
    @Autowired
    private TOptometryService optometryService;

    @ApiOperation(value = "核算订单分页列表")
    @PostMapping(value = "/pageList")
    public ApiResult<PageInfo<TOrderVO>> pageList(@RequestBody TOrderAccountingQuery query) {
@@ -91,10 +95,11 @@
            SecFeeItems secFeeItems = feeItemsService.getById(orderItems.getItemsId());
            orderItems.setItemsName(secFeeItems.getName());
        }
        res.setItemsId(byId.getItemsId());
        res.setUserId(byId.getUserId());
        res.setOptometryId(byId.getOptometryId());
        List<TOptometryDetail> list = optometryDetailService.lambdaQuery().eq(TOptometryDetail::getOrderId, id)
                .eq(TOptometryDetail::getType, 1).list();
                .eq(TOptometryDetail::getType,  1).list();
        res.setOptometryDetails(list);
        List<TOrderGoods> orderGoods = orderGoodsService.lambdaQuery()
                .eq(TOrderGoods::getOrderId, id).list();
@@ -118,6 +123,9 @@
        res.setPayType(one1.getName());
        res.setProfitMoney(byId.getProfitMoney());
        res.setProfitRating(byId.getProfitRating());
        List<TOrderItems> orderItems = orderItemsService.list(Wrappers.lambdaQuery(TOrderItems.class)
                .eq(TOrderItems::getOrderId, id));
        res.setOrderItems(orderItems);
        return ApiResult.success(res);
    }
    @Autowired
@@ -128,7 +136,7 @@
        List<TOrderGoods> list = dto.getList();
        orderGoodsService.updateBatchById(list);
        TOrder byId = orderService.getById(dto.getId());
        byId.setConfirmPayType(dto.getPayTypeName());
        byId.setPayTypeName(dto.getPayTypeName());
        byId.setPayMoney(dto.getPayMoney());
        byId.setCommissionMoney(dto.getCommission());
        byId.setIsAccounting(1);