Skip to content

G
gdtel-gztel-school-center
Commit 9d509c1c by 陈浩建
Options

Merge remote-tracking branch 'origin/master'

parents 0855e5c0 21312808
Showing with 74 additions and 31 deletions
common/src/main/java/com/winsun/smsUtils/HttpUtil.java
...@@ -90,6 +90,7 @@ public class HttpUtil { ...@@ -90,6 +90,7 @@ public class HttpUtil {
CloseableHttpResponse response = httpclient.execute(request); CloseableHttpResponse response = httpclient.execute(request);
HttpEntity entity = response.getEntity(); HttpEntity entity = response.getEntity();
ret = EntityUtils.toString(entity); ret = EntityUtils.toString(entity);
log.info(ret);
statusCode = response.getStatusLine().getStatusCode(); statusCode = response.getStatusLine().getStatusCode();
if ((statusCode + "").charAt(0) != '2') { // 返回�?2XX以外属于请求不成功范�? if ((statusCode + "").charAt(0) != '2') { // 返回�?2XX以外属于请求不成功范�?
throw new Exception("request error"); throw new Exception("request error");
......
common/src/main/java/com/winsun/smsUtils/SendSmsAndMail.java
...@@ -99,7 +99,7 @@ public class SendSmsAndMail { ...@@ -99,7 +99,7 @@ public class SendSmsAndMail {
requestData.put("requestId", String.valueOf(System.currentTimeMillis())); // 16位请求标识码 requestData.put("requestId", String.valueOf(System.currentTimeMillis())); // 16位请求标识码
// 每次不一样就 // 每次不一样就
RequestParasUtil.setParas(requestData, appKey, appSecret, version, format, clientType); RequestParasUtil.setParas(requestData, appKey, appSecret, version, format, clientType);
log.info("send msgData:" + JSONObject.fromObject(requestData).toString());
try { try {
HttpUtil.httpPostMethodNoReTryWithStr(url, requestData); HttpUtil.httpPostMethodNoReTryWithStr(url, requestData);
} catch (Exception e) { } catch (Exception e) {
......
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
...@@ -244,8 +244,10 @@ public class PackageNewClothes { ...@@ -244,8 +244,10 @@ public class PackageNewClothes {
order.setHehuorenSchool(school.getSchoolName()); order.setHehuorenSchool(school.getSchoolName());
order.setHehuorenPhone(sysUser.getPhone()); order.setHehuorenPhone(sysUser.getPhone());
List<String> userId = appMapper.selectsupervisorBySchool(schoolId); List<String> userId = appMapper.selectsupervisorBySchool(schoolId);
if (userId != null && userId.size() == 1) {
SysUser user = userMapper.selectById(userId.get(0)); SysUser user = userMapper.selectById(userId.get(0));
order.setSupervisorName(user.getName()); order.setSupervisorName(user.getName());
}
order.setLzgh(school.getLzgh()); order.setLzgh(school.getLzgh());
Integer insert = orderMapper.insert(order); Integer insert = orderMapper.insert(order);
// MessageUtil.sent(contactNumber,"4",""); // MessageUtil.sent(contactNumber,"4","");
...@@ -479,6 +481,7 @@ public class PackageNewClothes { ...@@ -479,6 +481,7 @@ public class PackageNewClothes {
} }
// 根据市获取编号 // 根据市获取编号
// jsonObject = JSONObject.parseObject("{\"dataArray\":{\"salesName\":\"29元学霸星卡\",\"createTime\":\"2021-02-26 09:09:16\",\"orderStatus\":\"17\",\"coUserId\":\"245048\",\"orderCode\":\"120210226090852004565\",\"realPrice\":\"50.0\"},\"msg\":\"操作成功\",\"code\":\"0\",\"errorDescription\":\"\"}");
jsonObject = XbkUtil.xbkOrderJT0002(businessNumber, idCard, jsonObject = XbkUtil.xbkOrderJT0002(businessNumber, idCard,
customerName, contactNumber, xbId, netId, code, address); customerName, contactNumber, xbId, netId, code, address);
} catch (Exception e) { } catch (Exception e) {
...@@ -492,7 +495,6 @@ public class PackageNewClothes { ...@@ -492,7 +495,6 @@ public class PackageNewClothes {
} }
Map<String, Object> map = JSON.parseObject(jsonObject.getString("dataArray"), HashMap.class); Map<String, Object> map = JSON.parseObject(jsonObject.getString("dataArray"), HashMap.class);
SysUser sysUser = userMapper.selectById(partner); SysUser sysUser = userMapper.selectById(partner);
Order order = new Order(); Order order = new Order();
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
...@@ -538,7 +540,9 @@ public class PackageNewClothes { ...@@ -538,7 +540,9 @@ public class PackageNewClothes {
order.setLzgh(school.getLzgh()); order.setLzgh(school.getLzgh());
Integer insert = orderMapper.insert(order); Integer insert = orderMapper.insert(order);
String url = "https://dx.dianyuanjiangli.com/mobile/#/hhr/handleSuccessful?orderId=" + uuid + "&id=" + sysUser.getId(); String url = "https://dx.dianyuanjiangli.com/mobile/#/hhr/handleSuccessful?orderId=" + id;
log.info("小白卡订单查询短信地址:" + url);
log.info("联系号码：" + contactNumber);
SendSmsAndMail.sendSms(contactNumber, url, "2"); SendSmsAndMail.sendSms(contactNumber, url, "2");
if (insert == 1) { if (insert == 1) {
appMapper.inserOrderHis(id, "资料提交成功,等待上传证件", date, customerName); appMapper.inserOrderHis(id, "资料提交成功,等待上传证件", date, customerName);
......
old-user/src/main/java/com/winsun/controller/ChooseController.java
...@@ -5,11 +5,9 @@ import com.alibaba.fastjson.JSONObject; ...@@ -5,11 +5,9 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.Order; import com.winsun.bean.*;
import com.winsun.bean.School;
import com.winsun.bean.StudentLists;
import com.winsun.bean.SysUser;
import com.winsun.mapper.*; import com.winsun.mapper.*;
import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.MyBatisPlusUpdateUtils; import com.winsun.utils.MyBatisPlusUpdateUtils;
import com.winsun.utils.RandomUtil; import com.winsun.utils.RandomUtil;
import com.winsun.utils.XbkUtil; import com.winsun.utils.XbkUtil;
...@@ -44,19 +42,22 @@ public class ChooseController { ...@@ -44,19 +42,22 @@ public class ChooseController {
private static SysUserMapper userMapper; private static SysUserMapper userMapper;
private static OrderHistoryMapper orderHistoryMapper;
@Autowired @Autowired
@Qualifier("redisStringTemplate") @Qualifier("redisStringTemplate")
private RedisTemplate redisTemplate; private RedisTemplate redisTemplate;
@Autowired @Autowired
public ChooseController(AppMapper appMapper, PackageMapper packageMapper,SchoolMapper schoolMapper, OrderMapper orderMapper public ChooseController(AppMapper appMapper, PackageMapper packageMapper,SchoolMapper schoolMapper, OrderMapper orderMapper
, SysUserMapper userMapper,StudentListMapper stuListMapper) { , SysUserMapper userMapper,StudentListMapper stuListMapper, OrderHistoryMapper orderHistoryMapper) {
ChooseController.appMapper = appMapper; ChooseController.appMapper = appMapper;
ChooseController.packageMapper = packageMapper; ChooseController.packageMapper = packageMapper;
ChooseController.schoolMapper = schoolMapper; ChooseController.schoolMapper = schoolMapper;
ChooseController.orderMapper = orderMapper; ChooseController.orderMapper = orderMapper;
ChooseController.userMapper = userMapper; ChooseController.userMapper = userMapper;
ChooseController.stuListMapper = stuListMapper; ChooseController.stuListMapper = stuListMapper;
ChooseController.orderHistoryMapper = orderHistoryMapper;
} }
...@@ -75,8 +76,10 @@ public class ChooseController { ...@@ -75,8 +76,10 @@ public class ChooseController {
Order order = orderMapper.selectList(orderWrapper).get(0); Order order = orderMapper.selectList(orderWrapper).get(0);
orderId = order.getOrderId(); orderId = order.getOrderId();
log.info("" + "待识别".equals(order.getOrderStatus()));
if("待活体".equals(order.getOrderStatus()) || "待识别".equals(order.getOrderStatus())){ if("待活体".equals(order.getOrderStatus()) || "待识别".equals(order.getOrderStatus())){
general(orderId); general(order);
} }
order.setIdCard(""); order.setIdCard("");
order.setGiftAccount(""); order.setGiftAccount("");
...@@ -151,34 +154,69 @@ public class ChooseController { ...@@ -151,34 +154,69 @@ public class ChooseController {
return ResponseData.success(school); return ResponseData.success(school);
} }
public static void general(String orderId) { public static void general(Order order) {
Wrapper<Order> wrapper = new EntityWrapper(); try{
wrapper.eq("id", orderId);
List<Order> orders = orderMapper.selectList(wrapper);
orders.forEach(order -> {
try {
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId()); JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId());
log.info("订单信息：" + JSONObject.toJSONString(order));
log.info("小白卡获取状态:" + jsonObject);
if (jsonObject.get("code") != null && jsonObject.get("code").toString().equals("0")) {
String dataArray = jsonObject.getString("dataArray"); String dataArray = jsonObject.getString("dataArray");
Map<String,Object> Map = JSON.parseObject(dataArray, HashMap.class); Map<String,Object> map = JSON.parseObject(dataArray, HashMap.class);
Wrapper<Order> wrapper1 = new EntityWrapper(); if (order.getOrderStatus().equals("待识别")) {
wrapper1.eq("xb_order_id",Map.get("orderCode")); if(map.get("orderState").toString().equals("3") || map.get("orderState").toString().equals("13") ||
wrapper1.eq("id",order.getId()); map.get("orderState").toString().equals("8") || map.get("orderState").toString().equals("22") ||
if(Map.get("orderState").toString().equals("3") || Map.get("orderState").toString().equals("13") || map.get("orderState").toString().equals("21") ){
Map.get("orderState").toString().equals("8") || Map.get("orderState").toString().equals("22") || Order updateOrder = new Order();
Map.get("orderState").toString().equals("21") ){ updateOrder.setOrderStatus("待处理");
dataMapping.put("order_status", "待处理"); if (order.getTjType().equals("0")) {
} updateOrder.setOrderStatus("待活体");
if(Map.get("orderState").toString().equals("10") || Map.get("orderState").toString().equals("11")){ }
dataMapping.put("order_status", "异常单"); OrderHistory orderHistory = new OrderHistory();
dataMapping.put("success_time", new Date()); orderHistory.setOrderId(order.getId());
} orderHistory.setCreateDate(new Date());
orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1); if (order.getTjType().equals("0")) {
log.info(order.getXbOrderId()+"订单已更新"); orderHistory.setStatus("已上传三证等待活体");
} else {
orderHistory.setStatus("已上传三证等待配送后进行活体");
}
orderHistory.setOperator("省公司小白卡系统");
orderHistoryMapper.insert(orderHistory);
updateOrder.setId(order.getId());
orderMapper.updateById(updateOrder);
order.setOrderStatus("待活体");
}else if(map.get("orderState").toString().equals("1")) {
order.setOrderStatus("待支付");
}
}
if (order.getOrderStatus().equals("待活体")) {
if (map.get("orderState").toString().equals("13") || map.get("orderState").toString().equals("3")) {
System.out.println(SendSmsAndMail.sendSms(order.getContactNumber(), "", "3"));
Map<String, Object> map2 = new HashMap<>();
map2.put("order_status", "已完成");
try {
Order updateOrder = new Order();
updateOrder.setId(order.getId());
updateOrder.setOrderStatus("已完成");
orderMapper.updateById(updateOrder);
OrderHistory orderHistory = new OrderHistory();
orderHistory.setOrderId(order.getId());
orderHistory.setCreateDate(new Date());
orderHistory.setStatus("已活体认证");
orderHistory.setOperator("省公司小白卡系统");
orderHistoryMapper.insert(orderHistory);
order.setOrderStatus("已活体");
} catch (Exception e) {
log.error("更新待识别出错");
}
}
}
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
log.error(order.getXbOrderId()+"订单更新失败",e.getMessage()); log.error(order.getXbOrderId()+"订单更新失败",e.getMessage());
} }
});
} }
//进入三大权益先查一个表 hhr_check_student_list（这个表临时建的） //进入三大权益先查一个表 hhr_check_student_list（这个表临时建的）
......
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