【越加红电子发票】【有折扣的行传含税】

src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -109,16 +109,15 @@ public class ERPServiceImpl implements ERPService {
                     //orderDetDTO.setPrice(rs_det.getGeneralString("id_price"));//平台算法问题 传单价会有差异，校验可能不通过，所有传金额和数量，不传单价
                     orderDetDTO.setTaxRate(rs_det.getGeneralString("taxrate"));//0.13
                     orderDetDTO.setTax(rs_det.getGeneralString("TAXTOTAL"));
-
-                /*传含税
-                orderDetDTO.setTaxAmount(rs_det.getGeneralString("id_amount"));
-                orderDetDTO.setHsbz(rs_det.getGeneralString("hsbz"));*/
-                    /*传不含税*/
-                    orderDetDTO.setTaxAmount(rs_det.getGeneralString("NETTOTAL"));
-                    orderDetDTO.setHsbz("0");
-
                     orderDetDTO.setSpbm(rs_det.getGeneralString("spbm"));
-                    orderDetDTO.setZke(rs_det.getGeneralString("ZKE"));
+                    if(rs_det.getGeneralDouble("ZKE")>0){//有折扣传含税
+                        orderDetDTO.setTaxAmount(rs_det.getGeneralString("id_amount"));
+                        orderDetDTO.setHsbz("1");
+                        orderDetDTO.setZke(rs_det.getGeneralString("HSZKE"));
+                    }else{  /*传不含税*/
+                        orderDetDTO.setTaxAmount(rs_det.getGeneralString("NETTOTAL"));
+                        orderDetDTO.setHsbz("0");
+                    }
                     dets.add(orderDetDTO);
                 }
                 invoiceOrderDTO.setOrderOriginalDetails(dets);
@@ -135,7 +134,7 @@ public class ERPServiceImpl implements ERPService {
                 System.out.println("token:"+token);
                 System.out.println("taxnum:"+taxnum);
                 System.out.println("content:"+content);
-                String result = sdk.sendPostSyncRequest(url, senid, appKey, appSecret, token, taxnum, method, content);
+                /*String result = sdk.sendPostSyncRequest(url, senid, appKey, appSecret, token, taxnum, method, content);
                 logger.info("pushInvoiceOrder resultString {}, token {}", result, token);
                 Map<Object, Object> res = JSONUtil.toMap(result);
                 System.out.println(result);
@@ -154,7 +153,7 @@ public class ERPServiceImpl implements ERPService {
                 logger.info("pushInvoiceOrder master {} ,id {} status {} message {}", master, id, status, message);
                 map.put("success", true);
                 map.put("status", status);
-                map.put("message", message);
+                map.put("message", message);*/
                 return map;
             } else {//数据无效
                 logger.info("pushInvoiceOrder err {对接源信息无效} ,master {} , id {} status {} message {}", master, id);