From 393d296e43f0e5f11e524cab5446bcd3eee94e89 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 12 Jun 2021 17:47:38 +0800
Subject: [PATCH] 新增赠送项目是否计算消耗控制
---
zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
index 18eb754..e790d7c 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
@@ -5,10 +5,7 @@
import com.matrix.core.constance.SystemErrorCode;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
-import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.RSAUtils;
-import com.matrix.core.tools.StringUtils;
-import com.matrix.core.tools.WebUtil;
+import com.matrix.core.tools.*;
import com.matrix.core.web.BaseAction;
import com.matrix.system.common.authority.DefaultAuthorityManager;
import com.matrix.system.common.authority.strategy.AccountPasswordLogin;
@@ -23,13 +20,11 @@
import com.matrix.system.hive.statistics.StatisticsBusinessDataJob;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import java.security.Key;
import java.util.Map;
+import java.util.Objects;
/**
* @description 通用控制器,本action未经session过验证器
@@ -39,6 +34,7 @@
*/
@RequestMapping(value = "/common")
@Controller
+@CrossOrigin(origins = "*", maxAge = 3600)
public class CommonAction extends BaseAction {
@Autowired
@@ -56,7 +52,7 @@
StatisticsBusinessDataJob sjobp;
@RequestMapping(value = "/job")
public @ResponseBody String job() {
- sjobp.executeExt2();
+ //sjobp.executeExt2();
return "1";
}
@@ -262,4 +258,26 @@
+ @Autowired
+
+
+ /**
+ * 官网联系我们通知
+ */
+ @RequestMapping(value = "/gwLinkUs")
+ public @ResponseBody
+ AjaxResult gwLinkUs(@RequestBody Map<String , Object> param) {
+
+ String title = "hive新客户在官网提交联系请求";
+ if(Objects.nonNull(param.get("name"))){
+ String content = "hive=>name:" + param.get("name") + " tel：" + param.get("tel") ;
+ DingDingRobotUtil.sendLink("https://oapi.dingtalk.com/robot/send?access_token=62bb902f0e3945f0ece31306b99abae043fc69a66da0ef04d89fd20bf58d88d8", content, title, "", "www.baidu.com");
+
+ }
+
+ return AjaxResult.buildSuccessInstance("提交成功");
+ }
+
+
+
}
\ No newline at end of file
--
Gitblit v1.9.1