修改

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;
@@ -119,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
@@ -129,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);

 manage/src/main/java/com/jilongda/manage/utils/LoginInfoUtil.java

@@ -18,7 +18,7 @@

    public Long getUserId(){
        String username = JwtTokenUtils.getUsername();
        SecUser userName = secUserService.getOne(new QueryWrapper<SecUser>().eq("phone", username).eq("isDelete",0));
        SecUser userName = secUserService.getOne(new QueryWrapper<SecUser>().eq("account", username).eq("isDelete",0));
        return userName.getId();

    }

 manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java

@@ -48,7 +48,7 @@
    @ApiModelProperty(value = "支付方式")
    private String payType;
    @ApiModelProperty(value = "确认核算后的支付方式和支付金额")
    private List<TOrderItems> confirmPayType;
    private List<TOrderItems> orderItems;
    @ApiModelProperty(value = "实收金额")
    private BigDecimal realPayMoney;
    @ApiModelProperty(value = "手续费扣除")