From 2d4f406d43aa1963c7665a1adf5aa558cd01ffe3 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 25 Jul 2022 09:12:45 +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 --- .../com/qs/cost/module/domain/LzOrder.java | 2 ++ .../module/domain/dto/U8API4SaleOrder.java | 2 +- .../qs/cost/module/service/JiaJinService.java | 28 +++++++++++-------- .../service/impl/LzOrderServiceImpl.java | 1 + 4 files changed, 20 insertions(+), 13 deletions(-) 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 69e7e1d..9b2edea 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 tax; + private String remark; /** */ diff --git a/src/main/java/com/qs/cost/module/domain/dto/U8API4SaleOrder.java b/src/main/java/com/qs/cost/module/domain/dto/U8API4SaleOrder.java index 63c2bfd..f8a1c29 100644 --- a/src/main/java/com/qs/cost/module/domain/dto/U8API4SaleOrder.java +++ b/src/main/java/com/qs/cost/module/domain/dto/U8API4SaleOrder.java @@ -92,7 +92,7 @@ public class U8API4SaleOrder { * 税率 */ @JsonProperty("iTaxRate") - private BigDecimal taxRate; + private String taxRate; /** * 备注 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 6f31fd7..3a228f9 100644 --- a/src/main/java/com/qs/cost/module/service/JiaJinService.java +++ b/src/main/java/com/qs/cost/module/service/JiaJinService.java @@ -37,7 +37,7 @@ public class JiaJinService { private final MainServerProperties mainServerProperties; - @Scheduled(cron = "0 0/5 * * * ?") + @Scheduled(cron = "0 0/9 * * * ?") public void query(){ log.info("订单查询开始"); query(1); @@ -92,6 +92,7 @@ public class JiaJinService { lzOrder.setSaleDept(otherEntity.getSalesClass()); lzOrder.setSaleMan(otherEntity.getSalesMan()); lzOrder.setRemark(orderEntity.getRemark()); + lzOrder.setTax(otherEntity.getTaxPercent()); String itemJson = JsonUtil.objectToJson(orderEntity.getItems()); lzOrder.setItems(itemJson); lzOrder.setCheckStatus(0); @@ -144,13 +145,11 @@ public class JiaJinService { List details = new ArrayList<>(); String itemJson = order.getItems(); List items = JsonUtil.jsonToList(itemJson,GetListEntity.ItemEntity.class); - BigDecimal rate = BigDecimal.ONE; for (GetListEntity.ItemEntity item : items) { U8API4SaleOrder.OrderDetail orderDetail = new U8API4SaleOrder.OrderDetail(); //拿子项税率 - rate = new BigDecimal(item.getTaxRate()); orderDetail.setInvCode(item.getInvCode()); - orderDetail.setTaxRate(new BigDecimal(item.getTaxRate()).multiply(new BigDecimal(item.getQty()))); + orderDetail.setTaxRate(new BigDecimal(item.getTaxRate())); orderDetail.setQuantity(new Long(item.getQty())); orderDetail.setHasRatePrice(new BigDecimal(item.getSalePrice())); orderDetail.setHasRateSumPrice(new BigDecimal(item.getSaleAmount())); @@ -170,7 +169,7 @@ public class JiaJinService { .createUser(order.getSaleMan())//TODO DEMO .preShipmentsDate(now) .preFinishedDate(now) - .taxRate(rate) + .taxRate(order.getTax()) .remark(order.getRemark()) .remarkFoot(order.getConsignee()+"/"+order.getConsigneeMobile()+"/"+order.getProvinces()+"/"+order.getDetailedAddress()) .details(details) @@ -203,10 +202,14 @@ public class JiaJinService { String orderNo = requestVo.getApiPk(); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(LzOrder::getOrderNo,orderNo); + lqw.eq(LzOrder::getCheckStatus,0); + lqw.eq(LzOrder::getCallbackStatus,0); LzOrder lzOrder = lzOrderService.getOne(lqw,false); + if(lzOrder==null){ + return R.error(); + } //解析返回结果 lzOrder.setStatus(2); - lzOrder.setCallbackStatus(1); String response = requestVo.getRespContext(); JSONObject jsonObject = JSONObject.parseObject(response); if(jsonObject.getString("code").equals("200")){ @@ -218,12 +221,13 @@ public class JiaJinService { Map paramMap = new HashMap<>(10); paramMap.put("orderNos",orderNo); paramMap.put("sign",sign); - HttpResult httpResult = HttpUtil.post(url,JsonUtil.objectToJson(paramMap)); - if(httpResult.getCode()==200){ - if(httpResult.getData().contains("true")){ - lzOrder.setCheckStatus(1); - } - } +// HttpResult httpResult = HttpUtil.post(url,JsonUtil.objectToJson(paramMap)); +// if(httpResult.getCode()==200){ +// if(httpResult.getData().contains("true")){ +// lzOrder.setCallbackStatus(1); +// } +// } + lzOrder.setCallbackStatus(1); }else { lzOrder.setStatus(3); } 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 d8b3ba4..164aefe 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 @@ -23,6 +23,7 @@ public class LzOrderServiceImpl extends ServiceImpl impl public Long existOrder(String orderNo) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(LzOrder::getOrderNo,orderNo); + lqw.eq(LzOrder::getCheckStatus,0); return count(lqw); } }