diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java index 262baf2..a9bb2e0 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java @@ -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" + diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchaseService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchaseService.java index 76a872a..3dda057 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchaseService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchaseService.java @@ -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" + diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordersale/OrderSaleService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordersale/OrderSaleService.java index f876320..88a8fd8 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordersale/OrderSaleService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordersale/OrderSaleService.java @@ -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 " + diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java index 0264bd5..2513acf 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java @@ -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" + diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashService.java index 9cf7b13..49c9d84 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashService.java @@ -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" + diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/jobs/CheckUndonOrderclusterJob.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/jobs/CheckUndonOrderclusterJob.java new file mode 100644 index 0000000..910e250 --- /dev/null +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/jobs/CheckUndonOrderclusterJob.java @@ -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 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); + } + } +} diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java index 04ebc1d..09db447 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java @@ -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))); } /** diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseController.java index 82dbd8b..8549e5d 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseController.java @@ -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) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleController.java index 8ffad40..88d64fa 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleController.java @@ -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))); } /** diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java index b2ddcf3..ddaa7a8 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java @@ -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) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferController.java index 9e9c71e..799bb27 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferController.java @@ -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) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashController.java index 63c0628..1cfa546 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashController.java @@ -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) diff --git a/ssjygl-xsx-local/src/main/resources/job.properties b/ssjygl-xsx-local/src/main/resources/job.properties index 61d2f0b..75551da 100644 --- a/ssjygl-xsx-local/src/main/resources/job.properties +++ b/ssjygl-xsx-local/src/main/resources/job.properties @@ -1,4 +1,10 @@ #.job 部分前面不能以 job结尾 synctask.job=com.cowr.local.ssjygl.jobs.SyncJob synctask.cron= 0 * * * * ? -synctask.enable=true \ No newline at end of file +synctask.enable=true + +# 在零点检查前一天未完成的集团订单，将开始执行的置为已完成，将未开始的置为取消 +checkundonordercluster.job=com.cowr.local.ssjygl.jobs.CheckUndonOrderclusterJob +#checkundonordercluster.cron= 1 0 0 * * ? +checkundonordercluster.cron= 1 28 14 * * ? +checkundonordercluster.enable=true \ No newline at end of file diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java index 42ab7ca..5c08060 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java @@ -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))); } /** diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/orderpurchase/OrderPurchaseController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/orderpurchase/OrderPurchaseController.java index dacd565..b0af6e8 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/orderpurchase/OrderPurchaseController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/orderpurchase/OrderPurchaseController.java @@ -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))); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordersale/OrderSaleController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordersale/OrderSaleController.java index 960ca40..94a1e40 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordersale/OrderSaleController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordersale/OrderSaleController.java @@ -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))); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java index 258144c..3c4caa9 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java @@ -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))); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertransfer/OrderTransferController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertransfer/OrderTransferController.java index 396e4f4..92b6b0b 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertransfer/OrderTransferController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertransfer/OrderTransferController.java @@ -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))); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertrash/OrderTrashController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertrash/OrderTrashController.java index 1714ce8..b221125 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertrash/OrderTrashController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertrash/OrderTrashController.java @@ -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))); } }