Skip to content

G
gdtel-gztel-school-center
Commit bbd4efff by 罗承锋
Options

Merge remote-tracking branch 'origin/master'

parents d27917b7 618afb49
Showing with 14 additions and 8 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
...@@ -126,6 +126,7 @@ public class DankuanController { ...@@ -126,6 +126,7 @@ public class DankuanController {
String setMealIndex = request.getParameter("setMealIndex"); String setMealIndex = request.getParameter("setMealIndex");
String imgUrl = request.getParameter("imgUrl"); String imgUrl = request.getParameter("imgUrl");
String filePath = ""; String filePath = "";
String orderSeq = RandomUtil.RandomNumber(20);
try{ try{
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
boolean boo1 = redisLockUtil.redisLock(orderNumber,uuid,10); boolean boo1 = redisLockUtil.redisLock(orderNumber,uuid,10);
...@@ -137,11 +138,12 @@ public class DankuanController { ...@@ -137,11 +138,12 @@ public class DankuanController {
if(StringUtils.isBlank(imgUrl)){ if(StringUtils.isBlank(imgUrl)){
return ResponseData.error("签名失败！"); return ResponseData.error("签名失败！");
} }
if(StringUtils.isNotBlank(imgUrl)){ if(StringUtils.isNotBlank(imgUrl)){
filePath = base64ToImgUtils.base64ToImg(imgUrl, FilePath.PATH.getValue()+FilePath.IMGURLPATH.getValue()); filePath = PicturesUtil.uploadPictures(imgUrl, orderSeq,"signImg");
} }
OrderView orderV = new OrderView(); OrderView orderV = new OrderView();
String orderSeq = RandomUtil.RandomNumber(20);
Product product = productMapper.selectById(productId); Product product = productMapper.selectById(productId);
OrderView orderView = new OrderView(); OrderView orderView = new OrderView();
orderView.setOrderName(orderName); orderView.setOrderName(orderName);
...@@ -249,7 +251,7 @@ public class DankuanController { ...@@ -249,7 +251,7 @@ public class DankuanController {
School school = schoolMapper.selectById(schoolId); School school = schoolMapper.selectById(schoolId);
order.setHehuorenSchool(school.getSchoolName()); order.setHehuorenSchool(school.getSchoolName());
order.setHehuorenName(sysUser.getName()); order.setHehuorenName(sysUser.getName());
order.setHehuorenArea(sysUser.getSubstName()); order.setHehuorenArea(school.getSubName());
order.setSignImg(filePath); order.setSignImg(filePath);
List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId); List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId);
......
apply-net/src/main/java/com/winsun/controller/RongHeController.java
...@@ -168,6 +168,7 @@ public class RongHeController { ...@@ -168,6 +168,7 @@ public class RongHeController {
String setMealIndex = request.getParameter("setMealIndex"); String setMealIndex = request.getParameter("setMealIndex");
String imgUrl = request.getParameter("imgUrl"); String imgUrl = request.getParameter("imgUrl");
String filePath = ""; String filePath = "";
String orderSeq = RandomUtil.RandomNumber(20);
// 生成随机字符串 // 生成随机字符串
try{ try{
...@@ -182,14 +183,13 @@ public class RongHeController { ...@@ -182,14 +183,13 @@ public class RongHeController {
return ResponseData.error("签名失败！"); return ResponseData.error("签名失败！");
} }
if(StringUtils.isNotBlank(imgUrl)){ if(StringUtils.isNotBlank(imgUrl)){
filePath = base64ToImgUtils.base64ToImg(imgUrl,FilePath.PATH.getValue()+FilePath.IMGURLPATH.getValue()); filePath = PicturesUtil.uploadPictures(imgUrl, orderSeq,"signImg");
} }
OrderView orderV = new OrderView(); OrderView orderV = new OrderView();
String mealStr = null; String mealStr = null;
String byStr = null; String byStr = null;
String prices = null; String prices = null;
Integer index = 0; Integer index = 0;
String orderSeq = RandomUtil.RandomNumber(20);
Product product = productMapper.selectById(productId); Product product = productMapper.selectById(productId);
UniversityInfo universityInfo = universityInfoMapper.selectById(product.getUniversityId()); UniversityInfo universityInfo = universityInfoMapper.selectById(product.getUniversityId());
String[] rateArry = product.getProductRhRate().split(","); // 年月（包年,包月） String[] rateArry = product.getProductRhRate().split(","); // 年月（包年,包月）
...@@ -341,7 +341,7 @@ public class RongHeController { ...@@ -341,7 +341,7 @@ public class RongHeController {
order.setHehuorenSchool(school.getSchoolName()); order.setHehuorenSchool(school.getSchoolName());
order.setHehuorenName(sysUser.getName()); order.setHehuorenName(sysUser.getName());
order.setPackageId(productId); order.setPackageId(productId);
order.setHehuorenArea(sysUser.getSubstName()); order.setHehuorenArea(school.getSubName());
order.setSignImg(filePath); order.setSignImg(filePath);
List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId); List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId);
SysUser user = sysUserMapper.selectById(userId1.get(0)); SysUser user = sysUserMapper.selectById(userId1.get(0));
......
common/src/main/java/com/winsun/utils/Base64ToImgUtils.java
...@@ -27,7 +27,7 @@ public class Base64ToImgUtils { ...@@ -27,7 +27,7 @@ public class Base64ToImgUtils {
Date date = new Date(); Date date = new Date();
String createdate = sd2.format(date); String createdate = sd2.format(date);
File file = new File(hhr_img + "/" + createdate+ "/" + sd.format(date) + "/"+ orderNumber); File file = new File(hhr_img + createdate+ "/" + sd.format(date) + "/"+ orderNumber);
if (!file.exists() && !file.isDirectory()) { if (!file.exists() && !file.isDirectory()) {
file.mkdirs(); file.mkdirs();
} }
......
old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
...@@ -12,6 +12,7 @@ import com.winsun.constant.UserType; ...@@ -12,6 +12,7 @@ import com.winsun.constant.UserType;
import com.winsun.mapper.*; import com.winsun.mapper.*;
import com.winsun.smsUtils.SendSmsAndMail; import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.IDCardUtil; import com.winsun.utils.IDCardUtil;
import com.winsun.utils.PicturesUtil;
import com.winsun.utils.ProduceIdUtil; import com.winsun.utils.ProduceIdUtil;
import com.winsun.utils.RandomUtil; import com.winsun.utils.RandomUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -323,7 +324,8 @@ public class PackageUpgradeController extends BaseController { ...@@ -323,7 +324,8 @@ public class PackageUpgradeController extends BaseController {
, @RequestParam("nowPackage") String nowPackage, @RequestParam("partner") String partner , @RequestParam("nowPackage") String nowPackage, @RequestParam("partner") String partner
, @RequestParam("businessPackage") String businessPackage, @RequestParam(value = "servId") String servId , @RequestParam("businessPackage") String businessPackage, @RequestParam(value = "servId") String servId
, @RequestParam(value = "mark", required = false) String mark, @RequestParam(value = "addRess", required = false) String addRess , @RequestParam(value = "mark", required = false) String mark, @RequestParam(value = "addRess", required = false) String addRess
, @RequestParam(value = "userSchool", required = false) String userSchool) { , @RequestParam(value = "userSchool", required = false) String userSchool
, @RequestParam(value = "imgUrl", required = false) String imgUrl) {
if (contactNumber.length() != 11) { if (contactNumber.length() != 11) {
return ResponseData.error("联系号码有误，请重新输入"); return ResponseData.error("联系号码有误，请重新输入");
} }
...@@ -361,6 +363,8 @@ public class PackageUpgradeController extends BaseController { ...@@ -361,6 +363,8 @@ public class PackageUpgradeController extends BaseController {
order.setOrderNumber("YRYM" + ProduceIdUtil.getId()); order.setOrderNumber("YRYM" + ProduceIdUtil.getId());
order.setHehuorenArea(sysUser.getSubstName()); order.setHehuorenArea(sysUser.getSubstName());
order.setHehuorenName(sysUser.getName()); order.setHehuorenName(sysUser.getName());
String path = PicturesUtil.uploadPictures(imgUrl, order.getId(),"signImg");
order.setSignImg(path);
String schoolId = appMapper.selectSchoolId(partner); String schoolId = appMapper.selectSchoolId(partner);
List<String> dudao = appMapper.selectsupervisorBySchool(schoolId); List<String> dudao = appMapper.selectsupervisorBySchool(schoolId);
if (dudao == null || dudao.size() == 0) { if (dudao == null || dudao.size() == 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment