From d794181b2828e9bf0b17ec5f99ad90d72a9471fd Mon Sep 17 00:00:00 2001 From: xjm Date: Mon, 11 Dec 2023 19:25:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96,=20=E6=96=B0=E5=A2=9E=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=96=E6=B6=88=E6=97=A5=E7=BB=9F=E8=AE=A1=E6=9B=B4?= =?UTF-8?q?=E6=96=B0,=E7=BB=9F=E8=AE=A1=E5=8E=86=E5=8F=B2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=87=AA=E6=B5=8B=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ssjygl/prepay/PrepayController.java | 16 ++++++++++------ .../ssjygl/system/sysuser/SysuserController.java | 9 +++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/PrepayController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/PrepayController.java index d26a33c..4c0ba39 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/PrepayController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/PrepayController.java @@ -13,6 +13,9 @@ import com.cowr.ssjygl.prepay.prepaydetail.PrepayDetailService; import com.jfinal.aop.Before; import org.apache.poi.ss.usermodel.Workbook; +import static com.cowr.common.utils.DateTimeUtil.TM_TIME; +import static com.cowr.common.utils.DateTimeUtil.now; + public class PrepayController extends BaseController { public void find() { String name = get("name"); @@ -53,8 +56,8 @@ public class PrepayController extends BaseController { } Integer supermarket_id = getInt("supermarket_id"); - String stm = get("stm"); - String etm = get("etm"); + String stm = get("stm", now().minusDays(TM_TIME) + " 00:00:00"); + String etm = get("etm",now() + " 23:59:59"); String truck_license = get("truck_license"); Integer invoice_type = getInt("invoice_type"); if (export == 0) { @@ -81,8 +84,8 @@ public class PrepayController extends BaseController { customer_id = tokenuser.getEntityId(); } - String stm = get("stm"); - String etm = get("etm"); + String stm = get("stm", now().minusDays(TM_TIME) + " 00:00:00"); + String etm = get("etm",now() + " 23:59:59"); if (export == 0) { renderJson(Result.success(PrepayService.me.flow(customer_id, customer_type_id, stm, etm))); @@ -111,8 +114,8 @@ public class PrepayController extends BaseController { customer_id = tokenuser.getEntityId(); } - String stm = get("stm"); - String etm = get("etm"); + String stm = get("stm", now().minusDays(TM_TIME) + " 00:00:00"); + String etm = get("etm",now() + " 23:59:59"); if (export == 0) { renderJson(Result.object(PrepayDetailService.me.list(customer_id, customer_type_id, stm, etm))); @@ -121,4 +124,5 @@ public class PrepayController extends BaseController { render(new ExcelRender("付费详情_" + System.currentTimeMillis() + ".xlsx", wb)); } } + } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java index 79014db..30c653f 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java @@ -267,4 +267,13 @@ public class SysuserController extends Controller { renderJson(SysuserSyncService.me.register(sysuser, customer, receiver)); } + + /** + * 客户登录状态 + */ + @Clear(AuthInterceptor.class) + public void getOnlineNumber() { + + renderJson(SysuserSyncService.me.getOnlineNumber()); + } }