From 456f8b69675f9734efe19ed1842c9821ee080b1c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 23 十一月 2023 13:58:44 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/system/service/impl/ConfigServiceImpl.java         |    4 ++
 src/main/java/com/zy/crm/manager/controller/OrderProductTypeController.java |   15 +++++--
 src/main/webapp/views/cstmr/cstmr.html                                      |    6 ++-
 src/main/java/com/zy/crm/system/service/ConfigService.java                  |    2 +
 src/main/webapp/views/planType/planType.html                                |    4 ++
 src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java       |   13 +++++-
 src/main/webapp/views/orderProductType/orderProductType.html                |    4 ++
 src/main/resources/mapper/ConfigMapper.xml                                  |    6 +++
 src/main/webapp/views/cstmr/cstmr2.html                                     |    4 ++
 src/main/java/com/zy/crm/system/mapper/ConfigMapper.java                    |    3 +
 10 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/OrderProductTypeController.java b/src/main/java/com/zy/crm/manager/controller/OrderProductTypeController.java
index 13c6ed1..7a6dc20 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderProductTypeController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderProductTypeController.java
@@ -15,10 +15,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @RestController
 public class OrderProductTypeController extends BaseController {
@@ -62,6 +59,13 @@
     @RequestMapping(value = "/orderProductType/add/auth")
     @ManagerAuth
     public R add(OrderProductType orderProductType) {
+        Date now = new Date();
+        orderProductType.setHostId(getHostId());
+        orderProductType.setStatus(1);
+        orderProductType.setCreateBy(getUserId());
+        orderProductType.setCreateTime(now);
+        orderProductType.setUpdateBy(getUserId());
+        orderProductType.setUpdateTime(now);
         orderProductTypeService.insert(orderProductType);
         return R.ok();
     }
@@ -72,6 +76,9 @@
         if (Cools.isEmpty(orderProductType) || null==orderProductType.getId()){
             return R.error();
         }
+        Date now = new Date();
+        orderProductType.setUpdateBy(getUserId());
+        orderProductType.setUpdateTime(now);
         orderProductTypeService.updateById(orderProductType);
         return R.ok();
     }
diff --git a/src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java
index 367e233..1fe703d 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java
@@ -1,19 +1,24 @@
 package com.zy.crm.manager.service.impl;
 
-import com.core.common.DateUtils;
-import com.core.common.R;
+import com.core.common.Cools;
 import com.zy.crm.common.entity.PhoneCodeTypeParam;
 import com.zy.crm.manager.mapper.SmsCodeMapper;
 import com.zy.crm.manager.entity.SmsCode;
 import com.zy.crm.manager.service.SmsCodeService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.zy.crm.manager.utils.SmsUtils;
