Procházet zdrojové kódy

陆运修改

Signed-off-by: sunhz <mpcoo@foxmail.com>
sunhz před 3 roky
rodič
revize
1046324823

+ 0 - 597
blade-ops/blade-report/src/main/java/org/springblade/report/entity/Order.java

@@ -1,597 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.report.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 销售或采购订单表实体类
- *
- * @author BladeX
- * @since 2021-12-27
- */
-@Data
-@TableName("business_order")
-@ApiModel(value = "Order对象", description = "销售或采购订单表")
-public class Order implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
-	/**
-	* 子明细的提单号集合
-	*/
-		@ApiModelProperty(value = "子明细的提单号集合")
-		private String billNo;
-	/**
-	* 系统编号
-	*/
-		@ApiModelProperty(value = "系统编号")
-		private String sysNo;
-	/**
-	* 订单号
-	*/
-		@ApiModelProperty(value = "订单号")
-		private String orderNo;
-	/**
-	* 主订单号
-	*/
-		@ApiModelProperty(value = "主订单号")
-		private String morderNo;
-	/**
-	* 原始订单号
-	*/
-		@ApiModelProperty(value = "原始订单号")
-		private String orgOrderNo;
-	/**
-	* 来源订单号
-	*/
-		@ApiModelProperty(value = "来源订单号")
-		private String srcOrderNo;
-	/**
-	* 来源id
-	*/
-		@ApiModelProperty(value = "来源id")
-		private Long srcId;
-	/**
-	* 订单类型 销售订单 XS 采购订单 CG
-	*/
-		@ApiModelProperty(value = "订单类型 销售订单 XS 采购订单 CG")
-		private String billType;
-	/**
-	* 贸易类型(枚举:国内、进口、出口)
-	*/
-		@ApiModelProperty(value = "贸易类型(枚举:国内、进口、出口)")
-		private String tradeType;
-	/**
-	* 合同类型
-	*/
-		@ApiModelProperty(value = "合同类型")
-		private String orderType;
-	/**
-	* 订单日期
-	*/
-		@ApiModelProperty(value = "订单日期")
-		private LocalDateTime businesDate;
-	/**
-	* 客户或供应商id(全称)
-	*/
-		@ApiModelProperty(value = "客户或供应商id(全称)")
-		private Long corpId;
-	/**
-	* 采购商id
-	*/
-		@ApiModelProperty(value = "采购商id")
-		private Long purchaserId;
-	/**
-	* 仓库id
-	*/
-		@ApiModelProperty(value = "仓库id")
-		private Long storageId;
-	/**
-	* 发货地址
-	*/
-		@ApiModelProperty(value = "发货地址")
-		private String shippingAddress;
-	/**
-	* 到货地址
-	*/
-		@ApiModelProperty(value = "到货地址")
-		private String arrivalAddress;
-	/**
-	* 包装要求
-	*/
-		@ApiModelProperty(value = "包装要求")
-		private String packageRemarks;
-	/**
-	* 运费要求
-	*/
-		@ApiModelProperty(value = "运费要求")
-		private String freightRemarks;
-	/**
-	* 银行信息
-	*/
-		@ApiModelProperty(value = "银行信息")
-		private String banks;
-	/**
-	* 公司户头
-	*/
-		@ApiModelProperty(value = "公司户头")
-		private String banksAccountName;
-	/**
-	* 要求发货日期
-	*/
-		@ApiModelProperty(value = "要求发货日期")
-		private LocalDateTime requiredDeliveryDate;
-	/**
-	* 要求到货日期
-	*/
-		@ApiModelProperty(value = "要求到货日期")
-		private LocalDateTime requiredArrivalDate;
-	/**
-	* 订单备注
-	*/
-		@ApiModelProperty(value = "订单备注")
-		private String orderRemark;
-	/**
-	* 订单金额(合同金额)
-	*/
-		@ApiModelProperty(value = "订单金额(合同金额)")
-		private BigDecimal orderAmount;
-	/**
-	* 其他费用
-	*/
-		@ApiModelProperty(value = "其他费用")
-		private BigDecimal otherAmount;
-	/**
-	* 应收账款
-	*/
-		@ApiModelProperty(value = "应收账款")
-		private BigDecimal debitAmount;
-	/**
-	* 人民币-已收/已付账款
-	*/
-		@ApiModelProperty(value = "人民币-已收/已付账款")
-		private BigDecimal settlmentAmount;
-	/**
-	* 未收账款
-	*/
-		@ApiModelProperty(value = "未收账款")
-		private BigDecimal balanceAmount;
-	/**
-	* 付款方式
-	*/
-		@ApiModelProperty(value = "付款方式")
-		private String paymentType;
-	/**
-	* 信用证到期日(付款方式开证,必须输入)
-	*/
-		@ApiModelProperty(value = "信用证到期日(付款方式开证,必须输入)")
-		private LocalDateTime creditDate;
-	/**
-	* 预(收)付款
-	*/
-		@ApiModelProperty(value = "预(收)付款")
-		private BigDecimal advancePayment;
-	/**
-	* 溢付款
-	*/
-		@ApiModelProperty(value = "溢付款")
-		private BigDecimal overPayment;
-	/**
-	* 保证金
-	*/
-		@ApiModelProperty(value = "保证金")
-		private BigDecimal deposit;
-	/**
-	* 逾期款
-	*/
-		@ApiModelProperty(value = "逾期款")
-		private BigDecimal overDueAccounts;
-	/**
-	* 预收款日期
-	*/
-		@ApiModelProperty(value = "预收款日期")
-		private LocalDateTime advanceCollectionDate;
-	/**
-	* 应收(付)款日期
-	*/
-		@ApiModelProperty(value = "应收(付)款日期")
-		private LocalDateTime accountsCollectionDate;
-	/**
-	* 毛利率
-	*/
-		@ApiModelProperty(value = "毛利率")
-		private BigDecimal grossProfitRate;
-	/**
-	* 毛利润
-	*/
-		@ApiModelProperty(value = "毛利润")
-		private BigDecimal grossProfit;
-	/**
-	* 所属公司id(全称)销售公司
-	*/
-		@ApiModelProperty(value = "所属公司id(全称)销售公司")
-		private Long belongToCorpId;
-	/**
-	* 历史平均运费
-	*/
-		@ApiModelProperty(value = "历史平均运费")
-		private BigDecimal freightAmountHistory;
-	/**
-	* 实际发货日期
-	*/
-		@ApiModelProperty(value = "实际发货日期")
-		private LocalDateTime actualDeliveryDate;
-	/**
-	* 实际到货日期
-	*/
-		@ApiModelProperty(value = "实际到货日期")
-		private LocalDateTime arrivalDate;
-	/**
-	* 采购方式
-	*/
-		@ApiModelProperty(value = "采购方式")
-		private String procurementMethod;
-	/**
-	* 入库金额
-	*/
-		@ApiModelProperty(value = "入库金额")
-		private BigDecimal storageAmount;
-	/**
-	* 采购金额
-	*/
-		@ApiModelProperty(value = "采购金额")
-		private BigDecimal purchaseAmount;
-	/**
-	* 入库数量
-	*/
-		@ApiModelProperty(value = "入库数量")
-		private BigDecimal storageQuantity;
-	/**
-	* 采购数量
-	*/
-		@ApiModelProperty(value = "采购数量")
-		private BigDecimal purchaseQuantity;
-	/**
-	* 积分倍数
-	*/
-		@ApiModelProperty(value = "积分倍数")
-		private BigDecimal pointMutiple;
-	/**
-	* 特别提醒
-	*/
-		@ApiModelProperty(value = "特别提醒")
-		private String specialRemarks;
-	/**
-	* 业务员
-	*/
-		@ApiModelProperty(value = "业务员")
-		private String salesName;
-	/**
-	* 提成标准
-	*/
-		@ApiModelProperty(value = "提成标准")
-		private String commissionRate;
-	/**
-	* 销售单价
-	*/
-		@ApiModelProperty(value = "销售单价")
-		private BigDecimal salesPrice;
-	/**
-	* 发票重量
-	*/
-		@ApiModelProperty(value = "发票重量")
-		private BigDecimal invoiceWeight;
-	/**
-	* 码单重量
-	*/
-		@ApiModelProperty(value = "码单重量")
-		private BigDecimal billWeight;
-	/**
-	* 币别
-	*/
-		@ApiModelProperty(value = "币别")
-		private String currency;
-	/**
-	* 汇率
-	*/
-		@ApiModelProperty(value = "汇率")
-		private BigDecimal exchangeRate;
-	/**
-	* 计划交货日期
-	*/
-		@ApiModelProperty(value = "计划交货日期")
-		private LocalDateTime plannedDeliveryDate;
-	/**
-	* 形式发票
-	*/
-		@ApiModelProperty(value = "形式发票")
-		private String proformInvoice;
-	/**
-	* 装货港
-	*/
-		@ApiModelProperty(value = "装货港")
-		private String portOfLoad;
-	/**
-	* 目的港
-	*/
-		@ApiModelProperty(value = "目的港")
-		private String portOfDestination;
-	/**
-	* 海运费
-	*/
-		@ApiModelProperty(value = "海运费")
-		private BigDecimal oceanFreight;
-	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
-	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private Long createUser;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private Long createDept;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private Long updateUser;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
-	/**
-	* 状态(0 正常 1停用)
-	*/
-		@ApiModelProperty(value = "状态(0 正常 1停用)")
-		private Integer status;
-	/**
-	* 是否已删除(0 否 1是)
-	*/
-		@ApiModelProperty(value = "是否已删除(0 否 1是)")
-		private Integer isDeleted;
-	/**
-	* 到港日期
-	*/
-		@ApiModelProperty(value = "到港日期")
-		private LocalDateTime dateOfArrival;
-	/**
-	* 是否到货
-	*/
-		@ApiModelProperty(value = "是否到货")
-		private Integer arrival;
-	/**
-	* 首付比列
-	*/
-		@ApiModelProperty(value = "首付比列")
-		private BigDecimal downPayment;
-	/**
-	* 人民币金额
-	*/
-		@ApiModelProperty(value = "人民币金额")
-		private BigDecimal rmbAmount;
-	/**
-	* 客户联系人
-	*/
-		@ApiModelProperty(value = "客户联系人")
-		private String corpAttn;
-	/**
-	* 其他联系人
-	*/
-		@ApiModelProperty(value = "其他联系人")
-		private String otherCorpAttn;
-	/**
-	* 联系人电话
-	*/
-		@ApiModelProperty(value = "联系人电话")
-		private String corpTel;
-	/**
-	* 合同重量
-	*/
-		@ApiModelProperty(value = "合同重量")
-		private BigDecimal contractWeight;
-	/**
-	* 贸易条款
-	*/
-		@ApiModelProperty(value = "贸易条款")
-		private String tradeTerms;
-	/**
-	* 贸易条款描述
-	*/
-		@ApiModelProperty(value = "贸易条款描述")
-		private String tradeTermsDescription;
-	/**
-	* 价格条款
-	*/
-		@ApiModelProperty(value = "价格条款")
-		private String priceTerms;
-	/**
-	* 价格条款描述
-	*/
-		@ApiModelProperty(value = "价格条款描述")
-		private String priceTermsDescription;
-	/**
-	* 运输方式
-	*/
-		@ApiModelProperty(value = "运输方式")
-		private String transport;
-	/**
-	* 有效期
-	*/
-		@ApiModelProperty(value = "有效期")
-		private LocalDateTime dateValidity;
-	/**
-	* 收付款方式描述
-	*/
-		@ApiModelProperty(value = "收付款方式描述")
-		private String paymentTypeDescription;
-	/**
-	* 保险
-	*/
-		@ApiModelProperty(value = "保险")
-		private String insuranceRemarks;
-	/**
-	* 唛头
-	*/
-		@ApiModelProperty(value = "唛头")
-		private String marks;
-	/**
-	* 信用证编号
-	*/
-		@ApiModelProperty(value = "信用证编号")
-		private String creditNumber;
-	/**
-	* 信用证金额
-	*/
-		@ApiModelProperty(value = "信用证金额")
-		private BigDecimal creditAmount;
-	/**
-	* 订单状态
-	*/
-		@ApiModelProperty(value = "订单状态")
-		private String orderStatus;
-	/**
-	* 是否询价
-	*/
-		@ApiModelProperty(value = "是否询价")
-		private String ifEnquiry;
-	/**
-	* 是否船务
-	*/
-		@ApiModelProperty(value = "是否船务")
-		private String ifShipping;
-	/**
-	* 采购核价备注
-	*/
-		@ApiModelProperty(value = "采购核价备注")
-		private String purchasePricingRemarks;
-	/**
-	* 销售核价备注
-	*/
-		@ApiModelProperty(value = "销售核价备注")
-		private String sellPricingRemarks;
-	/**
-	* 是否开票
-	*/
-		@ApiModelProperty(value = "是否开票")
-		private String ifInvoice;
-	/**
-	* 箱型
-	*/
-		@ApiModelProperty(value = "箱型")
-		private String boxPile;
-	/**
-	* 起订量
-	*/
-		@ApiModelProperty(value = "起订量")
-		private BigDecimal minOrder;
-	/**
-	* 预计海运费
-	*/
-		@ApiModelProperty(value = "预计海运费")
-		private BigDecimal predictOceanFreight;
-	/**
-	* 参考海运费
-	*/
-		@ApiModelProperty(value = "参考海运费")
-		private BigDecimal referenceOceanFreight;
-	/**
-	* 箱量
-	*/
-		@ApiModelProperty(value = "箱量")
-		private BigDecimal boxNumber;
-	/**
-	* 采购备注
-	*/
-		@ApiModelProperty(value = "采购备注")
-		private String purchaseRemark;
-	/**
-	* 船务备注
-	*/
-		@ApiModelProperty(value = "船务备注")
-		private String shippingRemark;
-	/**
-	* 生产工厂
-	*/
-		@ApiModelProperty(value = "生产工厂")
-		private Long productionPlant;
-	/**
-	* FOB系数
-	*/
-		@ApiModelProperty(value = "FOB系数")
-		private BigDecimal coefficient;
-	/**
-	* 开户银行
-	*/
-		@ApiModelProperty(value = "开户银行")
-		private String accountBank;
-	/**
-	* 预付保证金币别
-	*/
-		@ApiModelProperty(value = "预付保证金币别")
-		private String prepayCurrency;
-	/**
-	* 发票金额
-	*/
-		@ApiModelProperty(value = "发票金额")
-		private BigDecimal invoiceAmount;
-	/**
-	* 特价占比
-	*/
-		@ApiModelProperty(value = "特价占比")
-		private BigDecimal specialOfferOf;
-	/**
-	* 最迟付款日期
-	*/
-		@ApiModelProperty(value = "最迟付款日期")
-		private LocalDateTime latestDate;
-	/**
-	* 外币-已收/已付账款
-	*/
-		@ApiModelProperty(value = "外币-已收/已付账款")
-		private BigDecimal foreignSettlmentAmount;
-	/**
-	* 单票毛利
-	*/
-		@ApiModelProperty(value = "单票毛利")
-		private BigDecimal singleTicketMargin;
-
-
-}

