From f84a36c5258d5ed9a858ecdfcafb71c0a37cebc6 Mon Sep 17 00:00:00 2001 From: "1215525055@qq.com" <1215525055@qq.com> Date: Mon, 3 Mar 2025 11:45:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E5=8F=91=E9=80=81=E7=9A=84=E8=B7=AF=E5=BE=84=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=20,=20=E5=8F=96=E6=B6=88=E4=BA=86=E5=AE=9A=E6=97=B6=E5=8F=91?= =?UTF-8?q?=E9=80=81=E5=AF=B9=E5=85=AC=E6=A0=B8=E5=AF=B9=20,=20=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=BA=86=E5=AE=9E=E6=97=B6=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PackageOrderResourceController.java | 3 +- .../properties/SystemApiPathProperties.java | 9 ++++ .../operator/util/OperatorSpringUtil.java | 44 +++++++++++++++++++ .../com/tenlion/operator/util/TenlionSMS.java | 10 ++++- src/main/resources/application-test.yml | 1 + .../packageorder/package-order-mapper.xml | 3 ++ src/main/resources/templates/coupon/save.html | 2 +- .../resources/templates/coupon/update.html | 2 +- 8 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 src/main/java/cn/com/tenlion/operator/util/OperatorSpringUtil.java diff --git a/src/main/java/cn/com/tenlion/operator/controller/resource/packageorder/PackageOrderResourceController.java b/src/main/java/cn/com/tenlion/operator/controller/resource/packageorder/PackageOrderResourceController.java index 070a1ce..5763ac6 100644 --- a/src/main/java/cn/com/tenlion/operator/controller/resource/packageorder/PackageOrderResourceController.java +++ b/src/main/java/cn/com/tenlion/operator/controller/resource/packageorder/PackageOrderResourceController.java @@ -107,7 +107,8 @@ public class PackageOrderResourceController extends DefaultBaseController { @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "keYong", value = "剩余次数>0的", paramType = "query", dataType = "String") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("listpage/{userId}") diff --git a/src/main/java/cn/com/tenlion/operator/properties/SystemApiPathProperties.java b/src/main/java/cn/com/tenlion/operator/properties/SystemApiPathProperties.java index 14db4ca..4062eaa 100644 --- a/src/main/java/cn/com/tenlion/operator/properties/SystemApiPathProperties.java +++ b/src/main/java/cn/com/tenlion/operator/properties/SystemApiPathProperties.java @@ -17,6 +17,15 @@ public class SystemApiPathProperties extends ApiPathProperties { private String copyright; private String copyrightExternal; + private String operatorPlugin; + + public String getOperatorPlugin() { + return operatorPlugin == null ? "" : operatorPlugin.trim(); + } + + public void setOperatorPlugin(String operatorPlugin) { + this.operatorPlugin = operatorPlugin; + } public String getCopyright() { return copyright == null ? "" : copyright.trim(); diff --git a/src/main/java/cn/com/tenlion/operator/util/OperatorSpringUtil.java b/src/main/java/cn/com/tenlion/operator/util/OperatorSpringUtil.java new file mode 100644 index 0000000..7d29a11 --- /dev/null +++ b/src/main/java/cn/com/tenlion/operator/util/OperatorSpringUtil.java @@ -0,0 +1,44 @@ +package cn.com.tenlion.operator.util; + +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; + +@Component +public class OperatorSpringUtil implements ApplicationContextAware { + + private static ApplicationContext applicationContext; + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + if(OperatorSpringUtil.applicationContext == null) { + OperatorSpringUtil.applicationContext = applicationContext; + } + System.out.println("---------------------------------------------------------------------"); + System.out.println("--------------------------OperatorSpringUtil------------------------"); + System.out.println("========ApplicationContext配置成功,在普通类可以通过调用SpringUtils.getAppContext()获取applicationContext对象,applicationContext="+OperatorSpringUtil.applicationContext+"========"); + System.out.println("---------------------------------------------------------------------"); + } + + //获取applicationContext + public static ApplicationContext getApplicationContext() { + return applicationContext; + } + + //通过name获取 Bean. + public static Object getBean(String name){ + return getApplicationContext().getBean(name); + } + + //通过class获取Bean. + public static T getBean(Class clazz){ + return getApplicationContext().getBean(clazz); + } + + //通过name,以及Clazz返回指定的Bean + public static T getBean(String name,Class clazz){ + return getApplicationContext().getBean(name, clazz); + } + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/operator/util/TenlionSMS.java b/src/main/java/cn/com/tenlion/operator/util/TenlionSMS.java index deadcc1..a22aeb3 100644 --- a/src/main/java/cn/com/tenlion/operator/util/TenlionSMS.java +++ b/src/main/java/cn/com/tenlion/operator/util/TenlionSMS.java @@ -1,5 +1,6 @@ package cn.com.tenlion.operator.util; +import cn.com.tenlion.operator.properties.SystemApiPathProperties; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -35,7 +36,14 @@ public class TenlionSMS { private static String getReplySMSUrl = systemUrl + "/app/send/reply"; // 账号可用模板列表查询 private static String getTemplateSMSUrl = systemUrl + "/app/send/template"; - + + static{ + SystemApiPathProperties apiPathProperties = OperatorSpringUtil.getBean(SystemApiPathProperties.class); + systemUrl = apiPathProperties.getOperatorPlugin(); + if (systemUrl.endsWith("/")) { + systemUrl = systemUrl.substring(0, systemUrl.length() -1); + } + } public static void main(String[] args) { // 可用模板列表 // System.out.println(getTemplate()); diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 56a75c7..af4a53e 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -237,6 +237,7 @@ api-path: user-center: http://192.168.0.115:8091/operator/ copyright: http://192.168.0.15:7025/copyright/ copyright-external: http://192.168.0.103:7025/copyright/ + operator-plugin: http://192.168.0.115:8099/operator-plugin/ # 短信验证码服务 sms: diff --git a/src/main/resources/mybatis/mapper/packageorder/package-order-mapper.xml b/src/main/resources/mybatis/mapper/packageorder/package-order-mapper.xml index c116e4d..ac72612 100644 --- a/src/main/resources/mybatis/mapper/packageorder/package-order-mapper.xml +++ b/src/main/resources/mybatis/mapper/packageorder/package-order-mapper.xml @@ -300,6 +300,9 @@ t1.package_info_id = t4.package_info_id WHERE t1.is_delete = 0 + + AND t1.package_total_surplus_count > 0 + AND t1.package_pay_status = #{packagePayStatus} diff --git a/src/main/resources/templates/coupon/save.html b/src/main/resources/templates/coupon/save.html index bea3cea..fadeedf 100644 --- a/src/main/resources/templates/coupon/save.html +++ b/src/main/resources/templates/coupon/save.html @@ -111,7 +111,7 @@
- +
diff --git a/src/main/resources/templates/coupon/update.html b/src/main/resources/templates/coupon/update.html index dfb9262..6546c6c 100644 --- a/src/main/resources/templates/coupon/update.html +++ b/src/main/resources/templates/coupon/update.html @@ -110,7 +110,7 @@
- +