Skip to content

G
gdtel-gztel-school-center
Commit 2ee9b5cd by 伍思炜
Options

智能平台对接更新

parent 449f62b8
Showing with 48 additions and 19 deletions
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrders.java
...@@ -640,7 +640,11 @@ public class IntelligenceSendOrders { ...@@ -640,7 +640,11 @@ public class IntelligenceSendOrders {
.header("X-Sign", sign) .header("X-Sign", sign)
.body(order_dataJSON) .body(order_dataJSON)
.asString(); .asString();
if (businessType == 5) {
log.info("单宽带下单接口，返回信息:" + responese); log.info("单宽带下单接口，返回信息:" + responese);
}else {
log.info("融合下单接口，返回信息:" + responese);
}
} catch (ResourceAccessException e) { } catch (ResourceAccessException e) {
count++; count++;
if (count < 20) { if (count < 20) {
...@@ -657,10 +661,18 @@ public class IntelligenceSendOrders { ...@@ -657,10 +661,18 @@ public class IntelligenceSendOrders {
businessType, //业务类型 businessType, //业务类型
count); count);
} else { } else {
log.error("单宽带(预付费、移动、融合、续约、增值)下单接口异常尝试20次失误。请检查接口"); if (businessType == 5) {
log.info("单宽带下单接口，返回信息:" + responese);
}else {
log.info("融合下单接口，返回信息:" + responese);
}
} }
} catch (Exception e) { } catch (Exception e) {
if (businessType == 5) {
log.info("单宽带下单接口异常"); log.info("单宽带下单接口异常");
}else {
log.info("融合下单接口异常");
}
e.printStackTrace(); e.printStackTrace();
} }
return responese; return responese;
...@@ -745,7 +757,7 @@ public class IntelligenceSendOrders { ...@@ -745,7 +757,7 @@ public class IntelligenceSendOrders {
if (count < 20) { if (count < 20) {
getQueryOrderInfo(orderNum, count); getQueryOrderInfo(orderNum, count);
} else { } else {
log.error("单宽订单状态查询接口尝试20次未查询到订单。请重新下单或检查下单接口"); log.error("宽带订单状态查询接口尝试20次未查询到订单。请重新下单或检查下单接口");
} }
} }
} catch (ResourceAccessException s) { } catch (ResourceAccessException s) {
......
common/src/main/resources/com/winsun/mapper/mapping/OrderMapper.xml
...@@ -596,7 +596,7 @@ ...@@ -596,7 +596,7 @@
</select> </select>
<select id="selectRHList" resultType="java.util.Map"> <select id="selectRHList" resultType="java.util.Map">
SELECT * FROM hhr_order SELECT * FROM hhr_order
WHERE order_status = '未下单' and (user_type = 3 or user_type = 10) and rh_time &gt; #{left} and rh_time &lt; #{right} WHERE order_status = '未下单' and (user_type = 3 or user_type = 10) and rh_time &gt;= #{left} and rh_time &lt;= #{right}
</select> </select>
<select id="selectNotRHList" resultType="java.util.Map"> <select id="selectNotRHList" resultType="java.util.Map">
SELECT * FROM hhr_order SELECT * FROM hhr_order
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
...@@ -283,6 +283,7 @@ public class OrderController extends BaseController { ...@@ -283,6 +283,7 @@ public class OrderController extends BaseController {
business_iccid = businessNumber; business_iccid = businessNumber;
} }
HhrUser hhrUser = hhrUserMapper.selectById(hehuoren_id); HhrUser hhrUser = hhrUserMapper.selectById(hehuoren_id);
Map<String, String> schoolMap = schoolMapper.selectByHeHuorenId(hehuoren_id);
Map<String, Object> map1 = new HashMap<>(); Map<String, Object> map1 = new HashMap<>();
int ysm = Integer.parseInt(hhrUser.getYsm()); int ysm = Integer.parseInt(hhrUser.getYsm());
...@@ -290,17 +291,25 @@ public class OrderController extends BaseController { ...@@ -290,17 +291,25 @@ public class OrderController extends BaseController {
map1.put("ysmUser", ysmUser.getUserName()); map1.put("ysmUser", ysmUser.getUserName());
map1.put("sign", ysmUser.getSign()); map1.put("sign", ysmUser.getSign());
map1.put("idCardUrl1", order.getIdCardz().replace("manager","app")); if (StringUtils.isNotEmpty(schoolMap.get("lzgh")) && StringUtils.isNotEmpty(schoolMap.get("lz_user"))) {
map1.put("idCardUrl2", order.getIdCardf().replace("manager","app")); map1.put("lzgh", schoolMap.get("lzgh"));
map1.put("idCardUrl3", order.getIdCardzs().replace("manager","app")); map1.put("lzUser", schoolMap.get("lz_user"));
} else {
map1.put("lzgh", "44100621");
map1.put("lzUser", "黄友健");
}
map1.put("idCardUrl1", order.getIdCardz().replace("manager", "app"));
map1.put("idCardUrl2", order.getIdCardf().replace("manager", "app"));
map1.put("idCardUrl3", order.getIdCardzs().replace("manager", "app"));
map1.put("cardType", order.getKapin()); map1.put("cardType", order.getKapin());
if (order.getPackageId().equals("49")) { if (order.getPackageId().equals("49")) {
map1.put("userName", order.getParentName()); map1.put("userName", order.getParentName());
map1.put("idCardUrl4", order.getIdCardzs().replace("manager","app")); map1.put("idCardUrl4", order.getIdCardzs().replace("manager", "app"));
} else { } else {
map1.put("userName", order.getCustomerName()); map1.put("userName", order.getCustomerName());
map1.put("idCardUrl4", order.getStudenCard().replace("manager","app")); map1.put("idCardUrl4", order.getStudenCard().replace("manager", "app"));
} }
map1.put("linkPhone", order.getContactNumber()); map1.put("linkPhone", order.getContactNumber());
map1.put("idCard", order.getIdCard()); map1.put("idCard", order.getIdCard());
...@@ -1746,29 +1755,37 @@ public class OrderController extends BaseController { ...@@ -1746,29 +1755,37 @@ public class OrderController extends BaseController {
String business_number = orderData.getBusinessNumber(); String business_number = orderData.getBusinessNumber();
String business_iccid = orderData.getBusinessIccid(); String business_iccid = orderData.getBusinessIccid();
Map<String, Object> partnerById = orderMapper.findPartnerById(hehuoren_id); Map<String, Object> partnerById = orderMapper.findPartnerById(hehuoren_id);
Map<String, String> schoolMap = schoolMapper.selectByHeHuorenId(hehuoren_id);
String name = orderData.getHehuorenName(); String name = orderData.getHehuorenName();
Map<String, Object> map1 = new HashMap<>(); Map<String, Object> map1 = new HashMap<>();
int ysm = Integer.parseInt(partnerById.get("ysm").toString()); int ysm = Integer.parseInt(partnerById.get("ysm").toString());
Map<String, Object> ysmById = orderMapper.findYsmById(ysm); Map<String, Object> ysmById = orderMapper.findYsmById(ysm);
map1.put("orderId",orderData.getId()); map1.put("orderId", orderData.getId());
map1.put("ysmUser", ysmById.get("user_name")); map1.put("ysmUser", ysmById.get("user_name"));
map1.put("sign", ysmById.get("sign")); map1.put("sign", ysmById.get("sign"));
if (StringUtils.isNotEmpty(schoolMap.get("lzgh")) && StringUtils.isNotEmpty(schoolMap.get("lz_user"))) {
map1.put("lzgh", schoolMap.get("lzgh"));
map1.put("lzUser", schoolMap.get("lz_user"));
} else {
map1.put("lzgh", "44100621");
map1.put("lzUser", "黄友健");
}
/*map1.put("idCardUrl1", orderData.getIdCardz()); /*map1.put("idCardUrl1", orderData.getIdCardz());
map1.put("idCardUrl2", orderData.getIdCardf()); map1.put("idCardUrl2", orderData.getIdCardf());
map1.put("idCardUrl3", orderData.getIdCardzs());*/ map1.put("idCardUrl3", orderData.getIdCardzs());*/
map1.put("idCardUrl1", orderData.getIdCardz().replace("manager","app")); map1.put("idCardUrl1", orderData.getIdCardz().replace("manager", "app"));
map1.put("idCardUrl2", orderData.getIdCardf().replace("manager","app")); map1.put("idCardUrl2", orderData.getIdCardf().replace("manager", "app"));
map1.put("idCardUrl3", orderData.getIdCardzs().replace("manager","app")); map1.put("idCardUrl3", orderData.getIdCardzs().replace("manager", "app"));
map1.put("cardType", orderData.getKapin()); map1.put("cardType", orderData.getKapin());
if ("49".equals(orderData.getPackageId())) { if ("49".equals(orderData.getPackageId())) {
map1.put("userName", orderData.getParentName()); map1.put("userName", orderData.getParentName());
map1.put("idCardUrl4", orderData.getIdCardzs().replace("manager","app")); map1.put("idCardUrl4", orderData.getIdCardzs().replace("manager", "app"));
} else { } else {
map1.put("userName", orderData.getCustomerName()); map1.put("userName", orderData.getCustomerName());
map1.put("idCardUrl4", orderData.getStudenCard().replace("manager","app")); map1.put("idCardUrl4", orderData.getStudenCard().replace("manager", "app"));
} }
map1.put("linkPhone", orderData.getContactNumber()); map1.put("linkPhone", orderData.getContactNumber());
map1.put("idCard", orderData.getIdCard()); map1.put("idCard", orderData.getIdCard());
...@@ -2311,8 +2328,8 @@ public class OrderController extends BaseController { ...@@ -2311,8 +2328,8 @@ public class OrderController extends BaseController {
order_data.put("订购产品", orderingProducts); order_data.put("订购产品", orderingProducts);
Map<Object, Object> logisticsInformation = new HashMap<>(); //物流信息 Map<Object, Object> logisticsInformation = new HashMap<>(); //物流信息
logisticsInformation.put("受理类型","不受理"); logisticsInformation.put("受理类型", "不受理");
logisticsInformation.put("发货类型","代理商自行发货"); logisticsInformation.put("发货类型", "代理商自行发货");
order_data.put("业务类型", "移动业务"); //业务类型 order_data.put("业务类型", "移动业务"); //业务类型
//order_data.put("业务类型", "单宽业务"); //业务类型 //order_data.put("业务类型", "单宽业务"); //业务类型
...@@ -2336,7 +2353,7 @@ public class OrderController extends BaseController { ...@@ -2336,7 +2353,7 @@ public class OrderController extends BaseController {
order_data.put("实名信息", realNameInformation); order_data.put("实名信息", realNameInformation);
Map<String, Object> logistics = new HashMap<>(); //物流信息 Map<String, Object> logistics = new HashMap<>(); //物流信息
logistics.put("发货类型","代理商自行发货"); logistics.put("发货类型", "代理商自行发货");
order_data.put("物流信息", logistics); order_data.put("物流信息", logistics);
......
task/src/main/java/com/winsun/TimingTask/RhZhiNenTask.java
...@@ -87,7 +87,7 @@ public class RhZhiNenTask { ...@@ -87,7 +87,7 @@ public class RhZhiNenTask {
@Scheduled(cron = "0 0/5 * * * ? ") @Scheduled(cron = "0 0/5 * * * ? ")
// @Scheduled(fixedRate=2800000) // @Scheduled(fixedRate=2800000)
public void sendZhiNengOrder() { public void sendZhiNengOrder() {
log.info("智能平台定时器下单启动"); log.info("智能平台定时器融合下单启动");
try{ try{
// 更新融合时间小于当前时间的未下单订单 更新为待受理 // 更新融合时间小于当前时间的未下单订单 更新为待受理
// 获取当天日期 // 获取当天日期
...@@ -120,7 +120,7 @@ public class RhZhiNenTask { ...@@ -120,7 +120,7 @@ public class RhZhiNenTask {
}catch(Exception e) { }catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error("智能平台定时器下单异常"); log.error("智能平台定时器融合下单异常");
log.error(e.getMessage()); log.error(e.getMessage());
} }
} }
......
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