+ 0 - 30
blade-ops/blade-report/src/main/java/org/springblade/report/mapper/OrderMapper.java

@@ -1,30 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.report.mapper;
-
-import org.springblade.report.entity.Order;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 销售或采购订单表 Mapper 接口
- *
- * @author BladeX
- * @since 2021-12-27
- */
-public interface OrderMapper extends BaseMapper<Order> {
-
-}

+ 0 - 120
blade-ops/blade-report/src/main/java/org/springblade/report/mapper/OrderMapper.xml

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.report.mapper.OrderMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="orderResultMap" type="org.springblade.report.entity.Order">
-        <id column="id" property="id"/>
-        <result column="bill_no" property="billNo"/>
-        <result column="sys_no" property="sysNo"/>
-        <result column="order_no" property="orderNo"/>
-        <result column="morder_no" property="morderNo"/>
-        <result column="org_order_no" property="orgOrderNo"/>
-        <result column="src_order_no" property="srcOrderNo"/>
-        <result column="src_id" property="srcId"/>
-        <result column="bill_type" property="billType"/>
-        <result column="trade_type" property="tradeType"/>
-        <result column="order_type" property="orderType"/>
-        <result column="busines_date" property="businesDate"/>
-        <result column="corp_id" property="corpId"/>
-        <result column="purchaser_id" property="purchaserId"/>
-        <result column="storage_id" property="storageId"/>
-        <result column="shipping_address" property="shippingAddress"/>
-        <result column="arrival_address" property="arrivalAddress"/>
-        <result column="package_remarks" property="packageRemarks"/>
-        <result column="freight_remarks" property="freightRemarks"/>
-        <result column="banks" property="banks"/>
-        <result column="banks_account_name" property="banksAccountName"/>
-        <result column="required_delivery_date" property="requiredDeliveryDate"/>
-        <result column="required_arrival_date" property="requiredArrivalDate"/>
-        <result column="order_remark" property="orderRemark"/>
-        <result column="order_amount" property="orderAmount"/>
-        <result column="other_amount" property="otherAmount"/>
-        <result column="debit_amount" property="debitAmount"/>
-        <result column="settlment_amount" property="settlmentAmount"/>
-        <result column="balance_amount" property="balanceAmount"/>
-        <result column="payment_type" property="paymentType"/>
-        <result column="credit_date" property="creditDate"/>
-        <result column="advance_payment" property="advancePayment"/>
-        <result column="over_payment" property="overPayment"/>
-        <result column="deposit" property="deposit"/>
-        <result column="over_due_accounts" property="overDueAccounts"/>
-        <result column="advance_collection_date" property="advanceCollectionDate"/>
-        <result column="accounts_collection_date" property="accountsCollectionDate"/>
-        <result column="gross_profit_rate" property="grossProfitRate"/>
-        <result column="gross_profit" property="grossProfit"/>
-        <result column="belong_to_corp_id" property="belongToCorpId"/>
-        <result column="freight_amount_history" property="freightAmountHistory"/>
-        <result column="actual_delivery_date" property="actualDeliveryDate"/>
-        <result column="arrival_date" property="arrivalDate"/>
-        <result column="procurement_method" property="procurementMethod"/>
-        <result column="storage_amount" property="storageAmount"/>
-        <result column="purchase_amount" property="purchaseAmount"/>
-        <result column="storage_quantity" property="storageQuantity"/>
-        <result column="purchase_quantity" property="purchaseQuantity"/>
-        <result column="point_mutiple" property="pointMutiple"/>
-        <result column="special_remarks" property="specialRemarks"/>
-        <result column="sales_name" property="salesName"/>
-        <result column="commission_rate" property="commissionRate"/>
-        <result column="sales_price" property="salesPrice"/>
-        <result column="invoice_weight" property="invoiceWeight"/>
-        <result column="bill_weight" property="billWeight"/>
-        <result column="currency" property="currency"/>
-        <result column="exchange_rate" property="exchangeRate"/>
-        <result column="planned_delivery_date" property="plannedDeliveryDate"/>
-        <result column="proform_invoice" property="proformInvoice"/>
-        <result column="port_of_load" property="portOfLoad"/>
-        <result column="port_of_destination" property="portOfDestination"/>
-        <result column="ocean_freight" property="oceanFreight"/>
-        <result column="version" property="version"/>
-        <result column="create_user" property="createUser"/>
-        <result column="create_dept" property="createDept"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_user" property="updateUser"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="status" property="status"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="date_of_arrival" property="dateOfArrival"/>
-        <result column="arrival" property="arrival"/>
-        <result column="down_payment" property="downPayment"/>
-        <result column="rmb_amount" property="rmbAmount"/>
-        <result column="corp_attn" property="corpAttn"/>
-        <result column="other_corp_attn" property="otherCorpAttn"/>
-        <result column="corp_tel" property="corpTel"/>
-        <result column="contract_weight" property="contractWeight"/>
-        <result column="trade_terms" property="tradeTerms"/>
-        <result column="trade_terms_description" property="tradeTermsDescription"/>
-        <result column="price_terms" property="priceTerms"/>
-        <result column="price_terms_description" property="priceTermsDescription"/>
-        <result column="transport" property="transport"/>
-        <result column="date_validity" property="dateValidity"/>
-        <result column="payment_type_description" property="paymentTypeDescription"/>
-        <result column="insurance_remarks" property="insuranceRemarks"/>
-        <result column="marks" property="marks"/>
-        <result column="credit_number" property="creditNumber"/>
-        <result column="credit_amount" property="creditAmount"/>
-        <result column="order_status" property="orderStatus"/>
-        <result column="if_enquiry" property="ifEnquiry"/>
-        <result column="if_shipping" property="ifShipping"/>
-        <result column="purchase_pricing_remarks" property="purchasePricingRemarks"/>
-        <result column="sell_pricing_remarks" property="sellPricingRemarks"/>
-        <result column="if_invoice" property="ifInvoice"/>
-        <result column="box_pile" property="boxPile"/>
-        <result column="min_order" property="minOrder"/>
-        <result column="predict_ocean_freight" property="predictOceanFreight"/>
-        <result column="reference_ocean_freight" property="referenceOceanFreight"/>
-        <result column="box_number" property="boxNumber"/>
-        <result column="purchase_remark" property="purchaseRemark"/>
-        <result column="shipping_remark" property="shippingRemark"/>
-        <result column="production_plant" property="productionPlant"/>
-        <result column="coefficient" property="coefficient"/>
-        <result column="account_bank" property="accountBank"/>
-        <result column="prepay_currency" property="prepayCurrency"/>
-        <result column="invoice_amount" property="invoiceAmount"/>
-        <result column="special_offer_of" property="specialOfferOf"/>
-        <result column="latest_date" property="latestDate"/>
-        <result column="foreign_settlment_amount" property="foreignSettlmentAmount"/>
-        <result column="single_ticket_margin" property="singleTicketMargin"/>
-    </resultMap>
-
-</mapper>

