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

.

dev
lisai17@sina.com 2020-09-01 14:34:28 +08:00
parent d3323126b7
commit 1465ce8b14
19 changed files with 107 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java
View File

@ -455,8 +455,8 @@ public class OrderclusterService extends BaseService {
String stm,
String etm,
Integer isprepaid,
Integer product_id,
Integer state
Integer state,
Integer product_id
) {
String salesql = "select \n" +
" t.sn, t.uuid, t.transport_id, t.supermarket_id\n" +

4
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchaseService.java
View File

@ -48,8 +48,8 @@ public class OrderPurchaseService extends BaseService {
Integer purchase_id,
String stm,
String etm,
Integer product_id,
Integer state
Integer state,
Integer product_id
) {
String selectsql = "select t.* " +
", p.order_sn \n" +

4
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordersale/OrderSaleService.java
View File

@ -64,8 +64,8 @@ public class OrderSaleService extends BaseService {
String stm,
String etm,
Integer isprepaid,
Integer product_id,
Integer state
Integer state,
Integer product_id
) {
String selectsql = "select t.*" +
", p.order_sn " +

4
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java
View File

@ -68,8 +68,8 @@ public class OrderTempService extends BaseService {
String stm,
String etm,
Integer isprepaid,
Integer product_id,
Integer state
Integer state,
Integer product_id
) {
String selectsql = "select t.* " +
", p.order_sn \n" +

4
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashService.java
View File

@ -46,8 +46,8 @@ public class OrderTrashService extends BaseService {
Integer supermarket_id,
String stm,
String etm,
Integer product_id,
Integer state
Integer state,
Integer product_id
) {
String selectsql = "select t.* " +
", p.order_sn \n" +

72
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/jobs/CheckUndonOrderclusterJob.java Normal file
View File

@ -0,0 +1,72 @@
package com.cowr.local.ssjygl.jobs;
import com.cowr.common.enums.OrderStateEnum;
import com.cowr.model.Ordercluster;
import com.jfinal.log.Log;
import com.jfinal.plugin.activerecord.Db;
import com.jfinal.plugin.activerecord.IAtom;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import java.util.Calendar;
import java.util.List;
public class CheckUndonOrderclusterJob implements Job {
private static Log log = Log.getLog(CheckUndonOrderclusterJob.class);
@Override
public void execute(JobExecutionContext jobExecutionContext) {
try {
Calendar c = Calendar.getInstance();
c.set(Calendar.HOUR_OF_DAY, 0);
c.set(Calendar.MINUTE, 0);
c.set(Calendar.SECOND, 0);
c.set(Calendar.MILLISECOND, 0);
List<Ordercluster> undonlist = Ordercluster.dao.find(
"select * from ordercluster t \n" +
" where t.state < ? \n" +
" and t.cutoff_time < ? ",
OrderStateEnum.RECEIVED.getStateid(), c.getTime());
if (undonlist != null && !undonlist.isEmpty()) {
log.debug("完成未执行完的订单 %d", undonlist.size());
for (Ordercluster ordercluster : undonlist) {
if (ordercluster.getState() == OrderStateEnum.INITIAL.getStateid()) {
ordercluster.setState(OrderStateEnum.INVALID.getStateid());
} else {
ordercluster.setState(OrderStateEnum.RECEIVED.getStateid());
}
}
boolean ret = Db.tx(new IAtom() {
@Override
public boolean run() {
try {
int[] ret = Db.batchUpdate(undonlist, undonlist.size());
for (int i : ret) {
// 必须是每条 sql 修改一条记录
if (i != 1) {
return false;
}
}
return true;
} catch (Exception e) {
log.error(e.getMessage(), e);
return false;
}
}
});
log.debug("更新集团订单状态完成， %s", ret);
} else {
log.debug("无未完成的订单");
}
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
}

8
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java
View File

@ -34,7 +34,7 @@ public class OrderclusterController extends BaseController {
Integer state = getInt("state");
Integer product_id = getInt("product_id");
renderJson(Result.object(OrderclusterService.me.findTemp(pp, supermarket_id, customer_name, stm, etm, product_id, state)));
renderJson(Result.object(OrderclusterService.me.findTemp(pp, supermarket_id, customer_name, stm, etm, state, product_id)));
}
/**
* 分页查找 ordercluster 订单簇 - 集团客户订单
@ -60,7 +60,7 @@ public class OrderclusterController extends BaseController {
Integer state = getInt("state");
Integer product_id = getInt("product_id");
Integer trans_co_id = getInt("trans_co_id");
renderJson(Result.object(OrderclusterService.me.findCluster(pp, supermarket_id, trans_co_id, customer_id, customer_name, stm, etm, product_id, state)));
renderJson(Result.object(OrderclusterService.me.findCluster(pp, supermarket_id, trans_co_id, customer_id, customer_name, stm, etm, state, product_id)));
}
/**
* 分页查找 ordercluster 订单簇 - 集团客户订单
@ -75,7 +75,7 @@ public class OrderclusterController extends BaseController {
Integer state = getInt("state");
Integer product_id = getInt("product_id");
Integer trans_co_id = getInt("trans_co_id");
renderJson(Result.object(OrderclusterService.me.find(pp, supermarket_id, trans_co_id, customer_id, customer_name, stm, etm, product_id, state)));
renderJson(Result.object(OrderclusterService.me.find(pp, supermarket_id, trans_co_id, customer_id, customer_name, stm, etm, state, product_id)));
}
public void findChildren() {
@ -88,7 +88,7 @@ public class OrderclusterController extends BaseController {
Integer state = getInt("state");
Integer product_id = getInt("product_id");
Integer isprepaid = getInt("isprepaid");
renderJson(Result.object(OrderclusterService.me.findChildren(pp, ordercluster_id, sn, truck_license, stm, etm, isprepaid, product_id, state)));
renderJson(Result.object(OrderclusterService.me.findChildren(pp, ordercluster_id, sn, truck_license, stm, etm, isprepaid, state, product_id)));
}
/**

2
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseController.java
View File

@ -37,7 +37,7 @@ public class OrderPurchaseController extends BaseController {
Integer supermarket_id = getInt("supermarket_id");
Integer sandfarm_id = getInt("sandfarm_id");
renderJson(Result.object(OrderPurchaseService.me.find(pp, sn, truck_license, supermarket_id, sandfarm_id, stm, etm, product_id, state)));
renderJson(Result.object(OrderPurchaseService.me.find(pp, sn, truck_license, supermarket_id, sandfarm_id, stm, etm, state, product_id)));
}
@Before(OrderPurchasePayValidator.class)

2
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleController.java
View File

@ -37,7 +37,7 @@ public class OrderSaleController extends BaseController {
Integer trans_co_id = getInt("trans_co_id");
Integer isprepaid = getInt("isprepaid");
Integer customer_id = getInt("customer_id");
renderJson(Result.object(OrderSaleService.me.find(pp, sn, truck_license, supermarket_id, trans_co_id, customer_id, customer_name, stm, etm, isprepaid, product_id, state)));
renderJson(Result.object(OrderSaleService.me.find(pp, sn, truck_license, supermarket_id, trans_co_id, customer_id, customer_name, stm, etm, isprepaid, state, product_id)));
}
/**

2
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java
View File

@ -38,7 +38,7 @@ public class OrderTempController extends BaseController {
Integer supermarket_id = getInt("supermarket_id");
Integer isprepaid = getInt("isprepaid");
Integer customer_id = getInt("customer_id");
renderJson(Result.object(OrderTempService.me.find(pp, sn, truck_license, supermarket_id, customer_id, customer_name, stm, etm, isprepaid, product_id, state)));
renderJson(Result.object(OrderTempService.me.find(pp, sn, truck_license, supermarket_id, customer_id, customer_name, stm, etm, isprepaid, state, product_id)));
}
@Before(OrderTempPayValidator.class)

2
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferController.java
View File

@ -37,7 +37,7 @@ public class OrderTransferController extends BaseController {
Integer supermarket_id = getInt("supermarket_id");
Integer sandfarm_id = getInt("sandfarm_id");
renderJson(Result.object(OrderTransferService.me.find(pp, sn, truck_license, supermarket_id, sandfarm_id, stm, etm, product_id, state)));
renderJson(Result.object(OrderTransferService.me.find(pp, sn, truck_license, supermarket_id, sandfarm_id, stm, etm, state, product_id)));
}
@Before(OrderTransferPayValidator.class)

2
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashController.java
View File

@ -36,7 +36,7 @@ public class OrderTrashController extends BaseController {
Integer product_id = getInt("product_id");
Integer supermarket_id = getInt("supermarket_id");
renderJson(Result.object(OrderTrashService.me.find(pp, sn, truck_license, supermarket_id, stm, etm, product_id, state)));
renderJson(Result.object(OrderTrashService.me.find(pp, sn, truck_license, supermarket_id, stm, etm, state, product_id)));
}
@Before(OrderTrashPayValidator.class)

8
ssjygl-xsx-local/src/main/resources/job.properties
View File

@ -1,4 +1,10 @@
#.job 部分前面不能以 job结尾
synctask.job=com.cowr.local.ssjygl.jobs.SyncJob
synctask.cron= 0 * * * * ?
synctask.enable=true
synctask.enable=true
# 在零点检查前一天未完成的集团订单，将开始执行的置为已完成，将未开始的置为取消
checkundonordercluster.job=com.cowr.local.ssjygl.jobs.CheckUndonOrderclusterJob
#checkundonordercluster.cron= 1 0 0 * * ?
checkundonordercluster.cron= 1 28 14 * * ?
checkundonordercluster.enable=true

8
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java
View File

@ -113,7 +113,7 @@ public class OrderclusterController extends BaseController {
Integer state = getInt("state");
Integer product_id = getInt("product_id");
renderJson(Result.object(OrderclusterService.me.findTemp(pp, supermarket_id, customer_name, stm, etm, product_id, state)));
renderJson(Result.object(OrderclusterService.me.findTemp(pp, supermarket_id, customer_name, stm, etm, state, product_id)));
}
/**
* 分页查找 ordercluster 订单簇 - 集团客户订单
@ -139,7 +139,7 @@ public class OrderclusterController extends BaseController {
Integer state = getInt("state");
Integer product_id = getInt("product_id");
Integer trans_co_id = getInt("trans_co_id");
renderJson(Result.object(OrderclusterService.me.findCluster(pp, supermarket_id, trans_co_id, customer_id, customer_name, stm, etm, product_id, state)));
renderJson(Result.object(OrderclusterService.me.findCluster(pp, supermarket_id, trans_co_id, customer_id, customer_name, stm, etm, state, product_id)));
}
/**
@ -166,7 +166,7 @@ public class OrderclusterController extends BaseController {
Integer state = getInt("state");
Integer product_id = getInt("product_id");
Integer trans_co_id = getInt("trans_co_id");
renderJson(Result.object(OrderclusterService.me.find(pp, supermarket_id, trans_co_id, customer_id, customer_name, stm, etm, product_id, state)));
renderJson(Result.object(OrderclusterService.me.find(pp, supermarket_id, trans_co_id, customer_id, customer_name, stm, etm, state, product_id)));
}
public void findChildren() {
@ -179,7 +179,7 @@ public class OrderclusterController extends BaseController {
Integer state = getInt("state");
Integer product_id = getInt("product_id");
Integer isprepaid = getInt("isprepaid");
renderJson(Result.object(OrderclusterService.me.findChildren(pp, ordercluster_id, sn, truck_license, stm, etm, isprepaid, product_id, state)));
renderJson(Result.object(OrderclusterService.me.findChildren(pp, ordercluster_id, sn, truck_license, stm, etm, isprepaid, state, product_id)));
}
/**

2
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/orderpurchase/OrderPurchaseController.java
View File

@ -30,6 +30,6 @@ public class OrderPurchaseController extends BaseController {
Integer supermarket_id = getInt("supermarket_id");
Integer sandfarm_id = getInt("sandfarm_id");
renderJson(Result.object(OrderPurchaseService.me.find(pp, sn, truck_license, supermarket_id, sandfarm_id, stm, etm, product_id, state)));
renderJson(Result.object(OrderPurchaseService.me.find(pp, sn, truck_license, supermarket_id, sandfarm_id, stm, etm, state, product_id)));
}
}

2
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordersale/OrderSaleController.java
View File

@ -43,6 +43,6 @@ public class OrderSaleController extends BaseController {
customer_id = tokenuser.getEntityId();
}
renderJson(Result.object(OrderSaleService.me.find(pp, sn, truck_license, supermarket_id, trans_co_id, customer_id, customer_name, stm, etm, isprepaid, product_id, state)));
renderJson(Result.object(OrderSaleService.me.find(pp, sn, truck_license, supermarket_id, trans_co_id, customer_id, customer_name, stm, etm, isprepaid, state, product_id)));
}
}

2
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java
View File

@ -50,6 +50,6 @@ public class OrderTempController extends BaseController {
customer_id = tokenuser.getEntityId();
}
renderJson(Result.object(OrderTempService.me.find(pp, sn, truck_license, supermarket_id, customer_id, customer_name, stm, etm, isprepaid, product_id, state)));
renderJson(Result.object(OrderTempService.me.find(pp, sn, truck_license, supermarket_id, customer_id, customer_name, stm, etm, isprepaid, state, product_id)));
}
}

2
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertransfer/OrderTransferController.java
View File

@ -30,6 +30,6 @@ public class OrderTransferController extends BaseController {
Integer supermarket_id = getInt("supermarket_id");
Integer sandfarm_id = getInt("sandfarm_id");
renderJson(Result.object(OrderTransferService.me.find(pp, sn, truck_license, supermarket_id, sandfarm_id, stm, etm, product_id, state)));
renderJson(Result.object(OrderTransferService.me.find(pp, sn, truck_license, supermarket_id, sandfarm_id, stm, etm, state, product_id)));
}
}

2
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertrash/OrderTrashController.java
View File

@ -29,6 +29,6 @@ public class OrderTrashController extends BaseController {
Integer product_id = getInt("product_id");
Integer supermarket_id = getInt("supermarket_id");
renderJson(Result.object(OrderTrashService.me.find(pp, sn, truck_license, supermarket_id, stm, etm, product_id, state)));
renderJson(Result.object(OrderTrashService.me.find(pp, sn, truck_license, supermarket_id, stm, etm, state, product_id)));
}
}