修改

xuhy

2024-12-31 44a8377b13e30df474360408d90d955f3ac42599

 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;
@@ -91,6 +92,7 @@
            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)
@@ -118,6 +120,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 +133,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);