+ 0 - 30
blade-ops/blade-report/src/main/java/org/springblade/report/service/IOrderService.java

@@ -1,30 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.report.service;
-
-import org.springblade.report.entity.Order;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 销售或采购订单表 服务类
- *
- * @author BladeX
- * @since 2021-12-27
- */
-public interface IOrderService extends IService<Order> {
-
-}

+ 0 - 34
blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/OrderServiceImpl.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.report.service.impl;
-
-import org.springblade.report.entity.Order;
-import org.springblade.report.mapper.OrderMapper;
-import org.springblade.report.service.IOrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * 销售或采购订单表 服务实现类
- *
- * @author BladeX
- * @since 2021-12-27
- */
-@Service
-public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
-
-}

+ 0 - 5
blade-ops/blade-report/src/main/java/org/springblade/report/ureport/ProjectBean.java

@@ -1,13 +1,8 @@
 package org.springblade.report.ureport;
 
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import lombok.AllArgsConstructor;
-import org.springblade.core.secure.utils.AuthUtil;
-
 import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.report.entity.ServiceProjectItem;
 import org.springblade.report.service.ServiceProjectItemService;
-import org.springblade.report.service.impl.OrderServiceImpl;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

+ 0 - 68
blade-ops/blade-report/src/main/java/org/springblade/report/ureport/TestBean.java

