xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复预付取消问题

dev
lisai 2022-12-21 13:23:25 +08:00
parent 46e58c548d
commit 239f6f7169
2 changed files with 282 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/presellorder/PresellOrderSyncService.java
View File

@ -202,6 +202,9 @@ public class PresellOrderSyncService extends BaseSyncService {
SyncTask synctask = new SyncTask(); SyncTask synctask = new SyncTask();
SyncTask synctaskincrement = new SyncTask(); SyncTask synctaskincrement = new SyncTask();
synctask.setSupermarketId(saveold.getSupermarketId());
boolean ret = Db.tx(new IAtom() { boolean ret = Db.tx(new IAtom() {
@Override @Override
public boolean run() { public boolean run() {

51
ssjygl-xsx-service/src/main/java/dataadjustment/Main.java
View File

@ -73,37 +73,37 @@ public class Main {
System.out.println("orders : " + orders.size()); System.out.println("orders : " + orders.size());
// List<OrderTemp> orders = OrderTemp.dao.find("select * from order_temp where customer_id = 172 and state = 5 and create_time >= '2022-03-04' and create_time < '2022-04-25'"); // //List<OrderTemp> orders = OrderTemp.dao.find("select * from order_temp where customer_id = 172 and state = 5 and create_time >= '2022-03-04' and create_time < '2022-04-25'");
// //
//
Db.tx(new IAtom() {
@Override
public boolean run() {
try {
for (int i = 0; i < orders.size(); i++) {
System.out.println("处理 " + i);
DOrder o = orders.get(i);
// Db.tx(new IAtom() {
// @Override
// public boolean run() {
// try {
// for (int i = 0; i < orders.size(); i++) {
// System.out.println("处理 " + i);
// DOrder o = orders.get(i);
//
// if (!m.pass(o, now)) { // if (!m.pass(o, now)) {
// return false; // return false;
// } // }
//
if (!m.updateErrorData(o, now)) { //// if (!m.updateErrorData(o, now)) {
return false; //// return false;
} //// }
} // }
//
return true; // return true;
} catch (Exception e) { // } catch (Exception e) {
e.printStackTrace(); // e.printStackTrace();
return false; // return false;
} // }
} // }
}); // });
} }
private List<DOrder> imp() throws ParseException { private List<DOrder> imp() throws ParseException {
String filepath = "C:\\Users\\lisai\\OneDrive\\文档\\黄砂经营管理\\浠水\\9月1日到11月7日补开普票统计.xlsx"; String filepath = "C:\\Users\\lisai\\OneDrive\\文档\\黄砂经营管理\\浠水\\9月1日到11月7日补开普票统计给李工处理新普票号-程兴提供.xls";
List<DOrder> out = new ArrayList<>(); List<DOrder> out = new ArrayList<>();
try (FileInputStream in = new FileInputStream(new File(filepath))) { try (FileInputStream in = new FileInputStream(new File(filepath))) {
@ -158,7 +158,8 @@ public class Main {
if (!StrKit.notBlank(发票代码, 发票编号)) { if (!StrKit.notBlank(发票代码, 发票编号)) {
System.out.println("发票代码错误 " + 客户 + ", " + j); System.out.println("发票代码错误 " + 客户 + ", " + j);
return null; continue;
// return null;
} }
String[] 起止 = 起止时间.split("至"); String[] 起止 = 起止时间.split("至");
@ -199,7 +200,7 @@ public class Main {
} }
for (OrderTemp o : orders) { for (OrderTemp o : orders) {
if (StrKit.isBlank(o.getInvoiceNumber())) { if (StrKit.notBlank(o.getInvoiceNumber())) {
out.add(new DOrder(o, 发票代码, 发票编号, 申请人, 审批人)); out.add(new DOrder(o, 发票代码, 发票编号, 申请人, 审批人));
} }
} }