通宇组装摘要修改
This commit is contained in:
hjx
@@ -303,7 +303,13 @@ public interface WlhyServiceFeign {
|
||||
@GetMapping(value = "/feign/transportNote/selectByOrderNum")
|
||||
public R<TmsTransportNote> selectByOrderNum(@RequestParam(value = "orderNo") String orderNo);
|
||||
|
||||
|
||||
/**
|
||||
* 根据发票id查询发票信息
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@GetMapping(value = "/feign/invoiceList/selectById")
|
||||
public R<TmsInvoiceList> selectInvoiceListById(@RequestParam(value = "id") String id);
|
||||
/**
|
||||
* 运输单表-支付回调
|
||||
* @param tmsPayCallbackList
|
||||
@@ -512,4 +518,4 @@ public interface WlhyServiceFeign {
|
||||
|
||||
@GetMapping(value = "/ntocc/tmsSettlementExchangeRate/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,225 @@
|
||||
package com.mhd.system.api.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Description: 销项发票表
|
||||
* @Author: lfs
|
||||
* @Date: 2020-02-19 08:50:47
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("tms_invoice_list")
|
||||
public class TmsInvoiceList implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**主键*/
|
||||
@TableId(type = IdType.ID_WORKER_STR)
|
||||
private String id;
|
||||
/**发票抬头*/
|
||||
@ApiModelProperty(value = "发票抬头")
|
||||
private String invoiceTitle;
|
||||
/**发票金额*/
|
||||
@ApiModelProperty(value = "发票金额")
|
||||
|
||||
private BigDecimal invoiceValue;
|
||||
/**发票备注*/
|
||||
@ApiModelProperty(value = "发票备注")
|
||||
|
||||
private String remark;
|
||||
/**发票状态（0-未开票，1-已取消申请，2-已开票，3-已驳回，4-已寄出，5-已作废）*/
|
||||
@ApiModelProperty(value = "发票状态（0-未开票，1-已取消申请，2-已开票，3-已驳回，4-已寄出，5-已作废）")
|
||||
|
||||
private Integer invoiceState;
|
||||
/**发票申请时间*/
|
||||
@ApiModelProperty(value = "发票申请时间")
|
||||
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date invoiceApplyTime;
|
||||
/**申请人ID*/
|
||||
@ApiModelProperty(value = "申请人ID")
|
||||
|
||||
private String applicantId;
|
||||
/**发票申请单号*/
|
||||
@ApiModelProperty(value = "发票申请单号")
|
||||
|
||||
private String applyNumber;
|
||||
/**驳回原因*/
|
||||
@ApiModelProperty(value = "驳回原因")
|
||||
|
||||
private String rejectReason;
|
||||
/**运输单ids*/
|
||||
@ApiModelProperty(value = "运输单ids")
|
||||
|
||||
private String transportationIds;
|
||||
/**退票备注*/
|
||||
@ApiModelProperty(value = "退票备注")
|
||||
|
||||
private String refundRemark;
|
||||
/**处理人ID（取消申请/开票/驳回）*/
|
||||
@ApiModelProperty(value = "处理人ID（取消申请/开票/驳回）")
|
||||
|
||||
private String managerId;
|
||||
/**处理时间*/
|
||||
@ApiModelProperty(value = "处理时间")
|
||||
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date managerTime;
|
||||
/**寄出人ID*/
|
||||
@ApiModelProperty(value = "寄出人ID")
|
||||
|
||||
private String sendById;
|
||||
/**寄出时间*/
|
||||
@ApiModelProperty(value = "寄出时间")
|
||||
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date sendTime;
|
||||
/**寄出邮费*/
|
||||
@ApiModelProperty(value = "寄出邮费")
|
||||
|
||||
private BigDecimal sendPostage;
|
||||
/**快递公司*/
|
||||
@ApiModelProperty(value = "快递公司")
|
||||
|
||||
private String courierServicesCompany;
|
||||
/**收件地址id*/
|
||||
@ApiModelProperty(value = "收件地址id")
|
||||
|
||||
private String receivingAddressId;
|
||||
/**手机号*/
|
||||
@ApiModelProperty(value = "手机号")
|
||||
|
||||
private String phone;
|
||||
/**收件人姓名*/
|
||||
@ApiModelProperty(value = "收件人姓名")
|
||||
|
||||
private String receivingName;
|
||||
/**邮政编码*/
|
||||
@ApiModelProperty(value = "邮政编码")
|
||||
|
||||
private String postalCode;
|
||||
/**所在地区*/
|
||||
@ApiModelProperty(value = "所在地区")
|
||||
|
||||
private String location;
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
|
||||
private String createBy;
|
||||
/**创建日期*/
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
/**更新人*/
|
||||
@ApiModelProperty(value = "更新人")
|
||||
|
||||
private String updateBy;
|
||||
/**更新日期*/
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
/**是否删除（0-否，1-是）*/
|
||||
@ApiModelProperty(value = "是否删除（0-否，1-是）")
|
||||
|
||||
private Integer isDelete;
|
||||
/**所属部门*/
|
||||
@ApiModelProperty(value = "所属部门")
|
||||
|
||||
private String sysOrgCode;
|
||||
/**发票类型（0-增值税专用发票，1-普通发票）*/
|
||||
@ApiModelProperty(value = "发票类型（0-增值税专用发票，1-普通发票）")
|
||||
|
||||
private Integer invoiceType;
|
||||
/**发票性质（0-纸质发票，1-电子发票）*/
|
||||
@ApiModelProperty(value = "发票性质（0-纸质发票，1-电子发票）")
|
||||
|
||||
private Integer invoiceNature;
|
||||
/**发票号*/
|
||||
@ApiModelProperty(value = "发票号")
|
||||
|
||||
private String invoiceNumber;
|
||||
/**快递单号*/
|
||||
@ApiModelProperty(value = "快递单号")
|
||||
|
||||
private String trackingNumber;
|
||||
/**开票代码*/
|
||||
@ApiModelProperty(value = "开票代码")
|
||||
|
||||
private String invoiceCode;
|
||||
/**发票详情信息上报状态：0-未上报，1-已上报，2-上报失败*/
|
||||
@ApiModelProperty(value = "发票详情信息上报状态：0-未上报，1-已上报，2-上报失败")
|
||||
|
||||
private Integer isReport;
|
||||
/**发票详情信息上报失败原因*/
|
||||
@ApiModelProperty(value = "发票详情信息上报失败原因")
|
||||
|
||||
private String errMsg;
|
||||
|
||||
/**发票详情信息上报时间*/
|
||||
@ApiModelProperty(value = "发票详情信息上报时间")
|
||||
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date reportTime;
|
||||
|
||||
@ApiModelProperty(value = "运单事实创建人ID(创建运单时的当前登录人USER-ID)")
|
||||
private String realCreateBy;
|
||||
|
||||
@ApiModelProperty(value = "运单事实创建人名称(创建运单时的当前登录人REAL-NAME)")
|
||||
private String realCreateName;
|
||||
|
||||
@ApiModelProperty(value = "开票时间")
|
||||
private Date invoiceMakeTime;
|
||||
|
||||
/**货主信息id*/
|
||||
@ApiModelProperty(value = "货主信息id")
|
||||
|
||||
private String shipperId;
|
||||
|
||||
/**货主信息id*/
|
||||
@ApiModelProperty(value = "货主姓名")
|
||||
|
||||
private String shipperName;
|
||||
|
||||
/**货主信息id*/
|
||||
@ApiModelProperty(value = "货主公司名称")
|
||||
|
||||
private String companyName;
|
||||
|
||||
/**税务登记证号*/
|
||||
@ApiModelProperty(value = "税务登记证号")
|
||||
|
||||
private String taxRegAccount;
|
||||
|
||||
/**组织ID*/
|
||||
@ApiModelProperty(value = "组织ID")
|
||||
|
||||
private Long organizationId;
|
||||
|
||||
/**组织名称*/
|
||||
@ApiModelProperty(value = "组织名称")
|
||||
|
||||
private String organizationName;
|
||||
|
||||
/**一级组织ID*/
|
||||
@ApiModelProperty(value = "一级组织ID")
|
||||
|
||||
private Long topOrganizationId;
|
||||
}
|
||||
+9
-1
@@ -212,6 +212,14 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory<WlhyServiceFei
|
||||
return res;
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<TmsInvoiceList> selectInvoiceListById(String id) {
|
||||
R<TmsInvoiceList> res = new R<>();
|
||||
res.setMsg("获取发票信息失败"+cause.getMessage());
|
||||
res.setCode(R.FAIL);
|
||||
return res;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AjaxResult payCallback(List<TmsPayCallbackDTO> tmsPayCallbackList) {
|
||||
return AjaxResult.error(cause.getMessage());
|
||||
@@ -517,4 +525,4 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory<WlhyServiceFei
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user