@@ -1,68 +0,0 @@
-package org.springblade.report.ureport;
-
-
-import com.alibaba.nacos.common.utils.MapUtil;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.commons.lang.math.RandomUtils;
-import org.springblade.core.tool.utils.SpringUtil;
-import org.springblade.report.entity.Order;
-import org.springblade.report.service.impl.OrderServiceImpl;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-public class TestBean {
-	/**
-
-	 * 方法必须包含三个参数:String,String,Map
-
-	 *
-
-	 * @return 集合类型 ,包含字段:id,name,salary
-
-	 */
-
-	public List<Map<String, Object>> loadReportData(String dsName, String datasetName, Map<String, Object> parameters) {
-
-		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-
-		for (int i = 0; i < 1000; i++) {
-
-			// 模拟数据
-
-			Map<String, Object> m = new HashMap<String, Object>();
-
-			m.put("id", i);
-
-			m.put("name", RandomStringUtils.random(10, true, false));
-
-			m.put("salary", RandomUtils.nextInt() + i);
-
-			list.add(m);
-
-		}
-
-		return list;
-
-	}
-
-	/**
-	 * 测试获取订单信息
-	 * @param dsName
-	 * @param datasetName
-	 * @param parameters
-	 * @return
-	 */
-	public List<Order> testMethod(String dsName, String datasetName, Map<String, Object> parameters){
-		List<Order> list = new ArrayList<>();
-		OrderServiceImpl bean = SpringUtil.getBean(OrderServiceImpl.class);
-		Order order = bean.getById(MapUtils.getLong(parameters,"id"));
-		list.add(order);
-		return list;
-	}
-}

+ 2 - 2
blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderItemServiceImpl.java

@@ -355,7 +355,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		item.setFourFeeC(orderItem.getFourFeeC());
 		item.setFiveFeeC(orderItem.getFiveFeeC());
 		item.setFeeRemarksC(orderItem.getFeeRemarksC());
-		item.setStatus(5);
+		item.setStatus(6);
 		item.setAcceptTime(new Date());
 		item.setUpdateUser(AuthUtil.getUserId());
 		item.setUpdateTime(new Date());
@@ -398,7 +398,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 	public boolean borrow(Long id) {
 		OrderItem item = new OrderItem();
 		item.setId(id);
-		item.setStatus(6);
+		item.setStatus(5);
 		item.setBorrowTime(new Date());
 		item.setUpdateUser(AuthUtil.getUserId());
 		item.setUpdateTime(new Date());