无关风月
2024-12-30 be583594565c866127eefdab277a61061796c941
小程序
3个文件已修改
11 ■■■■■ 已修改文件
manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/model/TOrderItems.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
@@ -86,6 +86,11 @@
            res.setRealName(byId.getRealName());
            res.setGender(byId.getGender());
        }
        List<TOrderItems> list1 = orderItemsService.lambdaQuery().eq(TOrderItems::getOrderId, id).list();
        for (TOrderItems orderItems : list1) {
            SecFeeItems secFeeItems = feeItemsService.getById(orderItems.getItemsId());
            orderItems.setItemsName(secFeeItems.getName());
        }
        res.setUserId(byId.getUserId());
        res.setOptometryId(byId.getOptometryId());
        List<TOptometryDetail> list = optometryDetailService.lambdaQuery().eq(TOptometryDetail::getOrderId, id)
manage/src/main/java/com/jilongda/manage/model/TOrderItems.java
@@ -38,6 +38,9 @@
    @ApiModelProperty(value = "收费项id")
    @TableField("itemsId")
    private Integer itemsId;
    @ApiModelProperty(value = "收费项名称")
    @TableField(exist = false)
    private String itemsName;
    @ApiModelProperty(value = "金额")
    @TableField("money")
manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java
@@ -4,6 +4,7 @@
import com.jilongda.manage.model.TOptometryDetail;
import com.jilongda.manage.model.TOrder;
import com.jilongda.manage.model.TOrderGoods;
import com.jilongda.manage.model.TOrderItems;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
@@ -47,7 +48,7 @@
    @ApiModelProperty(value = "支付方式")
    private String payType;
    @ApiModelProperty(value = "确认核算后的支付方式和支付金额")
    private String confirmPayType;
    private List<TOrderItems> confirmPayType;
    @ApiModelProperty(value = "实收金额")
    private BigDecimal realPayMoney;
    @ApiModelProperty(value = "手续费扣除")