all

docs/databases/tables_create.sql

@@ -21,6 +21,9 @@ values (1002,'1.0.0.2','http://mall.yyundong.com/apks/mall-1002.apk','BUG修复
 insert into app_version(versionCode,versionName,downloadUrl,versionInfo,fileName)
 values (1003,'1.0.0.3','http://mall.yyundong.com/apks/mall-1003.apk','登录方式切换的Bug修复；登录及退出后本地缓存数据问题的修复。','mall-1003.apk')
 
+insert into app_version(versionCode,versionName,downloadUrl,versionInfo,fileName)
+values (1012,'1.0.1.2','http://mall.yyundong.com/apks/mall-1012.apk','增加消息推送；优惠券一键领取。','mall-1012.apk')
+
 
 
 CREATE TABLE `push_cids` (
@@ -51,4 +54,4 @@ CREATE TABLE `sys_message_task` (
 
 
 INSERT INTO sys_permission (pid, name, value, icon, type, uri, status, create_time, sort) 
-VALUES (43, '定时消息', 'ums:UmsMember:read', 'product-list', 1, 'sysMessageTask', 1, now() , 0)
+VALUES (43, '定时消息', 'ums:UmsMember:read', 'product-list', 1, 'sysMessageTask', 1, now() , 1)

mallplus-admin/src/main/java/com/zscat/mallplus/MallAdminApplication.java

@@ -4,6 +4,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
@@ -13,6 +14,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 @MapperScan({"com.zscat.mallplus.mapper", "com.zscat.mallplus.ums.mapper", "com.zscat.mallplus.sms.mapper", "com.zscat.mallplus.cms.mapper", "com.zscat.mallplus.sys.mapper", "com.zscat.mallplus.oms.mapper", "com.zscat.mallplus.pms.mapper"})
 @EnableTransactionManagement
+@EnableScheduling
 public class MallAdminApplication {
     public static void main(String[] args) {
         SpringApplication.run(MallAdminApplication.class, args);

mallplus-admin/src/main/java/com/zscat/mallplus/task/SchedulingTaskComponent.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.zscat.mallplus.task;
+
+import com.zscat.mallplus.ums.service.SysMessageTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * Project: mallplus <br/>
+ * File: SchedulingService.java <br/>
+ * Class: com.zscat.mallplus.task.SchedulingService <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023/3/18 22:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class SchedulingTaskComponent {
+
+    @Autowired
+    private SysMessageTaskService sysMessageTaskService;
+
+    @Scheduled(cron = "0 */5 * * * ?")
+    public void remindVehicle() {
+        sysMessageTaskService.checkTask();
+    }
+}

mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/SysMessageTaskService.java

@@ -1,10 +1,39 @@
 package com.zscat.mallplus.ums.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zscat.mallplus.ums.entity.SysMessage;
 import com.zscat.mallplus.ums.entity.SysMessageTask;
 import com.zscat.mallplus.ums.mapper.SysMessageTaskMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 @Service
 public class SysMessageTaskService extends ServiceImpl<SysMessageTaskMapper, SysMessageTask> {
+
+    @Autowired
+    private ISysMessageService messageService;
+
+    public void checkTask() {
+        QueryWrapper<SysMessageTask> qw = new QueryWrapper<>();
+        qw.eq("status", 0);
+        qw.lt("sendtime", new Date());
+        List<SysMessageTask> list = baseMapper.selectList(qw);
+        for (SysMessageTask task : list) {
+            SysMessage sm = new SysMessage();
+            sm.setCode("系统消息");
+            sm.setUserId(1);
+            sm.setId(null);
+            sm.setContent(task.getContent());
+            sm.setParams(task.getParams());
+            sm.setCtime(System.currentTimeMillis());
+            messageService.sendToAll(sm);
+            task.setStatus(1);
+            baseMapper.updateById(task);
+        }
+
+    }
 }

mallplus-mbg/pom.xml

@@ -55,11 +55,22 @@
             <artifactId>hutool-all</artifactId>
             <version>${hutool.version}</version>
         </dependency>
-        <!--支付宝依赖-->
+        <!--支付宝依赖
         <dependency>
             <groupId>com.alipay.sdk</groupId>
             <artifactId>alipay-sdk-java</artifactId>
             <version>${alipay.version}</version>
+        </dependency>-->
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-sdk-java</artifactId>
+            <version>4.8.10.ALL</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>fastjson</artifactId>
+                    <groupId>com.alibaba</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- MyBatis 生成器 -->
         <dependency>

mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AliPayController.java

@@ -9,8 +9,6 @@ import com.alipay.api.CertAlipayRequest;
 import com.alipay.api.DefaultAlipayClient;
 import com.alipay.api.domain.*;
 import com.alipay.api.internal.util.AlipaySignature;
-import com.alipay.api.request.AlipayTradeAppPayRequest;
-import com.alipay.api.response.AlipayTradeAppPayResponse;
 import com.alipay.api.response.AlipayTradeCreateResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zscat.mallplus.alipay.AliPayApi;

mallplusui-web-admin/src/views/sms/coupon/components/CouponDetail.vue

@@ -265,6 +265,15 @@
 			onSubmit(formName) {
 				this.$refs[formName].validate((valid) => {
 					if (valid) {
+						if(parseFloat(this.coupon.amount)>=parseFloat(this.coupon.minPoint)){
+								this.$message({
+									message: '优惠券面值金额须小于使用门槛金额',
+									type: 'error',
+									duration: 1000
+								});
+								return false;
+						}
+						
 						this.$confirm('是否提交数据', '提示', {
 							confirmButtonText: '确定',
 							cancelButtonText: '取消',