lisai17@sina.com 2020-10-11 20:57:01 +08:00
parent 1bbb3301bc
commit 9776073731
5 changed files with 36 additions and 10 deletions

View File

@ -782,6 +782,11 @@ public class OrderTempSyncService {
}
});
// 数据库修改成功后,再将数据下发
if (ret) {
SyncTaskService.me.send(synctask);
}
return LocalOrderService.me.orderPayComplete(ret, order.toRecord(), transport, printerId);
}

View File

@ -15,7 +15,7 @@ socketserver.port=21002
socketio.port=12002
#当前部署本地程序的砂站id
current.supermarket_id=6
current.supermarket_id=3
#打印用到的配置信息
print.vendor=浠水县长投环保有限公司

View File

@ -52,11 +52,13 @@ public class OrderTempSyncService {
logrecord.set("sn", sn);
logrecord.set("state", OrderStateEnum.INVALID.getStateid());
SyncTask synctask = new SyncTask();
SyncTask synctaskincrement = new SyncTask();
boolean ret = Db.tx(new IAtom() {
@Override
public boolean run() {
try {
SyncTask synctask = new SyncTask();
synctask.addUpdateData(order);
boolean ret = order.update();
@ -131,13 +133,15 @@ public class OrderTempSyncService {
prepayCustomer.setSurplus(prepayCustomer.getSurplus().add(order.getTotalPrice()));
}
// 余额变化需要广播
SyncTaskService.me.save(new SyncTask().addIncrementData(
synctaskincrement.addIncrementData(
prepayCustomer.getTablename(),
"id",
prepayCustomer.getId(),
new JSONObject().fluentPut("surplus", order.getTotalPrice()) // 取消订单,在原余额上加上一个数
));
);
// 余额变化需要广播
SyncTaskService.me.save(synctaskincrement);
ret = prepayCustomer.update();
}
@ -167,6 +171,12 @@ public class OrderTempSyncService {
}
});
// 数据库修改成功后,再将数据下发
if (ret) {
SyncTaskService.me.send(synctask);
SyncTaskService.me.send(synctaskincrement);
}
return ret ? Result.success(order) : Result.failed("取消失败");
}
}

View File

@ -13,6 +13,7 @@ import com.jfinal.kit.StrKit;
import com.jfinal.log.Log;
import com.jfinal.plugin.activerecord.Db;
import com.jfinal.plugin.activerecord.IAtom;
import java.sql.SQLException;
import java.util.Date;
@ -108,13 +109,13 @@ public class PrepayDetailSyncService extends BaseSyncService {
}
try {
SyncTask synctask = new SyncTask();
PrepayDetail oldmodel = model.clone();
boolean ret = Db.tx(new IAtom() {
@Override
public boolean run() throws SQLException {
boolean ret = false;
Date now = new Date();
SyncTask synctask = new SyncTask();
boolean ret = false;
Date now = new Date();
model.setState(state);
model.setVerifyTime(now);
@ -129,7 +130,7 @@ public class PrepayDetailSyncService extends BaseSyncService {
// 只有在 state == 2 表示审核通过时,更新余额
if (state == 2) {
if(customer.getType() != 1){
if (customer.getType() != 1) {
customer.setType(1); // 标记为预付费用户
ret = customer.update();
@ -194,6 +195,11 @@ public class PrepayDetailSyncService extends BaseSyncService {
}
});
// 数据库修改成功后,再将数据下发
if (ret) {
SyncTaskService.me.send(synctask);
}
return ret ? Result.success(true) : Result.failed(false, "更新失败");
} catch (Exception e) {
log.error(e.getMessage(), e);

View File

@ -140,7 +140,7 @@ public class RefundDetailSyncService extends BaseSyncService {
try {
RefundDetail oldmodel = model.clone();
SyncTask synctask = new SyncTask();
SyncTask synctask = new SyncTask();
boolean ret = Db.tx(new IAtom() {
@Override
@ -290,6 +290,11 @@ public class RefundDetailSyncService extends BaseSyncService {
}
});
// 数据库修改成功后,再将数据下发
if (ret) {
SyncTaskService.me.send(synctask);
}
return ret ? Result.object(model) : Result.failed(false, "更新失败");
} catch (Exception e) {
log.error(e.getMessage(), e);