diff --git a/src/main/java/com/qs/cost/module/domain/GetListEntity.java b/src/main/java/com/qs/cost/module/domain/GetListEntity.java index 8b6e211..aca210c 100644 --- a/src/main/java/com/qs/cost/module/domain/GetListEntity.java +++ b/src/main/java/com/qs/cost/module/domain/GetListEntity.java @@ -98,6 +98,9 @@ public class GetListEntity { @JsonProperty("CreateTime") private String createTime; + @JsonProperty("OrderMessage") + private String remark; + private Object items; @JsonProperty("Other") diff --git a/src/main/java/com/qs/cost/module/domain/LzOrder.java b/src/main/java/com/qs/cost/module/domain/LzOrder.java index 883f7f6..69e7e1d 100644 --- a/src/main/java/com/qs/cost/module/domain/LzOrder.java +++ b/src/main/java/com/qs/cost/module/domain/LzOrder.java @@ -87,6 +87,8 @@ public class LzOrder implements Serializable { private String items; + private String remark; + /** */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") diff --git a/src/main/java/com/qs/cost/module/service/JiaJinService.java b/src/main/java/com/qs/cost/module/service/JiaJinService.java index ea6b0c6..21e8112 100644 --- a/src/main/java/com/qs/cost/module/service/JiaJinService.java +++ b/src/main/java/com/qs/cost/module/service/JiaJinService.java @@ -84,6 +84,7 @@ public class JiaJinService { lzOrder.setSaleType(otherEntity.getSalesType()); lzOrder.setSaleDept(otherEntity.getSalesClass()); lzOrder.setSaleMan(otherEntity.getSalesMan()); + lzOrder.setRemark(orderEntity.getRemark()); String itemJson = JsonUtil.objectToJson(orderEntity.getItems()); lzOrder.setItems(itemJson); lzOrder.setCheckStatus(0); @@ -145,13 +146,14 @@ public class JiaJinService { orderDetail.setHasRateSumPrice(new BigDecimal(item.getSaleAmount())); orderDetail.setPreShipmentsDate(now); orderDetail.setPreFinishedDate(now); + details.add(orderDetail); } U8API4SaleOrder api4SaleOrder = U8API4SaleOrder.builder() .addType(0) - .code(order.getOrderNo()) + .code("T"+order.getOrderNo()) .orderDate(DateUtil.localDateTimeToDate(order.getOrderCreateTime())) .bizType("普通销售") - .saleType("01") + .saleType(order.getSaleType()) .cusCode(order.getCustomCode()) .currencyType("人民币") .depCode(order.getSaleDept()) @@ -159,7 +161,7 @@ public class JiaJinService { .preShipmentsDate(now) .preFinishedDate(now) .taxRate(rate) - .remark("") + .remark(order.getRemark()) .remarkFoot("") .details(details) .build(); diff --git a/src/test/java/boot/BootTest.java b/src/test/java/boot/BootTest.java index d02d307..d3bb20a 100644 --- a/src/test/java/boot/BootTest.java +++ b/src/test/java/boot/BootTest.java @@ -41,7 +41,7 @@ public class BootTest { @Test public void test() { - String json = "{\"List\":[{\"OrderNO\":\"2022071205963\",\"OrderAmount\":\"520.00\",\"ShippingFare\":\"0.00\",\"Consignee\":\"测试1\",\"ConsigneeMobile\":\"13612345678\",\"Provinces\":\"广东省,广州市,天河区\",\"DetailedAddress\":\"棠东\",\"CreateTime\":\"2022-07-12 15:04:39\",\"Items\":[{\"ProductId\":78,\"ProductSkuId\":0,\"ERPCode\":\"351100005\",\"ProductCode\":\"0013\",\"ProductName\":\"鹿游仙境（一箱装）\",\"Qty\":1,\"SellingPrice\":\"520.00\",\"TaxIncluded\":true,\"TaxPrice\":\"67.60\",\"TaxPercent\":\"13.00\"}],\"Other\":{\"Name\":\"月饼团购（散客）\",\"Code\":\"12421561\",\"SalesClass\":\"199\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"TaxPercent\":\"13.00\"}},{\"OrderNO\":\"2022071283521\",\"OrderAmount\":\"520.00\",\"ShippingFare\":\"0.00\",\"Consignee\":\"测试1\",\"ConsigneeMobile\":\"13612345678\",\"Provinces\":\"广东省,广州市,天河区\",\"DetailedAddress\":\"棠东\",\"CreateTime\":\"2022-07-12 11:09:43\",\"Items\":[{\"ProductId\":78,\"ProductSkuId\":0,\"ERPCode\":\"351100005\",\"ProductCode\":\"0013\",\"ProductName\":\"鹿游仙境（一箱装）\",\"Qty\":1,\"SellingPrice\":\"520.00\",\"TaxIncluded\":false,\"TaxPrice\":\"0.00\",\"TaxPercent\":0}],\"Other\":{\"Name\":null,\"Code\":null,\"SalesClass\":null,\"SalesMan\":null,\"SalesType\":null,\"TaxPercent\":\"0.00\"}},{\"OrderNO\":\"2022071280607\",\"OrderAmount\":\"520.00\",\"ShippingFare\":\"0.00\",\"Consignee\":\"测试1\",\"ConsigneeMobile\":\"13612345678\",\"Provinces\":\"广东省,广州市,天河区\",\"DetailedAddress\":\"棠东\",\"CreateTime\":\"2022-07-12 11:08:12\",\"Items\":[{\"ProductId\":78,\"ProductSkuId\":0,\"ERPCode\":\"351100005\",\"ProductCode\":\"0013\",\"ProductName\":\"鹿游仙境（一箱装）\",\"Qty\":1,\"SellingPrice\":\"520.00\",\"TaxIncluded\":false,\"TaxPrice\":\"0.00\",\"TaxPercent\":0}],\"Other\":{\"Name\":null,\"Code\":null,\"SalesClass\":null,\"SalesMan\":null,\"SalesType\":null,\"TaxPercent\":\"0.00\"}},{\"OrderNO\":\"2022070605623\",\"OrderAmount\":\"1200.00\",\"ShippingFare\":\"0.00\",\"Consignee\":\"测试3\",\"ConsigneeMobile\":\"13612345678\",\"Provinces\":\"广东省,广州市,天河区\",\"DetailedAddress\":\"棠东abchds\",\"CreateTime\":\"2022-07-06 09:54:30\",\"Items\":[{\"ProductId\":101,\"ProductSkuId\":0,\"ERPCode\":\"301010710\",\"ProductCode\":\"202205\",\"ProductName\":\"梨不开你（一箱装）\",\"Qty\":1,\"SellingPrice\":\"1200.00\",\"TaxIncluded\":true,\"TaxPrice\":\"156.00\",\"TaxPercent\":\"13.00\"}],\"Other\":{\"Name\":\"月饼团购（散客）\",\"Code\":\"12421561\",\"SalesClass\":\"199\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"TaxPercent\":\"13.00\"}},{\"OrderNO\":\"2022070628929\",\"OrderAmount\":\"630.00\",\"ShippingFare\":\"0.00\",\"Consignee\":\"测试2\",\"ConsigneeMobile\":\"13612345678\",\"Provinces\":\"广东省,广州市,天河区\",\"DetailedAddress\":\"棠东abc\",\"CreateTime\":\"2022-07-06 09:47:56\",\"Items\":[{\"ProductId\":86,\"ProductSkuId\":0,\"ERPCode\":null,\"ProductCode\":\"0021\",\"ProductName\":\"双黄白莲蓉（一箱装）\",\"Qty\":1,\"SellingPrice\":\"630.00\",\"TaxIncluded\":true,\"TaxPrice\":\"81.90\",\"TaxPercent\":\"13.00\"}],\"Other\":{\"Name\":\"月饼团购（散客）\",\"Code\":\"12421561\",\"SalesClass\":\"199\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"TaxPercent\":\"13.00\"}},{\"OrderNO\":\"2022070649545\",\"OrderAmount\":\"712.00\",\"ShippingFare\":\"0.00\",\"Consignee\":\"测试2\",\"ConsigneeMobile\":\"13612345678\",\"Provinces\":\"广东省,广州市,天河区\",\"DetailedAddress\":\"棠东abc\",\"CreateTime\":\"2022-07-06 09:47:40\",\"Items\":[{\"ProductId\":87,\"ProductSkuId\":0,\"ERPCode\":null,\"ProductCode\":\"0022\",\"ProductName\":\"中秋礼道（一箱装）\",\"Qty\":1,\"SellingPrice\":\"712.00\",\"TaxIncluded\":true,\"TaxPrice\":\"92.56\",\"TaxPercent\":\"13.00\"}],\"Other\":{\"Name\":\"月饼团购（散客）\",\"Code\":\"12421561\",\"SalesClass\":\"199\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"TaxPercent\":\"13.00\"}},{\"OrderNO\":\"2022070698848\",\"OrderAmount\":\"1500.00\",\"ShippingFare\":\"0.00\",\"Consignee\":\"测试2\",\"ConsigneeMobile\":\"13612345678\",\"Provinces\":\"广东省,广州市,天河区\",\"DetailedAddress\":\"棠东abc\",\"CreateTime\":\"2022-07-06 09:43:37\",\"Items\":[{\"ProductId\":100,\"ProductSkuId\":0,\"ERPCode\":null,\"ProductCode\":\"202204\",\"ProductName\":\"花月缤纷（一箱装）\",\"Qty\":1,\"SellingPrice\":\"1500.00\",\"TaxIncluded\":true,\"TaxPrice\":\"195.00\",\"TaxPercent\":\"13.00\"}],\"Other\":{\"Name\":\"月饼团购（散客）\",\"Code\":\"12421561\",\"SalesClass\":\"199\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"TaxPercent\":\"13.00\"}},{\"OrderNO\":\"2022070685170\",\"OrderAmount\":\"3600.00\",\"ShippingFare\":\"0.00\",\"Consignee\":\"测试1\",\"ConsigneeMobile\":\"13612345678\",\"Provinces\":\"广东省,广州市,天河区\",\"DetailedAddress\":\"棠东\",\"CreateTime\":\"2022-07-06 09:42:31\",\"Items\":[{\"ProductId\":101,\"ProductSkuId\":0,\"ERPCode\":\"301010710\",\"ProductCode\":\"202205\",\"ProductName\":\"梨不开你（一箱装）\",\"Qty\":3,\"SellingPrice\":\"1200.00\",\"TaxIncluded\":true,\"TaxPrice\":\"156.00\",\"TaxPercent\":\"13.00\"}],\"Other\":{\"Name\":\"月饼团购（散客）\",\"Code\":\"12421561\",\"SalesClass\":\"199\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"TaxPercent\":\"13.00\"}}],\"Status\":true,\"Msg\":\"获取成功\",\"page\":1,\"total_count\":8,\"page_count\":1,\"page_size\":10}" ; + String json = "{\"List\":[{\"OrderNO\":\"2022071334573\",\"OrderAmount\":\"1560.00\",\"ShippingFare\":\"0.00\",\"Consignee\":\"测试1\",\"ConsigneeMobile\":\"13612345678\",\"Provinces\":\"广东省,广州市,天河区\",\"DetailedAddress\":\"棠东\",\"CreateTime\":\"2022-07-13 17:35:26\",\"OrderMessage\":\"开专票-广东嘉金食品有限公司-梁先生\",\"Items\":[{\"ProductId\":78,\"ProductSkuId\":0,\"ERPCode\":\"351100005\",\"ProductCode\":\"0013\",\"ProductName\":\"鹿游仙境（一箱装）\",\"Qty\":3,\"SellingPrice\":\"520.00\",\"TaxIncluded\":true,\"TaxPrice\":\"67.60\",\"TaxPercent\":\"13.00\"}],\"Other\":{\"Name\":\"月饼团购（散客）\",\"Code\":\"12421561\",\"SalesClass\":\"199\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"TaxPercent\":\"13.00\"}},{\"OrderNO\":\"2022071283521\",\"OrderAmount\":\"520.00\",\"ShippingFare\":\"0.00\",\"Consignee\":\"测试1\",\"ConsigneeMobile\":\"13612345678\",\"Provinces\":\"广东省,广州市,天河区\",\"DetailedAddress\":\"棠东\",\"CreateTime\":\"2022-07-12 11:09:43\",\"OrderMessage\":\"开增票，广东嘉士利食品集团有限公司，联系人李卓富18933172277\",\"Items\":[{\"ProductId\":78,\"ProductSkuId\":0,\"ERPCode\":\"351100005\",\"ProductCode\":\"0013\",\"ProductName\":\"鹿游仙境（一箱装）\",\"Qty\":1,\"SellingPrice\":\"520.00\",\"TaxIncluded\":false,\"TaxPrice\":\"0.00\",\"TaxPercent\":0}],\"Other\":{\"Name\":null,\"Code\":null,\"SalesClass\":null,\"SalesMan\":null,\"SalesType\":null,\"TaxPercent\":\"0.00\"}},{\"OrderNO\":\"2022071280607\",\"OrderAmount\":\"520.00\",\"ShippingFare\":\"0.00\",\"Consignee\":\"测试1\",\"ConsigneeMobile\":\"13612345678\",\"Provinces\":\"广东省,广州市,天河区\",\"DetailedAddress\":\"棠东\",\"CreateTime\":\"2022-07-12 11:08:12\",\"OrderMessage\":\"\",\"Items\":[{\"ProductId\":78,\"ProductSkuId\":0,\"ERPCode\":\"351100005\",\"ProductCode\":\"0013\",\"ProductName\":\"鹿游仙境（一箱装）\",\"Qty\":1,\"SellingPrice\":\"520.00\",\"TaxIncluded\":false,\"TaxPrice\":\"0.00\",\"TaxPercent\":0}],\"Other\":{\"Name\":null,\"Code\":null,\"SalesClass\":null,\"SalesMan\":null,\"SalesType\":null,\"TaxPercent\":\"0.00\"}},{\"OrderNO\":\"2022070605623\",\"OrderAmount\":\"1200.00\",\"ShippingFare\":\"0.00\",\"Consignee\":\"测试3\",\"ConsigneeMobile\":\"13612345678\",\"Provinces\":\"广东省,广州市,天河区\",\"DetailedAddress\":\"棠东abchds\",\"CreateTime\":\"2022-07-06 09:54:30\",\"OrderMessage\":\"\",\"Items\":[{\"ProductId\":101,\"ProductSkuId\":0,\"ERPCode\":\"301010710\",\"ProductCode\":\"202205\",\"ProductName\":\"梨不开你（一箱装）\",\"Qty\":1,\"SellingPrice\":\"1200.00\",\"TaxIncluded\":true,\"TaxPrice\":\"156.00\",\"TaxPercent\":\"13.00\"}],\"Other\":{\"Name\":\"月饼团购（散客）\",\"Code\":\"12421561\",\"SalesClass\":\"199\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"TaxPercent\":\"13.00\"}},{\"OrderNO\":\"2022070628929\",\"OrderAmount\":\"630.00\",\"ShippingFare\":\"0.00\",\"Consignee\":\"测试2\",\"ConsigneeMobile\":\"13612345678\",\"Provinces\":\"广东省,广州市,天河区\",\"DetailedAddress\":\"棠东abc\",\"CreateTime\":\"2022-07-06 09:47:56\",\"OrderMessage\":\"\",\"Items\":[{\"ProductId\":86,\"ProductSkuId\":0,\"ERPCode\":null,\"ProductCode\":\"0021\",\"ProductName\":\"双黄白莲蓉（一箱装）\",\"Qty\":1,\"SellingPrice\":\"630.00\",\"TaxIncluded\":true,\"TaxPrice\":\"81.90\",\"TaxPercent\":\"13.00\"}],\"Other\":{\"Name\":\"月饼团购（散客）\",\"Code\":\"12421561\",\"SalesClass\":\"199\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"TaxPercent\":\"13.00\"}},{\"OrderNO\":\"2022070649545\",\"OrderAmount\":\"712.00\",\"ShippingFare\":\"0.00\",\"Consignee\":\"测试2\",\"ConsigneeMobile\":\"13612345678\",\"Provinces\":\"广东省,广州市,天河区\",\"DetailedAddress\":\"棠东abc\",\"CreateTime\":\"2022-07-06 09:47:40\",\"OrderMessage\":\"\",\"Items\":[{\"ProductId\":87,\"ProductSkuId\":0,\"ERPCode\":null,\"ProductCode\":\"0022\",\"ProductName\":\"中秋礼道（一箱装）\",\"Qty\":1,\"SellingPrice\":\"712.00\",\"TaxIncluded\":true,\"TaxPrice\":\"92.56\",\"TaxPercent\":\"13.00\"}],\"Other\":{\"Name\":\"月饼团购（散客）\",\"Code\":\"12421561\",\"SalesClass\":\"199\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"TaxPercent\":\"13.00\"}},{\"OrderNO\":\"2022070698848\",\"OrderAmount\":\"1500.00\",\"ShippingFare\":\"0.00\",\"Consignee\":\"测试2\",\"ConsigneeMobile\":\"13612345678\",\"Provinces\":\"广东省,广州市,天河区\",\"DetailedAddress\":\"棠东abc\",\"CreateTime\":\"2022-07-06 09:43:37\",\"OrderMessage\":\"\",\"Items\":[{\"ProductId\":100,\"ProductSkuId\":0,\"ERPCode\":null,\"ProductCode\":\"202204\",\"ProductName\":\"花月缤纷（一箱装）\",\"Qty\":1,\"SellingPrice\":\"1500.00\",\"TaxIncluded\":true,\"TaxPrice\":\"195.00\",\"TaxPercent\":\"13.00\"}],\"Other\":{\"Name\":\"月饼团购（散客）\",\"Code\":\"12421561\",\"SalesClass\":\"199\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"TaxPercent\":\"13.00\"}},{\"OrderNO\":\"2022070685170\",\"OrderAmount\":\"3600.00\",\"ShippingFare\":\"0.00\",\"Consignee\":\"测试1\",\"ConsigneeMobile\":\"13612345678\",\"Provinces\":\"广东省,广州市,天河区\",\"DetailedAddress\":\"棠东\",\"CreateTime\":\"2022-07-06 09:42:31\",\"OrderMessage\":\"\",\"Items\":[{\"ProductId\":101,\"ProductSkuId\":0,\"ERPCode\":\"301010710\",\"ProductCode\":\"202205\",\"ProductName\":\"梨不开你（一箱装）\",\"Qty\":3,\"SellingPrice\":\"1200.00\",\"TaxIncluded\":true,\"TaxPrice\":\"156.00\",\"TaxPercent\":\"13.00\"}],\"Other\":{\"Name\":\"月饼团购（散客）\",\"Code\":\"12421561\",\"SalesClass\":\"199\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"TaxPercent\":\"13.00\"}}],\"Status\":true,\"Msg\":\"获取成功\",\"page\":1,\"total_count\":8,\"page_count\":1,\"page_size\":10}" ; GetListEntity getListEntity = JsonUtil.jsonToPojo(json, GetListEntity.class); if (getListEntity == null) { return;