From bcffabb09953ac4f0df711e0f13c7f2a0cae30a6 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 19 Jul 2022 17:45:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/mvc/SecurityMvcComponent.java | 2 +- .../module/controller/LzOrderController.java | 11 ++++-- .../qs/cost/module/service/JiaJinService.java | 38 ++++++++++++------- .../cost/module/service/LzOrderService.java | 2 + .../service/impl/LzOrderServiceImpl.java | 7 ++++ src/test/java/boot/BootTest.java | 7 ++-- 6 files changed, 46 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/qs/cost/common/framework/mvc/SecurityMvcComponent.java b/src/main/java/com/qs/cost/common/framework/mvc/SecurityMvcComponent.java index 412b362..0d8018c 100644 --- a/src/main/java/com/qs/cost/common/framework/mvc/SecurityMvcComponent.java +++ b/src/main/java/com/qs/cost/common/framework/mvc/SecurityMvcComponent.java @@ -21,7 +21,7 @@ public class SecurityMvcComponent implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { //注册TestInterceptor拦截器 - registry.addInterceptor(new ForbiddenInterceptor()).addPathPatterns("/**").excludePathPatterns("/api/**"); + //registry.addInterceptor(new ForbiddenInterceptor()).addPathPatterns("/**").excludePathPatterns("/api/**"); } @Bean diff --git a/src/main/java/com/qs/cost/module/controller/LzOrderController.java b/src/main/java/com/qs/cost/module/controller/LzOrderController.java index 399e16c..1dc501b 100644 --- a/src/main/java/com/qs/cost/module/controller/LzOrderController.java +++ b/src/main/java/com/qs/cost/module/controller/LzOrderController.java @@ -5,10 +5,7 @@ import com.qs.cost.common.dto.u8.U8CallbackVo; import com.qs.cost.common.utils.JsonUtil; import com.qs.cost.module.service.JiaJinService; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * @author YenHex @@ -28,4 +25,10 @@ public class LzOrderController { return R.ok(); } + @GetMapping("/query") + public R callback(){ + jiaJinService.query(); + return R.ok(); + } + } 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 10161d4..6f31fd7 100644 --- a/src/main/java/com/qs/cost/module/service/JiaJinService.java +++ b/src/main/java/com/qs/cost/module/service/JiaJinService.java @@ -15,12 +15,8 @@ import com.qs.cost.module.domain.LzResponseLog; import com.qs.cost.module.domain.dto.U8API4SaleOrder; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -41,6 +37,12 @@ public class JiaJinService { private final MainServerProperties mainServerProperties; + @Scheduled(cron = "0 0/5 * * * ?") + public void query(){ + log.info("订单查询开始"); + query(1); + } + /** * 请求量子app获取订单 * @param page @@ -48,6 +50,8 @@ public class JiaJinService { public void query(Integer page){ if(page==null){ page = 1; + }else if (page > 20){ + return; } Date now = new Date(); Date lastMonth = DateUtil.getAfterSomedate(now,-1, Calendar.MONTH); @@ -69,12 +73,15 @@ public class JiaJinService { LzResponseLog responseLog = new LzResponseLog(); responseLog.setJson(json); responseLogService.save(responseLog); - GetListEntity.OtherEntity otherEntity = new GetListEntity.OtherEntity(); - //GetListEntity.OtherEntity otherEntity = getListEntity.getOther(); //解析请求json，并保存订单到数据库 for (GetListEntity.OrderEntity orderEntity : getListEntity.getList()) { + GetListEntity.OtherEntity otherEntity = orderEntity.getOther(); LzOrder lzOrder = new LzOrder(); lzOrder.setOrderNo(orderEntity.getOrderNo()); + if(lzOrderService.existOrder(orderEntity.getOrderNo())>0L){ + continue; + } + lzOrder.setCustomCode(otherEntity.getCustomCode()); lzOrder.setOrderAmount(orderEntity.getOrderAmount()); lzOrder.setShippingFare(orderEntity.getShippingFare()); lzOrder.setConsignee(orderEntity.getConsignee()); @@ -99,6 +106,9 @@ public class JiaJinService { }else { lzOrder.setCheckStatus(2); } + if(StringUtil.isEmpty(lzOrder.getCustomCode())){ + lzOrder.setCheckStatus(2); + } try { DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime orderCreateTime = LocalDateTime.parse(orderEntity.getCreateTime(),df); @@ -118,7 +128,7 @@ public class JiaJinService { System.out.println(); } - //@Scheduled(cron = "") + @Scheduled(cron = "0 */5 * * * ?") public void task(){ //获取未同步订单，调用U8服务 LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); @@ -140,7 +150,7 @@ public class JiaJinService { //拿子项税率 rate = new BigDecimal(item.getTaxRate()); orderDetail.setInvCode(item.getInvCode()); - orderDetail.setTaxRate(new BigDecimal(item.getTaxRate())); + orderDetail.setTaxRate(new BigDecimal(item.getTaxRate()).multiply(new BigDecimal(item.getQty()))); orderDetail.setQuantity(new Long(item.getQty())); orderDetail.setHasRatePrice(new BigDecimal(item.getSalePrice())); orderDetail.setHasRateSumPrice(new BigDecimal(item.getSaleAmount())); @@ -150,19 +160,19 @@ public class JiaJinService { } U8API4SaleOrder api4SaleOrder = U8API4SaleOrder.builder() .addType(0) - .code("S"+order.getOrderNo()) + .code("T"+order.getOrderNo()) .orderDate(DateUtil.localDateTimeToDate(order.getOrderCreateTime())) .bizType("普通销售") .saleType(order.getSaleType()) .cusCode(order.getCustomCode()) .currencyType("人民币") .depCode(order.getSaleDept()) - .createUser(order.getSaleMan()) + .createUser(order.getSaleMan())//TODO DEMO .preShipmentsDate(now) .preFinishedDate(now) .taxRate(rate) .remark(order.getRemark()) - .remarkFoot(order.getConsignee()+" "+order.getConsigneeMobile()+" "+order.getProvinces()) + .remarkFoot(order.getConsignee()+"/"+order.getConsigneeMobile()+"/"+order.getProvinces()+"/"+order.getDetailedAddress()) .details(details) .build(); String jsonBody = JsonUtil.objectToJson(Arrays.asList(api4SaleOrder)); @@ -177,6 +187,7 @@ public class JiaJinService { requestBo.setSettingRetryTimes(2); requestBo.setCallbackState("1"); requestBo.setCallbackHost( host + "/lzOrder/callback"); + order.setStatus(1); //TODO 方便测试 order.setStatus(1); order.setUpdateTime(LocalDateTime.now()); HttpUtil.post(mainServerProperties.getU8url(),JsonUtil.objectToJson(requestBo)); @@ -188,13 +199,14 @@ public class JiaJinService { * U8中台回调接口 * @return */ - public R callback(@RequestBody U8CallbackVo requestVo){ - String orderNo = requestVo.getId(); + public R callback(U8CallbackVo requestVo){ + String orderNo = requestVo.getApiPk(); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(LzOrder::getOrderNo,orderNo); LzOrder lzOrder = lzOrderService.getOne(lqw,false); //解析返回结果 lzOrder.setStatus(2); + lzOrder.setCallbackStatus(1); String response = requestVo.getRespContext(); JSONObject jsonObject = JSONObject.parseObject(response); if(jsonObject.getString("code").equals("200")){ diff --git a/src/main/java/com/qs/cost/module/service/LzOrderService.java b/src/main/java/com/qs/cost/module/service/LzOrderService.java index 6bb596a..4d5bdeb 100644 --- a/src/main/java/com/qs/cost/module/service/LzOrderService.java +++ b/src/main/java/com/qs/cost/module/service/LzOrderService.java @@ -10,5 +10,7 @@ import com.qs.cost.module.domain.LzOrder; */ public interface LzOrderService extends IService { + Long existOrder(String orderNo); + } diff --git a/src/main/java/com/qs/cost/module/service/impl/LzOrderServiceImpl.java b/src/main/java/com/qs/cost/module/service/impl/LzOrderServiceImpl.java index 07dd990..d8b3ba4 100644 --- a/src/main/java/com/qs/cost/module/service/impl/LzOrderServiceImpl.java +++ b/src/main/java/com/qs/cost/module/service/impl/LzOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.qs.cost.module.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qs.cost.module.domain.LzOrder; import com.qs.cost.module.mapper.LzOrderMapper; @@ -18,5 +19,11 @@ import org.springframework.stereotype.Service; @AllArgsConstructor public class LzOrderServiceImpl extends ServiceImpl implements LzOrderService { + @Override + public Long existOrder(String orderNo) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(LzOrder::getOrderNo,orderNo); + return count(lqw); + } } diff --git a/src/test/java/boot/BootTest.java b/src/test/java/boot/BootTest.java index f2df6ce..0116c65 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\":\"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}" ; + String json = "{\"Msg\":\"获取成功\",\"List\":[{\"Items\":[{\"Qty\":3,\"ERPCode\":\"351100005\",\"TaxPrice\":\"67.60\",\"ProductId\":78,\"TaxPercent\":\"13.00\",\"ProductCode\":\"0013\",\"ProductName\":\"鹿游仙境（一箱装）\",\"TaxIncluded\":true,\"ProductSkuId\":0,\"SellingPrice\":\"520.00\"}],\"Other\":{\"Code\":\"12421561\",\"Name\":\"月饼团购（散客）\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"SalesClass\":\"199\",\"TaxPercent\":\"13.00\"},\"OrderNO\":\"2022071334573\",\"Consignee\":\"测试1\",\"Provinces\":\"广东省,广州市,天河区\",\"CreateTime\":\"2022-07-13 17:35:26\",\"OrderAmount\":\"1560.00\",\"OrderMessage\":\"开专票-广东嘉金食品有限公司-梁先生\",\"ShippingFare\":\"0.00\",\"ConsigneeMobile\":\"13612345678\",\"DetailedAddress\":\"棠东\"},{\"Items\":[{\"Qty\":1,\"ERPCode\":\"351100005\",\"TaxPrice\":\"0.00\",\"ProductId\":78,\"TaxPercent\":0,\"ProductCode\":\"0013\",\"ProductName\":\"鹿游仙境（一箱装）\",\"TaxIncluded\":false,\"ProductSkuId\":0,\"SellingPrice\":\"520.00\"}],\"Other\":{\"Code\":null,\"Name\":null,\"SalesMan\":null,\"SalesType\":null,\"SalesClass\":null,\"TaxPercent\":\"0.00\"},\"OrderNO\":\"2022071283521\",\"Consignee\":\"测试1\",\"Provinces\":\"广东省,广州市,天河区\",\"CreateTime\":\"2022-07-12 11:09:43\",\"OrderAmount\":\"520.00\",\"OrderMessage\":\"开增票，广东嘉士利食品集团有限公司，联系人李卓富18933172277\",\"ShippingFare\":\"0.00\",\"ConsigneeMobile\":\"13612345678\",\"DetailedAddress\":\"棠东\"},{\"Items\":[{\"Qty\":1,\"ERPCode\":\"351100005\",\"TaxPrice\":\"0.00\",\"ProductId\":78,\"TaxPercent\":0,\"ProductCode\":\"0013\",\"ProductName\":\"鹿游仙境（一箱装）\",\"TaxIncluded\":false,\"ProductSkuId\":0,\"SellingPrice\":\"520.00\"}],\"Other\":{\"Code\":null,\"Name\":null,\"SalesMan\":null,\"SalesType\":null,\"SalesClass\":null,\"TaxPercent\":\"0.00\"},\"OrderNO\":\"2022071280607\",\"Consignee\":\"测试1\",\"Provinces\":\"广东省,广州市,天河区\",\"CreateTime\":\"2022-07-12 11:08:12\",\"OrderAmount\":\"520.00\",\"OrderMessage\":\"\",\"ShippingFare\":\"0.00\",\"ConsigneeMobile\":\"13612345678\",\"DetailedAddress\":\"棠东\"},{\"Items\":[{\"Qty\":1,\"ERPCode\":\"301010710\",\"TaxPrice\":\"156.00\",\"ProductId\":101,\"TaxPercent\":\"13.00\",\"ProductCode\":\"202205\",\"ProductName\":\"梨不开你（一箱装）\",\"TaxIncluded\":true,\"ProductSkuId\":0,\"SellingPrice\":\"1200.00\"}],\"Other\":{\"Code\":\"12421561\",\"Name\":\"月饼团购（散客）\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"SalesClass\":\"199\",\"TaxPercent\":\"13.00\"},\"OrderNO\":\"2022070605623\",\"Consignee\":\"测试3\",\"Provinces\":\"广东省,广州市,天河区\",\"CreateTime\":\"2022-07-06 09:54:30\",\"OrderAmount\":\"1200.00\",\"OrderMessage\":\"\",\"ShippingFare\":\"0.00\",\"ConsigneeMobile\":\"13612345678\",\"DetailedAddress\":\"棠东abchds\"},{\"Items\":[{\"Qty\":1,\"ERPCode\":null,\"TaxPrice\":\"81.90\",\"ProductId\":86,\"TaxPercent\":\"13.00\",\"ProductCode\":\"0021\",\"ProductName\":\"双黄白莲蓉（一箱装）\",\"TaxIncluded\":true,\"ProductSkuId\":0,\"SellingPrice\":\"630.00\"}],\"Other\":{\"Code\":\"12421561\",\"Name\":\"月饼团购（散客）\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"SalesClass\":\"199\",\"TaxPercent\":\"13.00\"},\"OrderNO\":\"2022070628929\",\"Consignee\":\"测试2\",\"Provinces\":\"广东省,广州市,天河区\",\"CreateTime\":\"2022-07-06 09:47:56\",\"OrderAmount\":\"630.00\",\"OrderMessage\":\"\",\"ShippingFare\":\"0.00\",\"ConsigneeMobile\":\"13612345678\",\"DetailedAddress\":\"棠东abc\"},{\"Items\":[{\"Qty\":1,\"ERPCode\":null,\"TaxPrice\":\"92.56\",\"ProductId\":87,\"TaxPercent\":\"13.00\",\"ProductCode\":\"0022\",\"ProductName\":\"中秋礼道（一箱装）\",\"TaxIncluded\":true,\"ProductSkuId\":0,\"SellingPrice\":\"712.00\"}],\"Other\":{\"Code\":\"12421561\",\"Name\":\"月饼团购（散客）\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"SalesClass\":\"199\",\"TaxPercent\":\"13.00\"},\"OrderNO\":\"2022070649545\",\"Consignee\":\"测试2\",\"Provinces\":\"广东省,广州市,天河区\",\"CreateTime\":\"2022-07-06 09:47:40\",\"OrderAmount\":\"712.00\",\"OrderMessage\":\"\",\"ShippingFare\":\"0.00\",\"ConsigneeMobile\":\"13612345678\",\"DetailedAddress\":\"棠东abc\"},{\"Items\":[{\"Qty\":1,\"ERPCode\":null,\"TaxPrice\":\"195.00\",\"ProductId\":100,\"TaxPercent\":\"13.00\",\"ProductCode\":\"202204\",\"ProductName\":\"花月缤纷（一箱装）\",\"TaxIncluded\":true,\"ProductSkuId\":0,\"SellingPrice\":\"1500.00\"}],\"Other\":{\"Code\":\"12421561\",\"Name\":\"月饼团购（散客）\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"SalesClass\":\"199\",\"TaxPercent\":\"13.00\"},\"OrderNO\":\"2022070698848\",\"Consignee\":\"测试2\",\"Provinces\":\"广东省,广州市,天河区\",\"CreateTime\":\"2022-07-06 09:43:37\",\"OrderAmount\":\"1500.00\",\"OrderMessage\":\"\",\"ShippingFare\":\"0.00\",\"ConsigneeMobile\":\"13612345678\",\"DetailedAddress\":\"棠东abc\"},{\"Items\":[{\"Qty\":3,\"ERPCode\":\"301010710\",\"TaxPrice\":\"156.00\",\"ProductId\":101,\"TaxPercent\":\"13.00\",\"ProductCode\":\"202205\",\"ProductName\":\"梨不开你（一箱装）\",\"TaxIncluded\":true,\"ProductSkuId\":0,\"SellingPrice\":\"1200.00\"}],\"Other\":{\"Code\":\"12421561\",\"Name\":\"月饼团购（散客）\",\"SalesMan\":\"22100057\",\"SalesType\":\"15\",\"SalesClass\":\"199\",\"TaxPercent\":\"13.00\"},\"OrderNO\":\"2022070685170\",\"Consignee\":\"测试1\",\"Provinces\":\"广东省,广州市,天河区\",\"CreateTime\":\"2022-07-06 09:42:31\",\"OrderAmount\":\"3600.00\",\"OrderMessage\":\"\",\"ShippingFare\":\"0.00\",\"ConsigneeMobile\":\"13612345678\",\"DetailedAddress\":\"棠东\"}],\"page\":1,\"Status\":true,\"page_size\":10,\"page_count\":1,\"total_count\":8}" ; GetListEntity getListEntity = JsonUtil.jsonToPojo(json, GetListEntity.class); if (getListEntity == null) { return; @@ -69,7 +69,6 @@ public class BootTest { String itemJson = JsonUtil.objectToJson(orderEntity.getItems()); lzOrder.setItems(itemJson); lzOrder.setCheckStatus(0); - System.out.println(itemJson); List items = JsonUtil.jsonToList(itemJson, GetListEntity.ItemEntity.class); if (items != null && items.size() > 0) { for (GetListEntity.ItemEntity item : items) { @@ -78,6 +77,8 @@ public class BootTest { break; } } + } else if(lzOrder.getCustomCode()==null){ + lzOrder.setCheckStatus(3); } else { lzOrder.setCheckStatus(2); } @@ -88,7 +89,7 @@ public class BootTest { } catch (Exception e) { log.error(e.getMessage()); } - lzOrderService.save(lzOrder); + //lzOrderService.save(lzOrder); break; } }