From b09b1ae304f129e809ceacaeec3e301fd4613e87 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 20 Aug 2024 15:00:16 +0800 Subject: [PATCH] md --- .../emis/domain/EmisSettleInvoiceRecord.java | 17 ++++++++--- .../erp/emis/service/EmisBaseService.java | 10 +++++++ .../emis/service/print/cpcl/CvtTplToCpcl.java | 26 +++++++++-------- .../xdadan/erp/emis/utils/Kd100Helper.java | 28 +++++++++---------- .../xdadan/erp/emis/utils/WaybillHelper.java | 10 +++++-- .../mapper/EmisSettleInvoiceRecordMapper.xml | 13 +++++---- 6 files changed, 65 insertions(+), 39 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java index 638e613ce..4d4d98aa6 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java @@ -35,7 +35,6 @@ public class EmisSettleInvoiceRecord extends BaseEntity { private static final long serialVersionUID = 1L; - /* id */ private Long id; /* 申请序号 */ @@ -55,10 +54,12 @@ public class EmisSettleInvoiceRecord extends BaseEntity private String settleBillNo; /* 账单名称 */ private String settleBillName; - /* 申请开票金额 */ + /* 申请开票金额=增加的税点金额和额外的附件费用 */ private BigDecimal applyMoney; /* 开票类型 1-增值电子 */ private String invoiceType; + /* 开票范围 1-全部 0-部分 */ + private String openbillScope; /* 开票名称 */ private String companyName; /* 开票税号 */ @@ -67,6 +68,8 @@ public class EmisSettleInvoiceRecord extends BaseEntity private String companyTel; /* 开票地址 */ private String companyAddress; + /* 开票备注 */ + private String invioceRemark; /* 开户行 */ private String bankName; /* 开户账号 */ @@ -77,13 +80,19 @@ public class EmisSettleInvoiceRecord extends BaseEntity private String phone; /* 税类型 1-免税 2-增值税 */ private String realTaxType; + /* 原始开票金额 */ + private BigDecimal origOpenMoney; + /* 额外增加的税点 0.0/0.06/0.09 */ + private BigDecimal addTaxRate; + /* 额外增加的开票金额 */ + private BigDecimal addOpenMoney; /* 开票上限 */ private BigDecimal openMoneyMax; /* 开票金额 */ private BigDecimal openMoney; /* 发票号 */ private String invoiceNo; - /* 开票状态 0-待开票 1-开票中 2-开票成功 */ + /* 开票状态 0-待开票 1-已开票 2-拒绝开票 */ private String invoiceStatus; /* 开票状态描述 */ private String invoiceStatusDesc; @@ -93,7 +102,7 @@ public class EmisSettleInvoiceRecord extends BaseEntity private String email; /* 发票下载路径 */ private String filePath; - /* 审核状态 0-未审核 1-已审核 2-审核不通过 */ + /* 审核状态 0-未审核 1-已审核 */ private String blAudit; /* 审核日期 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index b3d46b19b..ebd00aafc 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -877,8 +877,18 @@ public class EmisBaseService { phone=emisWaybill.getReceiveMobile(); + String billCode=emisWaybill.getBillCode(); + String from=emisWaybill.getSendCountryName()+"-"+emisWaybill.getSendProvinceName(); + String to=emisWaybill.getReceiveCountryName()+"-"+emisWaybill.getReceiveProvinceName(); + + + // 订阅单号 + Kd100Helper.pollTraceByMainNoAndCom(billCode,from,to,phone); + log.error("===>Start 三方物流跟踪单号:"+dt.getBillCode()+","+dt.getTransferExpress()+" "+dt.getTransferBillCode()); + + EmisTmsTransferTrace rstUpd=Kd100Helper.queryTmsTransferTraceByKd100(dt,phone); // 如果已签收，需要做签收扫描 if(WaybillStatus.SIGNED.statusCode.equals(rstUpd.getLastWaybillStatus())){ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/print/cpcl/CvtTplToCpcl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/print/cpcl/CvtTplToCpcl.java index 71f4de7aa..941dd145d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/print/cpcl/CvtTplToCpcl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/print/cpcl/CvtTplToCpcl.java @@ -182,10 +182,10 @@ public class CvtTplToCpcl { /** * 生成打印指令模版 - * @param tplFile + * @param tplXmlStr */ - public static String genCmdTpl(String tplFile){ - String tplXmlStr= FileUtil.readString(tplFile, Charset.forName("UTF-8")); + public static String genCmdTpl(String tplXmlStr){ +// String tplXmlStr= FileUtil.readString(tplFile, Charset.forName("UTF-8")); String cmd=cvtTplToCpcl(tplXmlStr,null); log.info("cmd:{}",cmd); String encCmd=Base64.getEncoder().encodeToString(cmd.getBytes(Charset.forName("UTF-8"))); @@ -193,19 +193,22 @@ public class CvtTplToCpcl { return encCmd; } - - public static String decryTplXmlStr(String encTplBase64Str){ - - String decStr=AESUtil.decrypt(encTplBase64Str,"203f8ce70aeeba38","ECB"); - - return null; + public static String genCmdTplByEncTpl(String tplEncStr){ + String tplXmlStr=AESUtil.decrypt(tplEncStr,"203f8ce70aeeba38","ECB"); + log.info("tplXmlStr:{}",tplXmlStr); + String cmd=cvtTplToCpcl(tplXmlStr,null); + log.info("cmd:{}",cmd); + String encCmd=Base64.getEncoder().encodeToString(cmd.getBytes(Charset.forName("UTF-8"))); + log.info("encCmd:{}",encCmd); + return encCmd; } public static void main(String[] args) { - String tplFile="/Users/alan/Downloads/探路速运-130-0628缅甸特快极快-英文模版(无logo).frx"; +// String tplFile="/Users/alan/Downloads/探路速运-130-0628缅甸特快极快-英文模版(无logo).frx"; + String tplEncStr = "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"; - String cmd=genCmdTpl(tplFile); + String cmd=genCmdTplByEncTpl(tplEncStr); Map paramMap = new HashMap(); paramMap.put("logisticNo","T70803000126050001"); @@ -238,7 +241,6 @@ public class CvtTplToCpcl { String printCmd=getPrintCmd(cmd,paramMap); System.out.println(printCmd); - String str="! 0 200 200 1040 1\n" + "PW 608\n" + "LINE 0 0 594 0 1\n" + diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java index 0cf53cd9d..e3cdd2d85 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java @@ -61,12 +61,12 @@ public class Kd100Helper { String allResult=HTTPHelperV3.post(POLL_QUERY_URL,postDataMap,"application/x-www-form-urlencoded"); // log.debug("===KD100==REST==>{}",allResult); - try { - // 订阅轨迹 - pollTraceByMainNoAndCom(mainNo, com, phone); - }catch (Exception ex){ - ex.printStackTrace(); - } +// try { +// // 订阅轨迹 +// pollTraceByMainNoAndCom(mainNo, com, phone); +// }catch (Exception ex){ +// ex.printStackTrace(); +// } return allResult; } @@ -80,13 +80,13 @@ public class Kd100Helper { * @return * @throws Exception */ - public static String pollTraceByMainNoAndCom(String mainNo, String com,String phone) { + public static String pollTraceByMainNoAndCom(String mainNo, String com,String from,String to,String phone) { JSONObject param = new JSONObject(); param.put("company", com);//快递公司编码 param.put("number", mainNo);//快递单号 - param.put("from", "VN"); - param.put("to", "CN"); + param.put("from", from); + param.put("to", to); param.put("key", KEY); JSONObject parameters = new JSONObject(); parameters.put("callbackurl", "http://api.emis.tanex56.com/api/bizsvr/emis/common/notifyTraceByKD100"); @@ -191,11 +191,11 @@ public class Kd100Helper { // String str=queryTraceByMainNoAndCom("T7080300002588","探路速运"); // String str=queryTraceByMainNoAndCom("SF080300002588","shunfeng","1234"); - String str=pollTraceByMainNoAndCom("SF080300002588","shunfeng","1234"); -// String str=queryTraceByMainNoAndCom("T7080398716","探路速运"); - System.out.println(str); - List list=cvtTraceToScanRecord("12321",str); - System.out.println(JSON.toJSONString(list)); +// String str=pollTraceByMainNoAndCom("SF080300002588","shunfeng","1234"); +// String str=queryTraceByMainNoAndCom("T7080398716","",""); +// System.out.println(str); +// List list=cvtTraceToScanRecord("12321",str); +// System.out.println(JSON.toJSONString(list)); } catch (Exception e) { e.printStackTrace(); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java index b2f8e7ae7..bbf90df03 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java @@ -76,9 +76,13 @@ public class WaybillHelper { * @return */ public static String genApplySeqNo(){ - String billId = formatter.format(new Date()); - billId += (int)((Math.random() * 9 + 1) * 1000); - return billId; + Snowflake snowflake = IdUtil.getSnowflake(0, 0); + Long billId = snowflake.nextId(); + return billId.toString(); + +// String billId = formatter.format(new Date()); +// billId += (int)((Math.random() * 9 + 1) * 1000); +// return billId; } /** diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml index 02a5ce433..b54040d38 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml @@ -16,23 +16,28 @@ + + + + + - + - + @@ -46,10 +51,6 @@ - - - -