From 74da615c225394edf0621b692b8b92a7dbd3d250 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 05 十月 2023 14:05:34 +0800
Subject: [PATCH] #登陆：短信码验证登录，先验证存不存在账号，再发送验证码
---
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java | 190 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 171 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
index eecca80..b438822 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
@@ -1,5 +1,6 @@
package com.zy.crm.manager.controller;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -10,13 +11,13 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.domain.KeyValueVo;
+import com.core.exception.CoolException;
+import com.zy.crm.common.model.SettleDto;
import com.zy.crm.common.web.BaseController;
-import com.zy.crm.manager.entity.Plan;
-import com.zy.crm.manager.entity.Pri;
-import com.zy.crm.manager.entity.PriOnline2;
-import com.zy.crm.manager.service.PlanService;
-import com.zy.crm.manager.service.PriOnline2Service;
-import com.zy.crm.manager.service.PriService;
+import com.zy.crm.manager.entity.*;
+import com.zy.crm.manager.service.*;
+import com.zy.crm.system.entity.User;
+import com.zy.crm.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.util.ClassUtils;
@@ -40,14 +41,28 @@
@Autowired
private PlanService planService;
+ @Autowired
+ private PriSalesService priSalesService;
+
+ @Autowired
+ private CstmrService cstmrService;
+
+ @Autowired
+ private UserService userService;
+
@RequestMapping(value = "/priOnline2/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(priOnline2Service.selectById(String.valueOf(id)));
+ PriOnline2 priOnline2 = priOnline2Service.selectById(String.valueOf(id));
+ assert priOnline2 != null;
+ JSONObject resultObj = JSON.parseObject(JSON.toJSONString(priOnline2));
+ // 姝ラ鏉＄浉鍏�
+ resultObj.put("step", priOnline2.getSettle() == 4 ? 0 : priOnline2.getSettle() + 1);
+ return R.ok().add(resultObj);
}
@RequestMapping(value = "/priOnline2/viewCheck/{id}/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏌ョ湅璇环")
public R viewCheck(@PathVariable("id") String id) {
PriOnline2 priOnline = priOnline2Service.selectById(String.valueOf(id));
if (Cools.isEmpty(priOnline.getCheckData())) {
@@ -65,11 +80,12 @@
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<PriOnline2> wrapper = new EntityWrapper<>();
- wrapper.setSqlSelect("id,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,dept_id as deptId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId");
- wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
+ wrapper.setSqlSelect("id,title,create_time as createTime,filepath,settle,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,dept_id as deptId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId");
+// wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
excludeTrash(param);
convert(param, wrapper);
allLike(PriOnline2.class, param.keySet(), wrapper, condition);
+ wrapper.or().eq("member_id",getUserId());
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(priOnline2Service.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -106,12 +122,12 @@
}
@RequestMapping(value = "/priOnline2/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "娣诲姞鏍镐环绠＄悊")
public R add(@RequestBody Map<String,Object> map) {
PriOnline2 priOnline2 = new PriOnline2();
priOnline2.setCreateTime(new Date());
priOnline2.setTitle(map.get("title").toString());
- priOnline2.setTemplateName(map.get("title").toString());
+// priOnline2.setTemplateName(map.get("title").toString());
priOnline2.setSheetData(map.get("sheetData").toString());
priOnline2.setItemId(Long.parseLong(map.get("itemId").toString()));
SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -126,11 +142,24 @@
priOnline2.setUpdateUserId(getUserId());
//鐘舵�侊紝鏈畬鎴�
priOnline2.setStatus(0);
+
//涓氬姟鍛�
// Item item = itemService.selectById(priOnline.getItemId());
Plan plan = planService.selectById(priOnline2.getItemId());
priOnline2.setMemberId(plan.getUserId());
+ Cstmr cstmr = cstmrService.selectById(plan.getCstmrId());
+ priOnline2.setTemplateName(cstmr.getName()); //鐢叉柟鍗曚綅鍚嶇О
+
+ priOnline2.setSettle(0);
+
+ User manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ List<String> initNames = new ArrayList<>();
+ initNames.add("鍒涘缓鏍镐环鍗曟ā鏉�");
+ initNames.add("鎻愪氦鏍镐环");
+ initNames.add("閮ㄩ棬缁忕悊瀹℃牳");
+ initNames.add("涓氬姟鍛樼‘璁�");
+ priOnline2.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricing(manager,getUser(),initNames,3)));
//璁剧疆椤圭洰娴佺▼
plan.setStep(2);
@@ -141,7 +170,7 @@
}
@RequestMapping(value = "/priOnline2/addOther/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍙﹀瓨鏍镐环绠＄悊")
public R addOther(@RequestBody Map<String,Object> map) {
PriOnline2 online = priOnline2Service.selectById(Long.parseLong(map.get("id").toString()));
@@ -173,7 +202,7 @@
}
@RequestMapping(value = "/priOnline2/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鏍镐环绠＄悊")
public R update(@RequestBody Map<String,Object> map){
PriOnline2 priOnline2 = priOnline2Service.selectById(Long.parseLong(map.get("id").toString()));
if (priOnline2.getStatus() == 1) {
@@ -191,7 +220,7 @@
//鏇存柊鐘舵��
@RequestMapping(value = "/priOnline2/updateForm/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鏍镐环绠＄悊鐘舵��")
public R updateForm(Long id,Integer status,String title,String templateName){
PriOnline2 priOnline2 = priOnline2Service.selectById(id);
priOnline2.setStatus(status);
@@ -203,7 +232,7 @@
}
@RequestMapping(value = "/priOnline2/uploadCheck/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "涓婁紶璇环鏂囦欢")
public R uploadCheck(@RequestParam("id") Integer id,
@RequestParam("checkData") String checkData,
@RequestParam("file") MultipartFile[] files){
@@ -272,10 +301,16 @@
}
@RequestMapping(value = "/priOnline2/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鏍镐环绠＄悊")
public R delete(Long[] ids){
if (Cools.isEmpty(ids)){
return R.error();
+ }
+ for (Long id : ids){
+ int priSales = priSalesService.selectCount(new EntityWrapper<PriSales>().eq("pri_online2_id", id));
+ if (priSales!=0){
+ return R.error("瀛樺湪鍏宠仈鐨勪骇鍝佽垂鐢ㄦ槑缁嗭紝绂佹鍒犻櫎锛侊紒锛�");
+ }
}
priOnline2Service.deleteBatchIds(Arrays.asList(ids));
return R.ok();
@@ -297,13 +332,14 @@
public R query(String condition) {
EntityWrapper<PriOnline2> wrapper = new EntityWrapper<>();
wrapper.like("order_num", condition);
- wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
+ wrapper.in("user_id", getUserRoleBelongsToUserId("allopen"));
Page<PriOnline2> page = priOnline2Service.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (PriOnline2 priOnline2 : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", priOnline2.getId());
- map.put("value", priOnline2.getOrderNum() + "/" + priOnline2.getPlanId$() + "/" + priOnline2.getMemberId$());
+// map.put("value", priOnline2.getOrderNum() + "/" + priOnline2.getPlanId$() + "/" + priOnline2.getMemberId$());
+ map.put("value", priOnline2.getOrderNum() + "/" + priOnline2.getTemplateName());
result.add(map);
}
return R.ok(result);
@@ -328,4 +364,120 @@
return R.ok().add(vos);
}
+ @PostMapping(value = "/priOnline2/approval/auth")
+ @ManagerAuth
+ public R approvalBusinessTrip(@RequestParam Long priOnlineId,
+ @RequestParam(required = false) Long plannerId){
+ PriOnline2 priOnline2 = priOnline2Service.selectById(priOnlineId);
+ assert priOnline2 != null;
+ Date now = new Date();
+ switch (priOnline2.getSettle()) {
+ case 0:
+ User user2 = userService.selectById(priOnline2.getUserId());
+ User manager1 = userService.getDeptManager(getHostId(), user2.getDeptId());
+
+ if (Cools.isEmpty(getUser())) {
+ return R.error("鎶辨瓑锛屾偍娌℃湁鎻愪氦鐨勬潈闄�");
+ }
+ if (!getUserId().equals(getUser().getId())) {
+ return R.error("鎶辨瓑锛屾偍娌℃湁鎻愪氦鐨勬潈闄�");
+ }
+ // 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list1 = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
+ for (SettleDto dto : list1) {
+ switch (dto.getStep()) {
+ case 0:
+ dto.setCurr(Boolean.FALSE);
+ break;
+ case 1:
+ dto.setCurr(Boolean.TRUE);
+ dto.setMsg(getUser().getNickname() + "鎻愪氦瀹屾垚");
+ dto.setTime(DateUtils.convert(now));
+ break;
+ default:
+ break;
+ }
+ }
+ priOnline2.setSettleMsg(JSON.toJSONString(list1));
+ // 淇敼瑙勫垝鍗曠姸鎬�
+ priOnline2.setSettle(1);
+ priOnline2.setUpdateUserId(getUserId());
+ priOnline2.setUpdateTime(now);
+ priOnline2.setMemberId(manager1.getId());
+
+ if (!priOnline2Service.updateById(priOnline2)) {
+ throw new CoolException("鎻愪氦澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ break;
+ case 1:
+ // 鏈儴闂ㄧ粡鐞嗗鏍�
+ User user = userService.selectById(priOnline2.getUserId());
+ User manager = userService.getDeptManager(getHostId(), user.getDeptId());
+ if (manager.getId().equals(getUserId())) {
+
+ // 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
+ for (SettleDto dto : list) {
+ switch (dto.getStep()) {
+ case 1:
+ dto.setCurr(Boolean.FALSE);
+ break;
+ case 2:
+ dto.setCurr(Boolean.TRUE);
+ dto.setMsg("閮ㄩ棬缁忕悊" + manager.getNickname() + "瀹℃壒閫氳繃");
+ dto.setTime(DateUtils.convert(now));
+ break;
+ default:
+ break;
+ }
+ }
+ priOnline2.setSettleMsg(JSON.toJSONString(list));
+
+ // 淇敼瑙勫垝鍗曠姸鎬�
+ priOnline2.setSettle(2); // 鐢宠閫氳繃
+ priOnline2.setUpdateTime(now);
+ if (!priOnline2Service.updateById(priOnline2)) {
+ throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ } else {
+ return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄愶紒锛侊紒");
+ }
+ break;
+ case 2:
+ // 涓氬姟鍛�
+ User salesman0 = userService.selectById(priOnline2.getUserId());
+ if (!getUserId().equals(salesman0.getId())) {
+ return R.error("鎶辨瓑锛屾偍鏃犻渶纭锛侊紒锛�");
+ }
+ // 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list2 = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
+ for (SettleDto dto : list2) {
+ switch (dto.getStep()) {
+ case 2:
+ dto.setCurr(Boolean.TRUE);
+ break;
+ case 3:
+ dto.setCurr(Boolean.TRUE);
+ dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "浠ョ‘璁�");
+ dto.setTime(DateUtils.convert(new Date()));
+ break;
+ default:
+ break;
+ }
+ }
+ priOnline2.setSettleMsg(JSON.toJSONString(list2));
+ // 淇敼瑙勫垝鍗曠姸鎬�
+ priOnline2.setSettle(3); // 瀹℃壒閫氳繃
+ priOnline2.setUpdateTime(new Date());
+
+ if (!priOnline2Service.updateById(priOnline2)) {
+ throw new CoolException("纭澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ break;
+ default:
+ return R.error();
+ }
+ return R.ok("瀹℃壒鎴愬姛");
+ }
+
}
--
Gitblit v1.9.1