+import com.zy.crm.system.entity.Config;
+import com.zy.crm.system.service.ConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
 
 @Service("smsCodeService")
 public class SmsCodeServiceImpl extends ServiceImpl<SmsCodeMapper, SmsCode> implements SmsCodeService {
+
+    @Autowired
+    private ConfigService configService;
 
     @Override
     public SmsCode selectByPhone(String phone) {
@@ -68,6 +73,10 @@
 
     @Override
     public boolean sendSmsCodeText(String phone, PhoneCodeTypeParam param) {
+        Config config = configService.selectConfigByCode("SMSNotification");
+        if (Cools.isEmpty(config) || config.getValue().equals("false")) {
+            return true;
+        }
         String randomNum = param.code;
         SmsCode smsCode = new SmsCode();
         smsCode.setPhone(phone);
diff --git a/src/main/java/com/zy/crm/system/mapper/ConfigMapper.java b/src/main/java/com/zy/crm/system/mapper/ConfigMapper.java
index af7bf7d..b281966 100644
--- a/src/main/java/com/zy/crm/system/mapper/ConfigMapper.java
+++ b/src/main/java/com/zy/crm/system/mapper/ConfigMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import com.zy.crm.system.entity.Config;
 
@@ -9,4 +10,6 @@
 @Repository
 public interface ConfigMapper extends BaseMapper<Config> {
 
+    Config selectConfigByCode(@Param("code") String code);
+
 }
diff --git a/src/main/java/com/zy/crm/system/service/ConfigService.java b/src/main/java/com/zy/crm/system/service/ConfigService.java
index 5df7363..4cd0e11 100644
--- a/src/main/java/com/zy/crm/system/service/ConfigService.java
+++ b/src/main/java/com/zy/crm/system/service/ConfigService.java
@@ -5,4 +5,6 @@
 
 public interface ConfigService extends IService<Config> {
 
+    Config selectConfigByCode(String code);
+
 }
diff --git a/src/main/java/com/zy/crm/system/service/impl/ConfigServiceImpl.java b/src/main/java/com/zy/crm/system/service/impl/ConfigServiceImpl.java
index ec109ed..079bcd7 100644
--- a/src/main/java/com/zy/crm/system/service/impl/ConfigServiceImpl.java
+++ b/src/main/java/com/zy/crm/system/service/impl/ConfigServiceImpl.java
@@ -9,4 +9,8 @@
 @Service("configService")
 public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, Config> implements ConfigService {
 
+    @Override
+    public Config selectConfigByCode(String code){
+        return this.baseMapper.selectConfigByCode(code);
+    };
 }
diff --git a/src/main/resources/mapper/ConfigMapper.xml b/src/main/resources/mapper/ConfigMapper.xml
index 7c2fdf3..6f7a8ec 100644
--- a/src/main/resources/mapper/ConfigMapper.xml
+++ b/src/main/resources/mapper/ConfigMapper.xml
@@ -14,4 +14,10 @@
 
     </resultMap>
 
+    <select id="selectConfigByCode" resultMap="BaseResultMap">
+        select top 1 * from sys_config
+        where 1=1
+        and code=#{code}
+    </select>
+
 </mapper>
diff --git a/src/main/webapp/views/cstmr/cstmr.html b/src/main/webapp/views/cstmr/cstmr.html
index 9f38b63..7274fdf 100644
--- a/src/main/webapp/views/cstmr/cstmr.html
+++ b/src/main/webapp/views/cstmr/cstmr.html
@@ -189,8 +189,10 @@
                             <option value="闃佹ゼ璐ф灦/閽㈠钩鍙�">闃佹ゼ璐ф灦/閽㈠钩鍙�</option>
                             <option value="鍛ㄨ浆瀹瑰櫒">鍛ㄨ浆瀹瑰櫒</option>
                             <option value="骞冲簱">骞冲簱</option>
-                            <option value="澧炶ˉ">澧炶ˉ</option>
-                            <option value="鍏跺畠">鍏跺畠</option>
+                            <option value="璐ф灦澧炶ˉ">璐ф灦澧炶ˉ</option>
+                            <option value="闆嗘垚澧炶ˉ">闆嗘垚澧炶ˉ</option>
+                            <option value="璐ф灦鍏跺畠">璐ф灦鍏跺畠</option>
+                            <option value="闆嗘垚鍏跺畠">闆嗘垚鍏跺畠</option>
                         </select>
                     </div>
                 </div>
diff --git a/src/main/webapp/views/cstmr/cstmr2.html b/src/main/webapp/views/cstmr/cstmr2.html
index a33048f..0ca3c4d 100644
--- a/src/main/webapp/views/cstmr/cstmr2.html
+++ b/src/main/webapp/views/cstmr/cstmr2.html
@@ -202,6 +202,10 @@
                             <option value="闃佹ゼ璐ф灦/閽㈠钩鍙�">闃佹ゼ璐ф灦/閽㈠钩鍙�</option>
                             <option value="鍛ㄨ浆瀹瑰櫒">鍛ㄨ浆瀹瑰櫒</option>
                             <option value="骞冲簱">骞冲簱</option>
+                            <option value="璐ф灦澧炶ˉ">璐ф灦澧炶ˉ</option>
+                            <option value="闆嗘垚澧炶ˉ">闆嗘垚澧炶ˉ</option>
+                            <option value="璐ф灦鍏跺畠">璐ф灦鍏跺畠</option>
+                            <option value="闆嗘垚鍏跺畠">闆嗘垚鍏跺畠</option>
                         </select>
                     </div>
                 </div>
diff --git a/src/main/webapp/views/orderProductType/orderProductType.html b/src/main/webapp/views/orderProductType/orderProductType.html
index 4e96c89..2c57085 100644
--- a/src/main/webapp/views/orderProductType/orderProductType.html
+++ b/src/main/webapp/views/orderProductType/orderProductType.html
@@ -75,6 +75,10 @@
                             <option value="闃佹ゼ璐ф灦/閽㈠钩鍙�">闃佹ゼ璐ф灦/閽㈠钩鍙�</option>
                             <option value="鍛ㄨ浆瀹瑰櫒">鍛ㄨ浆瀹瑰櫒</option>
                             <option value="骞冲簱">骞冲簱</option>
+                            <option value="璐ф灦澧炶ˉ">璐ф灦澧炶ˉ</option>
+                            <option value="闆嗘垚澧炶ˉ">闆嗘垚澧炶ˉ</option>
+                            <option value="璐ф灦鍏跺畠">璐ф灦鍏跺畠</option>
+                            <option value="闆嗘垚鍏跺畠">闆嗘垚鍏跺畠</option>
                         </select>
                     </div>
                 </div>
diff --git a/src/main/webapp/views/planType/planType.html b/src/main/webapp/views/planType/planType.html
index f14742f..53632a9 100644
--- a/src/main/webapp/views/planType/planType.html
+++ b/src/main/webapp/views/planType/planType.html
@@ -96,6 +96,10 @@
                         <option value="闃佹ゼ璐ф灦/閽㈠钩鍙�">闃佹ゼ璐ф灦/閽㈠钩鍙�</option>
                         <option value="鍛ㄨ浆瀹瑰櫒">鍛ㄨ浆瀹瑰櫒</option>
                         <option value="骞冲簱">骞冲簱</option>
+                        <option value="璐ф灦澧炶ˉ">璐ф灦澧炶ˉ</option>
+                        <option value="闆嗘垚澧炶ˉ">闆嗘垚澧炶ˉ</option>
+                        <option value="璐ф灦鍏跺畠">璐ф灦鍏跺畠</option>
+                        <option value="闆嗘垚鍏跺畠">闆嗘垚鍏跺畠</option>
                     </select>
                 </div>
             </div>

--
Gitblit v1.9.1