调整流程

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;
 
     /**  */

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;
 
     /**
      * 备注

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<U8API4SaleOrder.OrderDetail> details = new ArrayList<>();
             String itemJson = order.getItems();
             List<GetListEntity.ItemEntity> 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<LzOrder> 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<String, Object> 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);
         }

src/main/java/com/qs/cost/module/service/impl/LzOrderServiceImpl.java

@@ -23,6 +23,7 @@ public class LzOrderServiceImpl extends ServiceImpl<LzOrderMapper, LzOrder> impl
     public Long existOrder(String orderNo) {
         LambdaQueryWrapper<LzOrder> lqw = new LambdaQueryWrapper<>();
         lqw.eq(LzOrder::getOrderNo,orderNo);
+        lqw.eq(LzOrder::getCheckStatus,0);
         return count(lqw);
     }
 }