Skip to content

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

临时提交，修改智能平台

parent c6a6c89c
Showing with 523 additions and 355 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
...@@ -4,13 +4,13 @@ import com.alibaba.fastjson.JSONArray; ...@@ -4,13 +4,13 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; 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.outSideSystem.IntelligenceSendOrders;
import com.winsun.utils.CheckPwd; import com.winsun.utils.CheckPwd;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.*; import com.winsun.bean.*;
import com.winsun.constant.Constant; import com.winsun.constant.Constant;
import com.winsun.constant.OrderStatus; import com.winsun.constant.OrderStatus;
import com.winsun.mapper.*; import com.winsun.mapper.*;
import com.winsun.outSideSystem.IntelligenceSendOrder;
import com.winsun.utils.*; import com.winsun.utils.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -78,7 +78,7 @@ public class DankuanController { ...@@ -78,7 +78,7 @@ public class DankuanController {
@Autowired @Autowired
private IntelligenceSendOrder intelligenceSendOrder; private IntelligenceSendOrders intelligenceSendOrders;
@Autowired @Autowired
private RegularMapper regularMapper; private RegularMapper regularMapper;
...@@ -251,7 +251,7 @@ public class DankuanController { ...@@ -251,7 +251,7 @@ public class DankuanController {
if (webOrderAmount.equals("0") || product.getProductIntroductionPic3().equals("1")) { if (webOrderAmount.equals("0") || product.getProductIntroductionPic3().equals("1")) {
res = createOrder(productId, orderView, partner, filePath, "未下单", sell); res = createOrder(productId, orderView, partner, filePath, "未下单", sell);
Map<String, Object> map = orderMapper.selectKdOrder(orderSeq); Map<String, Object> map = orderMapper.selectKdOrder(orderSeq);
intelligenceSendOrder.singleBroadSendOrder(map); intelligenceSendOrders.singleBroadSendOrder(map);
Order order = (Order) res.getData(); Order order = (Order) res.getData();
orderV.setOrderRf2(order.getId()); orderV.setOrderRf2(order.getId());
} else { } else {
...@@ -402,7 +402,7 @@ public class DankuanController { ...@@ -402,7 +402,7 @@ public class DankuanController {
log.info("------------单宽提交智能平台--------------"); log.info("------------单宽提交智能平台--------------");
// 提交智能平台 // 提交智能平台
log.info(JSONObject.toJSONString(stringObjectMap)); log.info(JSONObject.toJSONString(stringObjectMap));
intelligenceSendOrder.singleBroadSendOrder(stringObjectMap); intelligenceSendOrders.singleBroadSendOrder(stringObjectMap);
} }
} }
......
apply-net/src/main/java/com/winsun/controller/RongHeController.java
...@@ -760,7 +760,7 @@ public class RongHeController { ...@@ -760,7 +760,7 @@ public class RongHeController {
* @version 1.0 * @version 1.0
* @exception: * @exception:
*/ */
private static JSONObject getOrderInfo(Map<String, Object> schoolMap, OrderView orderView, String currentTimeStr, String productId, String saleId1, String saleId2, String ORDERSEQ, String UPTRANSEQ, String ORDERAMOUNT, String ORDERREQTRANSEQ) throws Exception { /* private static JSONObject getOrderInfo(Map<String, Object> schoolMap, OrderView orderView, String currentTimeStr, String productId, String saleId1, String saleId2, String ORDERSEQ, String UPTRANSEQ, String ORDERAMOUNT, String ORDERREQTRANSEQ) throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(500000) RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(500000)
.setConnectTimeout(500000).setConnectionRequestTimeout(500000).build(); .setConnectTimeout(500000).setConnectionRequestTimeout(500000).build();
...@@ -787,10 +787,10 @@ public class RongHeController { ...@@ -787,10 +787,10 @@ public class RongHeController {
qParams.add(new BasicNameValuePair("transactType", "新宽旧移"));// 办理类型，必填[新宽新移][新宽旧移][旧宽新移][旧宽旧移] qParams.add(new BasicNameValuePair("transactType", "新宽旧移"));// 办理类型，必填[新宽新移][新宽旧移][旧宽新移][旧宽旧移]
signMap.put("transactType", "新宽旧移"); signMap.put("transactType", "新宽旧移");
/* */ *//* *//*
qParams.add(new BasicNameValuePair("ctNumber", orderView.getOrderPhone()));// 电信号码，办理类型，若选择[新宽旧移]或[旧宽旧移]，此项必填 qParams.add(new BasicNameValuePair("ctNumber", orderView.getOrderPhone()));// 电信号码，办理类型，若选择[新宽旧移]或[旧宽旧移]，此项必填
signMap.put("ctNumber", orderView.getOrderPhone()); signMap.put("ctNumber", orderView.getOrderPhone());
/* */ *//* *//*
qParams.add(new BasicNameValuePair("addressProvince", "广东省"));// 报装地址-省 办理类型，若选择[新宽新移][新宽旧移]，此项必填 qParams.add(new BasicNameValuePair("addressProvince", "广东省"));// 报装地址-省 办理类型，若选择[新宽新移][新宽旧移]，此项必填
signMap.put("addressProvince", "广东省"); signMap.put("addressProvince", "广东省");
...@@ -1122,7 +1122,7 @@ public class RongHeController { ...@@ -1122,7 +1122,7 @@ public class RongHeController {
httpPost.releaseConnection(); httpPost.releaseConnection();
} }
return resultDataJson; return resultDataJson;
} }*/
} }
apply-net/src/main/java/com/winsun/controller/SingleBroadToIntegrateController.java
...@@ -8,6 +8,7 @@ import com.winsun.bean.*; ...@@ -8,6 +8,7 @@ import com.winsun.bean.*;
import com.winsun.constant.OrderStatus; import com.winsun.constant.OrderStatus;
import com.winsun.mapper.*; import com.winsun.mapper.*;
import com.winsun.outSideSystem.IntelligenceSendOrder; import com.winsun.outSideSystem.IntelligenceSendOrder;
import com.winsun.outSideSystem.IntelligenceSendOrders;
import com.winsun.smsUtils.SendSmsAndMail; import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.PicturesUtil; import com.winsun.utils.PicturesUtil;
import com.winsun.utils.RandomUtil; import com.winsun.utils.RandomUtil;
...@@ -60,6 +61,8 @@ public class SingleBroadToIntegrateController { ...@@ -60,6 +61,8 @@ public class SingleBroadToIntegrateController {
@Autowired @Autowired
private IntelligenceSendOrder intelligenceSendOrder; private IntelligenceSendOrder intelligenceSendOrder;
@Autowired
private IntelligenceSendOrders intelligenceSendOrders;
/** /**
* 查询订单信息 * 查询订单信息
...@@ -346,9 +349,11 @@ public class SingleBroadToIntegrateController { ...@@ -346,9 +349,11 @@ public class SingleBroadToIntegrateController {
if (toIntegrateOrderParam.getRhTime() == null || StringUtils.isBlank(toIntegrateOrderParam.getRhTime())) { if (toIntegrateOrderParam.getRhTime() == null || StringUtils.isBlank(toIntegrateOrderParam.getRhTime())) {
Wrapper<Order> wrapper = new EntityWrapper<>(); Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("id", uuid); wrapper.eq("id", uuid);
//Map<String, Object> orderMap = orderMapper.selectForId(order.getId());
new Thread(() -> { new Thread(() -> {
try { try {
intelligenceSendOrder.integrateSendOrder(order, true); intelligenceSendOrder.integrateSendOrder(order, true);
//intelligenceSendOrders.integrateSendOrder(orderMap, true);
}catch(Exception e) { }catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
log.info("融合下单失败！"); log.info("融合下单失败！");
......
apply-net/src/main/java/com/winsun/controller/TestController.java deleted 100644 → 0
package com.winsun.controller;
import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.bean.AttributeList;
import com.winsun.bean.Order;
import com.winsun.constant.Constant;
import com.winsun.mapper.OrderMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
public class TestController {
@Autowired
private OrderMapper orderMapper;
@RequestMapping(value = "testPost", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ResponseBody
public String testPost(@RequestBody JSONObject requestBean) {
Order order = new Order();
order.setOrderId((String) requestBean.get("orderId"));
order = orderMapper.selectOne(order);
Map<Object, Object> imgUrlMap = new HashMap<>();
imgUrlMap.put("身份证正面", order.getIdCardz() != null ? Constant.SYSTEMURL + order.getIdCardz().replace("manager", "app") : "");
imgUrlMap.put("身份证反面", order.getIdCardf() != null ? Constant.SYSTEMURL + order.getIdCardf().replace("manager", "app") : "");
imgUrlMap.put("手持身份证", order.getIdCardzs() != null ? Constant.SYSTEMURL + order.getIdCardzs().replace("manager", "app") : "null");
imgUrlMap.put("学生证", order.getStudenCard() != null ? Constant.SYSTEMURL + order.getStudenCard().replace("manager", "app") : "");
String imgUrlJSON = JSONUtils.toJSONString(imgUrlMap);
return imgUrlJSON;
}
}
\ No newline at end of file
apply-net/src/main/resources/application-local.yml
...@@ -120,9 +120,17 @@ spring: ...@@ -120,9 +120,17 @@ spring:
exprie: 600 exprie: 600
prohibition: 600 prohibition: 600
datasource: datasource:
url: jdbc:mysql://172.18.101.171:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true #url: jdbc:mysql://172.18.101.171:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
username: yzzx url: jdbc:mysql://localhost:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
password: yzzx123!@# #username: yzzx
username: root
#password: yzzx123!@#
password: root
druid:
WebStatFilter:
enabled: false
StatViewServlet:
enabled: false
dynamic: dynamic:
primary: master primary: master
p6spy: true p6spy: true
......
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrders.java
...@@ -99,12 +99,12 @@ public class IntelligenceSendOrders { ...@@ -99,12 +99,12 @@ public class IntelligenceSendOrders {
//@Autowired //@Autowired
//private ZnptSignUtils znptSignUtils; //private ZnptSignUtils znptSignUtils;
/*
/**
* 单宽下单公共类 * 单宽下单公共类
* *
* @param order hhr_order map类型 * @param orderMap
*/ */
public void singleBroadSendOrder(Map<String, Object> orderMap) { public void singleBroadSendOrder(Map<String, Object> orderMap) {
try { try {
...@@ -126,6 +126,7 @@ public class IntelligenceSendOrders { ...@@ -126,6 +126,7 @@ public class IntelligenceSendOrders {
List<Map<String, Object>> orderViewMaps = orderViewMapper.selectMaps(orderViewWrapper); List<Map<String, Object>> orderViewMaps = orderViewMapper.selectMaps(orderViewWrapper);
if (orderViewMaps != null && orderViewMaps.size() > 0) { if (orderViewMaps != null && orderViewMaps.size() > 0) {
orderViewMap = orderViewMaps.get(0); orderViewMap = orderViewMaps.get(0);
orderViewMap.put("", orderMap.get("hehouren_name"));
} }
if (orderViewMap == null) { if (orderViewMap == null) {
log.info("错误记录：" + JSONObject.toJSONString(orderMap)); log.info("错误记录：" + JSONObject.toJSONString(orderMap));
...@@ -143,6 +144,7 @@ public class IntelligenceSendOrders { ...@@ -143,6 +144,7 @@ public class IntelligenceSendOrders {
// 根据学校名称，获取该学校信息 // 根据学校名称，获取该学校信息
schoolMap = setSchoolMap(orderMap, orderViewMap, schoolMap); schoolMap = setSchoolMap(orderMap, orderViewMap, schoolMap);
if (orderMap.get("orderSeqThd") == null || "".equals(orderMap.get("orderSeqThd"))) { if (orderMap.get("orderSeqThd") == null || "".equals(orderMap.get("orderSeqThd"))) {
ORDERAMOUNT = ORDERAMOUNT.replace("元", ""); ORDERAMOUNT = ORDERAMOUNT.replace("元", "");
ORDERAMOUNT = ORDERAMOUNT.replace(".00", ""); ORDERAMOUNT = ORDERAMOUNT.replace(".00", "");
...@@ -190,16 +192,11 @@ public class IntelligenceSendOrders { ...@@ -190,16 +192,11 @@ public class IntelligenceSendOrders {
// 4、查询智能订单是否存在 // 4、查询智能订单是否存在
String orderNum = submitOrderJsonObject.getBody(); String orderNum = submitOrderJsonObject.getBody();
JSONObject queryOrderJsonObject = getQueryOrderInfo(orderNum, 1); JSONObject queryOrderJsonObject = getQueryOrderInfo(orderNum, 1);
log.info("----------调用查询智能订单接口并返回参数信息:" + queryOrderJsonObject);
Map<String, Object> map = JSONObject.parseObject(queryOrderJsonObject.getString("data")); Map<String, Object> map = JSONObject.parseObject(queryOrderJsonObject.getString("data"));
System.out.println(map.get("q"));
List<Object> list = (List<Object>) map.get("q"); List<Object> list = (List<Object>) map.get("q");
Map<String, Object> q = (Map<String, Object>) list.get(0); Map<String, Object> q = (Map<String, Object>) list.get(0);
Map<String, Object> orderStatus = (Map<String, Object>) q.get("订单状态名称"); Map<String, Object> orderStatus = (Map<String, Object>) q.get("订单当前状态");
if (orderStatus.containsKey("订单当前状态|状态备注")) { if (!orderStatus.containsKey("订单当前状态|状态备注")) {
System.out.println(orderStatus.get("订单状态ID"));
//5、更新数据库 //5、更新数据库
String state = (String) orderStatus.get("订单状态名称"); String state = (String) orderStatus.get("订单状态名称");
// 更新hhr_order // 更新hhr_order
...@@ -317,8 +314,6 @@ public class IntelligenceSendOrders { ...@@ -317,8 +314,6 @@ public class IntelligenceSendOrders {
universityChargeMode = "测试"; universityChargeMode = "测试";
} }
//schoolMap.get()
Map<String, Map<String, String>> map = new HashMap<>(); Map<String, Map<String, String>> map = new HashMap<>();
Map<String, String> return_data = new HashMap<>(); Map<String, String> return_data = new HashMap<>();
...@@ -364,11 +359,9 @@ public class IntelligenceSendOrders { ...@@ -364,11 +359,9 @@ public class IntelligenceSendOrders {
order_data.put("付费类型", "预付费"); //预付费、后付费、其他 选填 order_data.put("付费类型", "预付费"); //预付费、后付费、其他 选填
School school = new School(); Map<String, String> school = schoolMapper.selectByHeHuorenId(String.valueOf(orderViewMap.get("hehuorenId")));
school.setLzgh(landId);
school = schoolMapper.selectOne(school);
Map<String, Object> packageInformation = new HashMap<>(); //揽装信息 Map<String, Object> packageInformation = new HashMap<>(); //揽装信息
packageInformation.put("揽装姓名", school.getLzUser()); packageInformation.put("揽装姓名", school.get("lz_user"));
packageInformation.put("三级机构", ""); packageInformation.put("三级机构", "");
packageInformation.put("一级机构", ""); packageInformation.put("一级机构", "");
packageInformation.put("企微号码", ""); packageInformation.put("企微号码", "");
...@@ -376,7 +369,7 @@ public class IntelligenceSendOrders { ...@@ -376,7 +369,7 @@ public class IntelligenceSendOrders {
packageInformation.put("机构ID", addressID); packageInformation.put("机构ID", addressID);
packageInformation.put("四级机构", ""); packageInformation.put("四级机构", "");
packageInformation.put("二级机构", ""); packageInformation.put("二级机构", "");
packageInformation.put("揽装工号", /*landId*/"4410061561"); packageInformation.put("揽装工号", landId);
packageInformation.put("协销工号", ""); packageInformation.put("协销工号", "");
packageInformation.put("五级机构", ""); packageInformation.put("五级机构", "");
order_data.put("揽装信息", packageInformation); order_data.put("揽装信息", packageInformation);
...@@ -396,115 +389,142 @@ public class IntelligenceSendOrders { ...@@ -396,115 +389,142 @@ public class IntelligenceSendOrders {
orderingProducts.put("付费类型", "预付费"); orderingProducts.put("付费类型", "预付费");
// 属性列表 // 属性列表
List<AttributeList> attributeList = new ArrayList();
AttributeList roadbandRate = new AttributeList(); AttributeList roadbandRate = new AttributeList();
roadbandRate.setName("宽带速率"); roadbandRate.setName("宽带速率");
String setMeal = null; String speed = (String) schoolMap.get("speed");
if (businessType == 3) { /*if (StringUtils.isNotBlank(setMeal)) {
setMeal = (String) schoolMap.get("speed");
} else if (businessType == 5) {
setMeal = (String) orderViewMap.get("orderSetMeal");
} else {
setMeal = (String) schoolMap.get("expenses");
}
if (StringUtils.isNotBlank(setMeal)) {
setMeal = setMeal.replace("包月", ""); setMeal = setMeal.replace("包月", "");
setMeal = setMeal.replace("包年", ""); setMeal = setMeal.replace("包年", "");
} }*/
if (businessType == 5) { if (businessType == 5) {
if (setMeal.equals("20M")) { if (speed.equals("20M")) {
roadbandRate.setValue("20M下行速率/4M上行速率"); roadbandRate.setValue("20M下行速率/4M上行速率");
} else if (setMeal.equals("2M")) { } else if (speed.equals("2M")) {
roadbandRate.setValue("2M下行速率/512K上行速率"); roadbandRate.setValue("2M下行速率/512K上行速率");
} else if (setMeal.equals("50M")) { } else if (speed.equals("50M")) {
roadbandRate.setValue("50M下行速率/10M上行速率"); roadbandRate.setValue("50M下行速率/10M上行速率");
} else { } else {
roadbandRate.setValue(setMeal); roadbandRate.setValue(speed);
} }
} else if (businessType == 3) { } else if (businessType == 3) {
roadbandRate.setValue(setMeal); roadbandRate.setValue(speed);
} else if (businessType == 10) { } else if (businessType == 10) {
roadbandRate.setName("宽带提速速率"); roadbandRate.setName("宽带提速速率");
roadbandRate.setValue(setMeal); String expenses = (String) schoolMap.get("expenses");
roadbandRate.setValue(expenses);
}
attributeList.add(roadbandRate);
if (businessType == 3) {
AttributeList roadbandExperienceRate = new AttributeList();
roadbandExperienceRate.setName("宽带体验速率");
String expenses = (String) schoolMap.get("expenses");
roadbandExperienceRate.setValue(expenses);
attributeList.add(roadbandExperienceRate);
}
AttributeList broadbandProperties = new AttributeList();
if (businessType == 5) {
broadbandProperties.setName("宽带类型");
if ("0".equals(ORDERAMOUNT)) {
broadbandProperties.setValue(ORDERAMOUNT + "元");
attributeList.add(broadbandProperties);
} else if (((String) orderViewMap.get("orderSetMeal")).contains("包月")) {
broadbandProperties.setValue(ORDERAMOUNT + "元/月");
attributeList.add(broadbandProperties);
} else {
broadbandProperties.setValue(ORDERAMOUNT + "元/年");
attributeList.add(broadbandProperties);
}
} }
AttributeList AddressID = new AttributeList(); AttributeList AddressID = new AttributeList();
AddressID.setName("地址ID"); AddressID.setName("地址ID");
AddressID.setValue(addressID); AddressID.setValue(addressID);
attributeList.add(AddressID);
AttributeList internetType = new AttributeList(); AttributeList internetType = new AttributeList();
internetType.setName("允许上网终端类型"); internetType.setName("允许上网终端类型");
internetType.setValue(universityTerminalType); internetType.setValue(universityTerminalType);
attributeList.add(internetType);
AttributeList userCategory = new AttributeList(); AttributeList userCategory = new AttributeList();
userCategory.setName("用户类别"); userCategory.setName("用户类别");
userCategory.setValue(universityUserCategory); userCategory.setValue(universityUserCategory);
attributeList.add(userCategory);
AttributeList schoolName = new AttributeList(); AttributeList schoolName = new AttributeList();
schoolName.setName("学校名称"); schoolName.setName("学校名称");
schoolName.setValue((String) orderViewMap.get("orderUniversityName")); schoolName.setValue((String) orderViewMap.get("orderUniversityName"));
attributeList.add(schoolName);
AttributeList handlingNumber = new AttributeList(); AttributeList handlingNumber = new AttributeList();
if (businessType == 3 || businessType == 10) { if (businessType == 3 || businessType == 10) {
handlingNumber.setName("办理号码"); handlingNumber.setName("办理号码");
handlingNumber.setValue((String) orderViewMap.get("orderPhone")); handlingNumber.setValue((String) orderViewMap.get("orderPhone"));
handlingNumber.setName("关联移动号码");
handlingNumber.setValue((String) orderViewMap.get("orderPhone"));
attributeList.add(handlingNumber);
} }
AttributeList studentID = new AttributeList(); AttributeList studentID = new AttributeList();
studentID.setName("学生证号"); studentID.setName("学生证号");
studentID.setValue((String) orderViewMap.get("orderCustomerStudentId")); studentID.setValue((String) orderViewMap.get("orderCustomerStudentId"));
attributeList.add(studentID);
AttributeList userType = new AttributeList(); AttributeList userType = new AttributeList();
userType.setName("用户类型"); userType.setName("用户类型");
userType.setValue(universityUserType); userType.setValue(universityUserType);
attributeList.add(userType);
AttributeList monthlyRentType = new AttributeList(); AttributeList monthlyRentType = new AttributeList();
monthlyRentType.setName("月租类型"); monthlyRentType.setName("月租类型");
monthlyRentType.setValue(universityMonthlyRentType); monthlyRentType.setValue(universityMonthlyRentType);
attributeList.add(monthlyRentType);
AttributeList billingAttributes = new AttributeList(); AttributeList billingAttributes = new AttributeList();
billingAttributes.setName("计费属性"); billingAttributes.setName("计费属性");
billingAttributes.setValue(universityChargingAttribute); billingAttributes.setValue(universityChargingAttribute);
attributeList.add(billingAttributes);
AttributeList customerAccount = new AttributeList(); AttributeList customerAccount = new AttributeList();
customerAccount.setName("多媒体账号"); customerAccount.setName("多媒体账号");
customerAccount.setValue((String) orderViewMap.get("orderCustomerAccount")); customerAccount.setValue((String) orderViewMap.get("orderCustomerAccount"));
attributeList.add(customerAccount);
AttributeList customerPwd = new AttributeList(); AttributeList customerPwd = new AttributeList();
customerPwd.setName("多媒体账号密码"); customerPwd.setName("多媒体账号密码");
customerPwd.setValue((String) orderViewMap.get("orderCustomerPwd")); customerPwd.setValue((String) orderViewMap.get("orderCustomerPwd"));
attributeList.add(customerPwd);
AttributeList onlineNumber = new AttributeList(); AttributeList onlineNumber = new AttributeList();
onlineNumber.setName("最大在线数"); onlineNumber.setName("最大在线数");
onlineNumber.setValue(universityOnlineNumber); onlineNumber.setValue(universityOnlineNumber);
attributeList.add(onlineNumber);
AttributeList oneManTerminal = new AttributeList(); AttributeList oneManTerminal = new AttributeList();
oneManTerminal.setName("一人一号多终端"); oneManTerminal.setName("一人一号多终端");
oneManTerminal.setValue(universityOneManTerminal); oneManTerminal.setValue(universityOneManTerminal);
attributeList.add(oneManTerminal);
AttributeList isFtthHub = new AttributeList(); AttributeList isFtthHub = new AttributeList();
isFtthHub.setName("是否FTTH+HUB"); isFtthHub.setName("是否FTTH+HUB");
isFtthHub.setValue(universityIsFtthHub); isFtthHub.setValue(universityIsFtthHub);
attributeList.add(isFtthHub);
AttributeList exteriorLines = new AttributeList(); AttributeList exteriorLines = new AttributeList();
exteriorLines.setName("外线方式"); exteriorLines.setName("外线方式");
exteriorLines.setValue(universityExteriorLines); exteriorLines.setValue(universityExteriorLines);
attributeList.add(exteriorLines);
AttributeList chargeMode = new AttributeList(); AttributeList chargeMode = new AttributeList();
chargeMode.setName("宽带首月费用类型"); chargeMode.setName("宽带首月费用类型");
chargeMode.setValue(universityChargeMode); chargeMode.setValue(universityChargeMode);
attributeList.add(chargeMode);
orderingProducts.put("属性列表", attributeList);
if (handlingNumber.getValue() == null) {
AttributeList[] attributeList = new AttributeList[]{roadbandRate, AddressID, internetType, userCategory,
schoolName, studentID, userType, monthlyRentType, billingAttributes, customerAccount, customerPwd,
onlineNumber, oneManTerminal, isFtthHub, exteriorLines, chargeMode}; //属性列表
orderingProducts.put("属性列表", attributeList);
} else {
AttributeList[] attributeList = new AttributeList[]{roadbandRate, AddressID, internetType, userCategory, handlingNumber,
schoolName, studentID, userType, monthlyRentType, billingAttributes, customerAccount, customerPwd,
onlineNumber, oneManTerminal, isFtthHub, exteriorLines, chargeMode}; //属性列表
orderingProducts.put("属性列表", attributeList);
}
if (businessType == 5) { if (businessType == 5) {
orderingProducts.put("AI编码", "DQ_ADSL_CAMPUS"); orderingProducts.put("AI编码", "DQ_ADSL_CAMPUS");
} else { } else {
...@@ -532,10 +552,10 @@ public class IntelligenceSendOrders { ...@@ -532,10 +552,10 @@ public class IntelligenceSendOrders {
List<HashMap<String, Object>> expenseItemsList = new ArrayList<>(); //费用项列表 List<HashMap<String, Object>> expenseItemsList = new ArrayList<>(); //费用项列表
HashMap<String, Object> expenseItemsMap = new HashMap<>(); HashMap<String, Object> expenseItemsMap = new HashMap<>();
expenseItemsMap.put("费用项名称", productName); expenseItemsMap.put("费用项名称", productName);
expenseItemsMap.put("费用项金额", ORDERAMOUNT + ".0000"); expenseItemsMap.put("费用项金额", "00.0000");
if (universityMonthlyRentType.contains("包月")) { if (((String) orderViewMap.get("orderSetMeal")).contains("包月")) {
expenseItemsMap.put("费用项类型", "月租"); expenseItemsMap.put("费用项类型", "月租");
} else if (universityMonthlyRentType.contains("包年")) { } else if (((String) orderViewMap.get("orderSetMeal")).contains("包年")) {
expenseItemsMap.put("费用项类型", "年租"); expenseItemsMap.put("费用项类型", "年租");
} }
ORDERAMOUNT = ORDERAMOUNT.replace("元", ""); ORDERAMOUNT = ORDERAMOUNT.replace("元", "");
...@@ -545,7 +565,7 @@ public class IntelligenceSendOrders { ...@@ -545,7 +565,7 @@ public class IntelligenceSendOrders {
monthlyFeeItems.put("缴费方式", "现金支付"); monthlyFeeItems.put("缴费方式", "现金支付");
} else { } else {
monthlyFeeItems.put("缴费方式", "穗易付"); monthlyFeeItems.put("缴费方式", "穗易付");
expenseItemsMap.put("穗易付订单号", ORDERREQTRANSEQ); expenseItemsMap.put("穗易付订单号", "00000000000000");
String payPlatform = (String) orderViewMap.get("ipay"); String payPlatform = (String) orderViewMap.get("ipay");
if (StringUtils.isNotBlank(payPlatform)) { if (StringUtils.isNotBlank(payPlatform)) {
if ("1".equals(payPlatform)) { if ("1".equals(payPlatform)) {
...@@ -556,20 +576,49 @@ public class IntelligenceSendOrders { ...@@ -556,20 +576,49 @@ public class IntelligenceSendOrders {
} else { } else {
expenseItemsMap.put("穗易付支付平台", "穗易付"); // 支付平台，缴费方式为“穗易付”时必填 expenseItemsMap.put("穗易付支付平台", "穗易付"); // 支付平台，缴费方式为“穗易付”时必填
} }
expenseItemsMap.put("穗易付支付金额", ORDERAMOUNT); expenseItemsMap.put("穗易付支付金额", "0");
expenseItemsMap.put("穗易付支付流水号", UPTRANSEQ); expenseItemsMap.put("穗易付支付流水号", "0000000000000000000000");
} }
expenseItemsList.add(expenseItemsMap); expenseItemsList.add(expenseItemsMap);
monthlyFeeItems.put("费用项列表", expenseItemsList); monthlyFeeItems.put("费用项列表", expenseItemsList);
order_data.put("月租费用项", monthlyFeeItems); order_data.put("月租费用项", monthlyFeeItems);
//order_data.put("一次性费用项", "");
HashMap<Object, Object> OneExpenseItems = new HashMap<>(); //一次性费用项
List<HashMap<String, Object>> OneExpenseItemsList = new ArrayList<>(); //费用项列表
HashMap<String, Object> OneExpenseItemsMap = new HashMap<>();
OneExpenseItemsMap.put("费用项名称", productName);
OneExpenseItemsMap.put("费用项金额", ORDERAMOUNT + ".0000");
ORDERAMOUNT = ORDERAMOUNT.replace("元", "");
if (ORDERAMOUNT.equals("0.01") || ORDERAMOUNT.equals("0.02")) {
OneExpenseItems.put("缴费方式", "现金支付"); // 缴费方式，必填（例：payType：1）；1：银行划账2：现金支付3：代理商打款4：穗易付5：原套餐缴费方式6：支付宝划扣8：装维上门收取
} else if ("xjzf".equals(orderViewMap.get("customerId"))) {
OneExpenseItems.put("缴费方式", "现金支付");
} else {
OneExpenseItems.put("缴费方式", "穗易付");
OneExpenseItemsMap.put("穗易付订单号", ORDERREQTRANSEQ);
String payPlatform = (String) orderViewMap.get("ipay");
if (StringUtils.isNotBlank(payPlatform)) {
if ("1".equals(payPlatform)) {
OneExpenseItemsMap.put("穗易付支付平台", "支付宝"); // 支付平台，缴费方式为“穗易付”时必填
} else {
OneExpenseItemsMap.put("穗易付支付平台", "微信"); // 支付平台，缴费方式为“穗易付”时必填
}
} else {
OneExpenseItemsMap.put("穗易付支付平台", "穗易付"); // 支付平台，缴费方式为“穗易付”时必填
}
OneExpenseItemsMap.put("穗易付支付金额", ORDERAMOUNT);
OneExpenseItemsMap.put("穗易付支付流水号", UPTRANSEQ);
}
OneExpenseItemsList.add(OneExpenseItemsMap);
OneExpenseItems.put("费用项列表", OneExpenseItemsList);
order_data.put("一次性费用项", OneExpenseItems);
Map<String, Object> map1 = new HashMap<>(); Map<String, Object> map1 = new HashMap<>();
map1.put("order_data", order_data); map1.put("order_data", order_data);
String order_dataJSON = JSONObject.toJSONString(map1); String order_dataJSON = JSONObject.toJSONString(map1);
//String data = "{\"order_data\":{\"代理商账号\":\"hyoujian\",\"使用人姓名\":\"黄友健\",\"使用人证件号\":\"440802199006080830\",\"客户信息\":{\"联系人\":\"伍思炜\",\"客户证件号码\":\"44128319990817359X\",\"联系电话\":\"13727264296\",\"客户证件地址\":\"\",\"装机联系电话\":\"13727264296\",\"装机联系人\":\"伍思炜\",\"客户证件类型\":\"身份证\",\"通讯地址\":\"广州市黄埔区九龙镇九龙大道206号206号广州商学院思政楼1楼机房\"},\"装机详细地址\":\"广州市黄埔区九龙镇九龙大道206号206号广州商学院思政楼1楼机房\",\"订单来源单号\":\"r5bso7k9vgasfgs29tf8\",\"订单备注\":\"\",\"付费类型\":\"\",\"揽装信息\":{\"揽装人联系电话\":\"\",\"揽装姓名\":\"\",\"机构ID\":\"441020000000001023017324\",\"四级机构\":\"\",\"三级机构\":\"\",\"二级机构\":\"\",\"揽装工号\":\"06684262\",\"协销工号\":\"\",\"一级机构\":\"\",\"企微号码\":\"\",\"五级机构\":\"\"},\"发票信息\":{\"发票抬头\":\"\",\"发票投递方式\":\"不需要\",\"电子邮箱\":\"\"},\"接口下单账号\":\"xyzx\",\"订购产品\":{\"产品SKU\":\"\",\"产品名称\":\"校园宽带300元\",\"受理内容\":\"\",\"付费类型\":\"\",\"AI编码\":\"DQ_ADSL_CAMPUS\",\"属性列表\":[{\"属性值\":\"4M\",\"属性名\":\"宽带速率\"},{\"属性值\":\"441020000000001023017324\",\"属性名\":\"地址ID\"},{\"属性值\":\"PC+手机\",\"属性名\":\"允许上网终端类型\"},{\"属性值\":\"学生\",\"属性名\":\"用户类别\"},{},{\"属性值\":\"广州康大教育园\",\"属性名\":\"学校名称\"},{\"属性值\":\"1804050432\",\"属性名\":\"学生证号\"},{\"属性值\":\"校园天翼宽带用户\",\"属性名\":\"用户类型\"},{\"属性值\":\"包月30元\",\"属性名\":\"月租类型\"},{\"属性值\":\"普通\",\"属性名\":\"计费属性\"},{\"属性值\":\"13727264296@SCNUZC.GZ\",\"属性名\":\"多媒体账号\"},{\"属性值\":\"a12345678\",\"属性名\":\"多媒体账号密码\"},{\"属性值\":\"1\",\"属性名\":\"最大在线数\"},{\"属性值\":\"否\",\"属性名\":\"一人一号多终端\"},{\"属性值\":\"否\",\"属性名\":\"是否FTTH+HUB\"},{\"属性值\":\"(FTTB)光缆大楼\",\"属性名\":\"外线方式\"},{\"属性值\":\"首月按天收费\",\"属性名\":\"宽带首月费用类型\"}],\"业务类型\":\"单宽业务\",\"宽带装机\":{\"装机详细地址\":\"广州市黄埔区九龙镇九龙大道206号206号广州商学院思政楼1楼机房\",\"省\":\"广东省\",\"市\":\"广州市\",\"区\":\"黄埔区\",\"装机地址ID\":\"441020000000001023017324\"},\"月租费用项\":{\"费用项列表\":[{\"费用项名称\":\"校园宽带300元\",\"费用项金额\":\"300.0000\",\"费用项类型\":\"月租\"}]},\"缴费方式\":\"现金支付\"}}}";
// 获得md5串 // 获得md5串
String sign = MD5Util.MD5Encode(order_dataJSON, "Utf-8"); String sign = MD5Util.MD5Encode(order_dataJSON, "Utf-8");
// 获得小写md5串 // 获得小写md5串
...@@ -594,7 +643,7 @@ public class IntelligenceSendOrders { ...@@ -594,7 +643,7 @@ public class IntelligenceSendOrders {
.header("X-Sign", sign) .header("X-Sign", sign)
.body(order_dataJSON) .body(order_dataJSON)
.asString(); .asString();
log.info("单宽带下单接口，返回信息:" + responese.getBody()); log.info("单宽带下单接口，返回信息:" + responese);
} catch (ResourceAccessException e) { } catch (ResourceAccessException e) {
count++; count++;
if (count < 20) { if (count < 20) {
...@@ -735,17 +784,18 @@ public class IntelligenceSendOrders { ...@@ -735,17 +784,18 @@ public class IntelligenceSendOrders {
return schoolMap; return schoolMap;
} }
/*
* 融合下单公共方法 /**
* 公共方法
* *
* @param order hhr_order 表的map数据 * @param order hhr_order 表的map数据
* @param rightNowSend 是否马上下单，是则无视融合时间，不是则判断融合时间是否当天 * @param rightNowSend 是否马上下单，是则无视融合时间，不是则判断融合时间是否当天
* @throws Exception
*/ */
public void integrateSendOrder(Map<String, Object> orderMap, boolean rightNowSend) throws Exception {
public void integrateSendOrder(Order order, boolean rightNowSend) throws Exception { if (orderMap.isEmpty()) {
Map<String, Object> orderMap = JSONObject.parseObject(JSONObject.toJSONString(order)); log.info("数据为空！");
if (order == null) {
log.info("融合下单数据为空！");
return; return;
} }
if (!rightNowSend) { if (!rightNowSend) {
...@@ -759,21 +809,21 @@ public class IntelligenceSendOrders { ...@@ -759,21 +809,21 @@ public class IntelligenceSendOrders {
calendar.set(Calendar.MILLISECOND, 0); calendar.set(Calendar.MILLISECOND, 0);
Date today = calendar.getTime(); Date today = calendar.getTime();
calendar.add(Calendar.DATE, 1); calendar.add(Calendar.DATE, 1);
if (order.getRhTime() == null) { if (orderMap.get("rh_time") == null) {
log.info("当前订单无融合时间，无法进行下单：" + JSONObject.toJSONString(order)); log.info("当前订单无融合时间，无法进行下单：" + orderMap.toString());
return; return;
} }
try { try {
rhTime = order.getRhTime(); rhTime = (Date) orderMap.get("rh_time");
} catch (Exception e) { } catch (Exception e) {
log.error("融合日期转换错误" + JSONObject.toJSONString(order)); log.error("融合日期转换错误" + orderMap.toString());
return; return;
} }
// 融合时间小于当前时间 // 融合时间小于当前时间
if (today.getTime() > rhTime.getTime()) { if (today.getTime() > rhTime.getTime()) {
log.info("融合日期小于当前日期，改为待受理状态" + JSONObject.toJSONString(order)); log.info("融合日期小于当前日期，改为待受理状态" + orderMap.toString());
Wrapper<Order> wrapper = new EntityWrapper<>(); Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("id", order.getId()); wrapper.eq("id", orderMap.get("id"));
Order updateOrder = new Order(); Order updateOrder = new Order();
updateOrder.setUpdateTime(new Date()); updateOrder.setUpdateTime(new Date());
updateOrder.setOrderStatus("待受理"); updateOrder.setOrderStatus("待受理");
...@@ -782,21 +832,21 @@ public class IntelligenceSendOrders { ...@@ -782,21 +832,21 @@ public class IntelligenceSendOrders {
} }
// 融合时间大于等于 当前时间的第二天的0点 // 融合时间大于等于 当前时间的第二天的0点
if (rhTime.getTime() >= calendar.getTime().getTime()) { if (rhTime.getTime() >= calendar.getTime().getTime()) {
log.info("融合日期超过当前时间，不下单：" + JSONObject.toJSONString(order)); log.info("融合日期超过当前时间，不下单：" + orderMap.toString());
return; return;
} }
} }
String ORDERSEQ = (String) orderMap.get("kdOrderId"); String ORDERSEQ = (String) orderMap.get("kdOrderId");
Wrapper<OrderView> orderViewWrapper = new EntityWrapper<>(); Wrapper<OrderView> orderViewWrapper = new EntityWrapper<>();
orderViewWrapper.eq("orderSeq", order.getKdOrderId()); orderViewWrapper.eq("orderSeq", orderMap.get("kd_order_id"));
List<Map<String, Object>> orderViewMaps = orderViewMapper.selectMaps(orderViewWrapper); List<Map<String, Object>> orderViewMaps = orderViewMapper.selectMaps(orderViewWrapper);
Map<String, Object> orderViewMap = null; Map<String, Object> orderViewMap = null;
if (orderViewMaps != null && orderViewMaps.size() > 0) { if (orderViewMaps != null && orderViewMaps.size() > 0) {
orderViewMap = orderViewMaps.get(0); orderViewMap = orderViewMaps.get(0);
} }
if (orderViewMap == null) { if (orderViewMap == null) {
log.info("错误记录：" + JSONObject.toJSONString(order)); log.info("错误记录：" + orderMap.toString());
log.info("订单号：" + ORDERSEQ + "，在order_view表中无记录，无法进行智能平台下单"); log.info("订单号：" + ORDERSEQ + "，在order_view表中无记录，无法进行智能平台下单");
return; return;
} }
...@@ -816,136 +866,90 @@ public class IntelligenceSendOrders { ...@@ -816,136 +866,90 @@ public class IntelligenceSendOrders {
schoolMap = setPriceIndex(schoolMap, orderMap, ORDERAMOUNT); schoolMap = setPriceIndex(schoolMap, orderMap, ORDERAMOUNT);
if (order.getUserType().toString().equals("3")) { kong.unirest.HttpResponse<String> submitOrderJsonObject = null;
if (orderMap.get("user_type").equals("3")) {
String productName = "校园融合套餐"; String productName = "校园融合套餐";
// 3、提交订单到智能平台 // 3、提交订单到智能平台
kong.unirest.HttpResponse<String> submitOrderJsonObject = submitOrderJsonObject = getOrderInfo(
getOrderInfo( schoolMap, //宽带订单对应的学校信息
schoolMap, //宽带订单对应的学校信息 orderViewMap, //宽带订单信息
orderViewMap, //宽带订单信息 currentTimeStr, //当前时间
currentTimeStr, //当前时间 productName, //产品名称
productName, //产品名称 ORDERSEQ, //kd_order_id 宽带ID
ORDERSEQ, //kd_order_id 宽带ID UPTRANSEQ, //支付平台流水号
UPTRANSEQ, //支付平台流水号 ORDERAMOUNT, //产品价格
ORDERAMOUNT, //产品价格 ORDERREQTRANSEQ, //穗易付订单号
ORDERREQTRANSEQ, //穗易付订单号 3, //下单类型(3：融合业务；5：单宽业务；10：单宽进融)
3, //下单类型(3：融合业务；5：单宽业务；10：单宽进融) 0);
0); } else if (orderMap.get("UserType").equals("10")) {
log.info(
"----------调用单宽带接口（提交订单至智能平台）并返回参数信息---status:"
+ submitOrderJsonObject.getStatus()
+ " msg:"
+ submitOrderJsonObject.getParsingError()
+ " orderNum:"
+ submitOrderJsonObject.getBody());
String orderNum = submitOrderJsonObject.getBody();
JSONObject queryOrderInfo = null;
if (StringUtils.isNotBlank(orderNum)) {
queryOrderInfo = getQueryOrderInfo(orderNum, 0);
if (StringUtils.isEmpty(String.valueOf(queryOrderInfo))) {
return;
}
log.info("----------调用查询智能订单接口并返回参数信息:" + queryOrderInfo);
//5、更新数据库
String state = queryOrderInfo.getString("state");
Wrapper<Order> orderWrapper = new EntityWrapper<>();
orderWrapper.eq("kd_order_id", orderMap.get("orderSeq").toString());
Order updateOrder = new Order();
updateOrder.setOrderId(orderNum);
updateOrder.setOrderStatus("审核中");
orderMapper.update(updateOrder, orderWrapper);
if (StringUtils.isNotBlank(state)) {
log.info("支付成功后更新订单状态");
OrderView updateOrderView = new OrderView();
updateOrderView.setStatus(QueOrderNum(state));
updateOrderView.setOrderseqThd(orderNum);
Wrapper<OrderView> wrapperOrderView = new EntityWrapper<>();
wrapperOrderView.eq("orderSeq", orderMap.get("orderSeq").toString());
orderViewMapper.update(updateOrderView, wrapperOrderView);
} else {
log.info("----------将智能订单状态更新至数据库error：" + state);
}
} else {
/*String msg = (String) body.get("msg");
if (StringUtils.isNotBlank(msg) && !msg.equals("订单来源单号已存在，请勿重复下单")) {
Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("id", order.getId());
Order updateOrder = new Order();
updateOrder.setOrderStatus("异常单");
updateOrder.setMsg(msg);
orderMapper.update(updateOrder, wrapper);
}*/
}
} else if (order.getUserType().toString().equals("10")) {
String productName = "校园融合宽带提速包"; String productName = "校园融合宽带提速包";
// 3、提交订单到智能平台 // 3、提交订单到智能平台
kong.unirest.HttpResponse<String> submitOrderJsonObject = submitOrderJsonObject = getOrderInfo(
getOrderInfo( schoolMap, //宽带订单对应的学校信息
schoolMap, //宽带订单对应的学校信息 orderViewMap, //宽带订单信息
orderViewMap, //宽带订单信息 currentTimeStr, //当前时间
currentTimeStr, //当前时间 productName, //产品名称
productName, //产品名称 ORDERSEQ, //kd_order_id 宽带ID
ORDERSEQ, //kd_order_id 宽带ID UPTRANSEQ, //支付平台流水号
UPTRANSEQ, //支付平台流水号 ORDERAMOUNT, //产品价格
ORDERAMOUNT, //产品价格 ORDERREQTRANSEQ, //穗易付订单号
ORDERREQTRANSEQ, //穗易付订单号 10, //下单类型(3：融合业务；5：单宽业务；10：单宽进融)
10, //下单类型(3：融合业务；5：单宽业务；10：单宽进融) 0);
0); }
log.info( log.info(
"----------调用单宽带接口（提交订单至智能平台）并返回参数信息---status:" "----------调用单宽带接口（提交订单至智能平台）并返回参数信息---status:"
+ submitOrderJsonObject.getStatus() + submitOrderJsonObject.getStatus()
+ " msg:" + " msg:"
+ submitOrderJsonObject.getParsingError() + submitOrderJsonObject.getParsingError()
+ " orderNum:" + " orderNum:"
+ submitOrderJsonObject.getBody()); + submitOrderJsonObject.getBody());
String orderNum = submitOrderJsonObject.getBody(); String orderNum = submitOrderJsonObject.getBody();
JSONObject queryOrderInfo = getQueryOrderInfo(orderNum, 0);
JSONObject queryOrderInfo = null; Map<String, Object> map = JSONObject.parseObject(queryOrderInfo.getString("data"));
if (StringUtils.isNotBlank(orderNum)) { List<Object> list = (List<Object>) map.get("q");
queryOrderInfo = getQueryOrderInfo(orderNum, 0); Map<String, Object> q = (Map<String, Object>) list.get(0);
if (StringUtils.isEmpty(String.valueOf(queryOrderInfo))) { Map<String, Object> orderStatus = (Map<String, Object>) q.get("订单当前状态");
return; if (!orderStatus.containsKey("订单当前状态|状态备注")) {
} //5、更新数据库
Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("id", orderMap.get("id"));
Order updateOrder = new Order();
updateOrder.setOrderStatus("审核中");
updateOrder.setOrderId(orderNum);
orderMapper.update(updateOrder, wrapper);
OrderView updateOrderView = new OrderView();
String state = String.valueOf(orderStatus.get("订单状态ID"));
updateOrderView.setStatus(QueOrderNum(state));
updateOrderView.setOrderseqThd(orderNum);
Wrapper<OrderView> wrapperOrderView = new EntityWrapper<>();
wrapperOrderView.eq("orderSeq", orderMap.get("kd_order_id").toString());
orderViewMapper.update(updateOrderView, wrapperOrderView);
OrderHistory orderHistory = new OrderHistory();
orderHistory.setOrderId(String.valueOf(orderMap.get("id")));
orderHistory.setCreateDate(new Date());
orderHistory.setStatus("智能平台下单成功" + orderNum);
orderHistoryMapper.insert(orderHistory);
} else {
String msg = (String) orderStatus.get("订单当前状态|状态备注");
//5、更新数据库 Wrapper<Order> wrapper = new EntityWrapper<>();
Wrapper<Order> wrapper = new EntityWrapper<>(); wrapper.eq("id", orderMap.get("id"));
wrapper.eq("id", order.getId()); Order updateOrder = new Order();
Order updateOrder = new Order(); updateOrder.setOrderStatus("异常单");
updateOrder.setOrderStatus("审核中"); updateOrder.setMsg(msg);
updateOrder.setOrderId(orderNum); orderMapper.update(updateOrder, wrapper);
orderMapper.update(updateOrder, wrapper);
OrderHistory orderHistory = new OrderHistory();
orderHistory.setOrderId(String.valueOf(orderMap.get("id")));
orderHistory.setCreateDate(new Date());
orderHistory.setStatus("智能平台下单失败" + orderNum);
orderHistoryMapper.insert(orderHistory);
OrderHistory orderHistory = new OrderHistory();
orderHistory.setOrderId(order.getId());
orderHistory.setCreateDate(new Date());
orderHistory.setStatus("智能平台下单成功" + orderNum);
orderHistoryMapper.insert(orderHistory);
} else {
//String msg = (String) body.get("msg");
/*if (StringUtils.isNotBlank(msg) && !msg.equals("订单来源单号已存在，请勿重复下单")) {
Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("id", order.getId());
Order updateOrder = new Order();
updateOrder.setOrderStatus("异常单");
updateOrder.setMsg(msg);
orderMapper.update(updateOrder, wrapper);
}*/
OrderHistory orderHistory = new OrderHistory();
orderHistory.setOrderId(order.getId());
orderHistory.setCreateDate(new Date());
orderHistory.setStatus("智能平台下单失败" + orderNum);
orderHistoryMapper.insert(orderHistory);
}
} }
} }
...@@ -1004,6 +1008,9 @@ public class IntelligenceSendOrders { ...@@ -1004,6 +1008,9 @@ public class IntelligenceSendOrders {
List<Object> list = (List<Object>) map.get("q"); List<Object> list = (List<Object>) map.get("q");
Map<String, Object> map2 = (Map<String, Object>) list.get(0); Map<String, Object> map2 = (Map<String, Object>) list.get(0);
Map<String, Object> orderStatus = (Map<String, Object>) map2.get("订单当前状态"); Map<String, Object> orderStatus = (Map<String, Object>) map2.get("订单当前状态");
if (!map2.isEmpty()) {
return responese.getBody();
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
...@@ -1011,17 +1018,17 @@ public class IntelligenceSendOrders { ...@@ -1011,17 +1018,17 @@ public class IntelligenceSendOrders {
} }
private String QueOrderNum(String orderNum) { private String QueOrderNum(String orderNum) {
if (orderNum.equals("12")) { if (orderNum.equals("3") || orderNum.equals("4")) {
return "1"; // 待提交 return "1"; // 待提交
} else if (orderNum.equals("11")) { } else if (orderNum.equals("0")) {
return "4"; // 归档 return "4"; // 归档
} else if (orderNum.equals("13") || orderNum.equals("18")) { } else if (orderNum.equals("1")) {
return "5"; // 作废(作废、分销商作废) return "5"; // 作废(作废)
} else if (orderNum.equals("9")) { } else if (orderNum.equals("13")) {
return "3"; // 受理成功【待收费】 return "3"; // 受理成功【待人工过收费】
} else if (orderNum.equals("10")) { } else if (orderNum.equals("27")) {
return "9"; // 已收费【待竣工】 return "9"; // 受理成功待竣工
} else if (orderNum.equals("14")) { } else if (orderNum.equals("2")) {
return "10"; // 受理异常 return "10"; // 受理异常
} else { } else {
return "2"; // 待受理(未受理、未受理【待跟进】、待疑难支撑审核、待分局审核、待分销商审核) return "2"; // 待受理(未受理、未受理【待跟进】、待疑难支撑审核、待分局审核、待分销商审核)
......
core-service/src/main/resources/application-local.yml
...@@ -95,12 +95,15 @@ spring: ...@@ -95,12 +95,15 @@ spring:
prohibition: 600 prohibition: 600
datasource: datasource:
# 由于父框架的问题，这里本来不应该这样写的 # 由于父框架的问题，这里本来不应该这样写的
url: jdbc:mysql://172.18.101.171:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true #url: jdbc:mysql://172.18.101.171:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
username: yzzx url: jdbc:mysql://localhost:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
password: yzzx123!@# #username: yzzx
username: root
#password: yzzx123!@#
password: root
db-name: guns #用来搜集数据库的所有表 db-name: guns #用来搜集数据库的所有表
filters: wall,mergeStat filters: wall,mergeStat
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
max-active: 20 max-active: 20
dynamic: dynamic:
primary: master primary: master
......
core-service/src/test/java/com/winsun/user/UserTestHelper.java
...@@ -2,7 +2,6 @@ package com.winsun.user; ...@@ -2,7 +2,6 @@ package com.winsun.user;
import com.winsun.base.AppApplicationBaseIT; import com.winsun.base.AppApplicationBaseIT;
import com.winsun.item.modular.system.dao.UserMapper; import com.winsun.item.modular.system.dao.UserMapper;
import com.winsun.outSideSystem.IntelligenceSendOrder;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -18,8 +17,8 @@ public class UserTestHelper extends AppApplicationBaseIT { ...@@ -18,8 +17,8 @@ public class UserTestHelper extends AppApplicationBaseIT {
@Autowired @Autowired
private UserMapper mapper; private UserMapper mapper;
@Autowired /*@Autowired
private IntelligenceSendOrder intelligenceSendOrder; private IntelligenceSendOrder intelligenceSendOrder;*/
@Test @Test
public void decryptPwd() { public void decryptPwd() {
// final String account = "18028801118"; // final String account = "18028801118";
......
gateway/src/main/resources/application-local.yml
...@@ -34,6 +34,14 @@ spring: ...@@ -34,6 +34,14 @@ spring:
password: yzzx123!@# password: yzzx123!@#
# username: ENC(z8WG0Zar99IzLr3L9Z3mOw==) # username: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
# password: ENC(r4U47DSf9LNRyoH/G6GxfA2w1JTZOwr7MREDyGA0PWM=) # password: ENC(r4U47DSf9LNRyoH/G6GxfA2w1JTZOwr7MREDyGA0PWM=)
# druid:
# stat-view-servlet:
# enabled: false
# web-stat-filter:
# enabled: false
# filter:
# config:
# enabled: false
zuul: zuul:
ribbon: ribbon:
eager-load: eager-load:
......
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
...@@ -406,6 +406,10 @@ public class PackageNewClothes { ...@@ -406,6 +406,10 @@ public class PackageNewClothes {
return ResponseData.error("您的身份证输入有误，请重新输入！"); return ResponseData.error("您的身份证输入有误，请重新输入！");
} }
if (StringUtils.isBlank(cardAddress)) {
return ResponseData.error("身份证地址不能为空");
}
/** /**
* 详细地址验证 * 详细地址验证
*/ */
......
new-user/src/main/resources/application-local.yml
...@@ -123,6 +123,11 @@ spring: ...@@ -123,6 +123,11 @@ spring:
exprie: 600 exprie: 600
prohibition: 600 prohibition: 600
datasource: datasource:
druid:
WebStatFilter:
enabled: false
StatViewServlet:
enabled: false
dynamic: dynamic:
primary: master primary: master
p6spy: true p6spy: true
...@@ -131,9 +136,12 @@ spring: ...@@ -131,9 +136,12 @@ spring:
max-active: 30 max-active: 30
datasource: datasource:
master: master:
url: jdbc:mysql://172.18.101.171:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true #url: jdbc:mysql://172.18.101.171:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
username: yzzx url: jdbc:mysql://localhost:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
password: yzzx123!@# #username: yzzx
username: root
#password: yzzx123!@#
password: root
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
devtools: devtools:
restart: restart:
......
old-user/src/main/resources/application-local.yml
...@@ -120,6 +120,11 @@ spring: ...@@ -120,6 +120,11 @@ spring:
exprie: 600 exprie: 600
prohibition: 600 prohibition: 600
datasource: datasource:
druid:
WebStatFilter:
enabled: false
StatViewServlet:
enabled: false
dynamic: dynamic:
primary: master primary: master
p6spy: true p6spy: true
...@@ -128,9 +133,12 @@ spring: ...@@ -128,9 +133,12 @@ spring:
max-active: 30 max-active: 30
datasource: datasource:
master: master:
url: jdbc:mysql://172.18.101.171:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true #url: jdbc:mysql://172.18.101.171:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
username: yzzx url: jdbc:mysql://localhost:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
password: yzzx123!@# #username: yzzx
username: root
#password: yzzx123!@#
password: root
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
devtools: devtools:
restart: restart:
......
service-manager/src/main/java/com/winsun/controller/ImgController.java
...@@ -27,7 +27,7 @@ public class ImgController { ...@@ -27,7 +27,7 @@ public class ImgController {
request.getServletPath(); request.getServletPath();
String imgurl= FilePath.BACKGROUNDIMG.getValue()+"/"+request.getServletPath(); String imgurl= FilePath.BACKGROUNDIMG.getValue()+"/"+request.getServletPath();
imgurl = imgurl.replace("//", "/"); imgurl = imgurl.replace("//", "/");
File file = new File(imgurl); File file = new File(imgurl);
FileInputStream inputStream = null; FileInputStream inputStream = null;
try { try {
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
...@@ -27,6 +27,7 @@ import com.winsun.smsUtils.SendSmsAndMail; ...@@ -27,6 +27,7 @@ import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.Constant; import com.winsun.utils.Constant;
import com.winsun.utils.*; import com.winsun.utils.*;
import com.winsun.utils.ExportExcel; import com.winsun.utils.ExportExcel;
import kong.unirest.Unirest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
...@@ -56,6 +57,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -56,6 +57,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.ResourceAccessException; import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import sun.misc.BASE64Encoder;
import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.SSLHandshakeException;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
...@@ -83,6 +85,15 @@ public class OrderController extends BaseController { ...@@ -83,6 +85,15 @@ public class OrderController extends BaseController {
private final String GATEWAY = "http://localhost:10001/"; private final String GATEWAY = "http://localhost:10001/";
final String publicKey =
"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAok8DnvM2OBwtzNoJb4nA" +
"jn4lgCkSxLyRw5lLiUfsi+40h00CGAC1arvbinTTbtrSnm4YDYlaJwveiOeDKdk0" +
"f2Yglb/8loEbNTqb1OqNxUeM1wYLRBXvAkkZ5fZllajWzFMkoNU/JQ4+T8sMATxm" +
"1d1XRcgM6zlgVwX6siDoLZ5Dm23CTS7SXhyMLtS9cgLefHcOckPQyXoB/IJqb0K1" +
"P0Sk0PE1OSRzpsI9JVzhsSW164fwYpxEbygj9O9JAmAszixwItt2j5zLJ6zRnK3R" +
"OrcAVMN/vpXTN2dCLGZXQrsTK9sAWASzIWTiQRzmnwxsQY7y4u2h+k41n8Z5tw03" +
"wwIDAQAB";
/** /**
* 导入 * 导入
*/ */
...@@ -319,6 +330,7 @@ public class OrderController extends BaseController { ...@@ -319,6 +330,7 @@ public class OrderController extends BaseController {
result = sendOrder(map1); result = sendOrder(map1);
JSONObject resultDataJson = JSONObject.fromObject(result); JSONObject resultDataJson = JSONObject.fromObject(result);
//String orderNum = resultDataJson.getString("orderNum");
String orderNum = resultDataJson.getString("orderNumber"); String orderNum = resultDataJson.getString("orderNumber");
Order updateOrder = new Order(); Order updateOrder = new Order();
updateOrder.setId(order.getId()); updateOrder.setId(order.getId());
...@@ -1774,7 +1786,7 @@ public class OrderController extends BaseController { ...@@ -1774,7 +1786,7 @@ public class OrderController extends BaseController {
result = sendOrder(map1); result = sendOrder(map1);
JSONObject resultDataJson = JSONObject.fromObject(result); JSONObject resultDataJson = JSONObject.fromObject(result);
String orderNum = resultDataJson.getString("orderNumber"); String orderNum = resultDataJson.getString("orderNum");
Order order = new Order(); Order order = new Order();
order.setId(id); order.setId(id);
order.setUpdateTime(new Date()); order.setUpdateTime(new Date());
...@@ -2204,7 +2216,7 @@ public class OrderController extends BaseController { ...@@ -2204,7 +2216,7 @@ public class OrderController extends BaseController {
map.put("imgUrl3", (String) map.get("idCardUrl3")); map.put("imgUrl3", (String) map.get("idCardUrl3"));
map.put("imgUrl4", (String) map.get("idCardUrl4")); map.put("imgUrl4", (String) map.get("idCardUrl4"));
str = sendAitransOrder(map, 0); str = sendAitransOrder(map, 0);
//ResponseEntity<String> response = sendAitransOrder2(map, 0); //kong.unirest.HttpResponse<String> response = sendAitransOrder2(map, 0);
//str = response.getBody(); //str = response.getBody();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -2213,8 +2225,14 @@ public class OrderController extends BaseController { ...@@ -2213,8 +2225,14 @@ public class OrderController extends BaseController {
return str; return str;
} }
/**
* @param map
* @param count
* @return
* @throws Exception
*/
// 保存卡品认证信息 // 保存卡品认证信息
public ResponseEntity<String> sendAitransOrder2(Map<String, Object> map, int count) throws NoSuchAlgorithmException, UnsupportedEncodingException { public kong.unirest.HttpResponse<String> sendAitransOrder2(Map<String, Object> map, int count) throws Exception {
log.info("移动下单前已有参数：" + JSONObject.fromObject(map).toString()); log.info("移动下单前已有参数：" + JSONObject.fromObject(map).toString());
Map<String, String> return_data = new HashMap<>(); Map<String, String> return_data = new HashMap<>();
return_data.put("code", ""); return_data.put("code", "");
...@@ -2234,6 +2252,10 @@ public class OrderController extends BaseController { ...@@ -2234,6 +2252,10 @@ public class OrderController extends BaseController {
attachment.put("身份证照4", map.get("imgUrl4")); attachment.put("身份证照4", map.get("imgUrl4"));
order_data.put("附件", attachment); order_data.put("附件", attachment);
order_data.put("代理商账号", "hyoujian");
order_data.put("使用人姓名", "黄友健");
order_data.put("使用人证件号", "440802199006080830");
Map<String, Object> customerInformation = new HashMap<>(); //客户信息 Map<String, Object> customerInformation = new HashMap<>(); //客户信息
customerInformation.put("联系人", (String) map.get("userName")); customerInformation.put("联系人", (String) map.get("userName"));
customerInformation.put("客户证件号码", (String) map.get("idCard")); customerInformation.put("客户证件号码", (String) map.get("idCard"));
...@@ -2259,7 +2281,7 @@ public class OrderController extends BaseController { ...@@ -2259,7 +2281,7 @@ public class OrderController extends BaseController {
invoiceInformation.put("电子邮箱", ""); //若发票投递方式为不需要，可以不填值，但必须有参数 invoiceInformation.put("电子邮箱", ""); //若发票投递方式为不需要，可以不填值，但必须有参数
order_data.put("发票信息", invoiceInformation); order_data.put("发票信息", invoiceInformation);
order_data.put("接口下单账号", "xyzx"); //接口下单账号 order_data.put("接口下单账号", "xiaoyuan"); //接口下单账号
HashMap<String, Object> orderingProducts = new HashMap<>(); //订购产品 HashMap<String, Object> orderingProducts = new HashMap<>(); //订购产品
orderingProducts.put("产品SKU", ""); orderingProducts.put("产品SKU", "");
...@@ -2308,28 +2330,32 @@ public class OrderController extends BaseController { ...@@ -2308,28 +2330,32 @@ public class OrderController extends BaseController {
String order_dataJSON = com.alibaba.fastjson.JSONObject.toJSONString(order_data); String order_dataJSON = com.alibaba.fastjson.JSONObject.toJSONString(order_data);
ResponseEntity<String> responese = null; // 获得md5串
String sign = MD5Util.MD5Encode(order_dataJSON, "Utf-8");
// 获得小写md5串
sign = sign.toLowerCase();
// RSA加密
byte[] encodedData = RSAUtils.encryptByPublicKey(sign, publicKey);
sign = (new BASE64Encoder()).encodeBuffer(encodedData);
//去除换行
sign = sign.replaceAll("\\r|\\n", "");
log.info("移动下单接口中的携带的签名：" + sign);
kong.unirest.HttpResponse<String> responese = null;
try { try {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
headers.add("Content-Type", "application/json;charset=utf-8");
//签名
/*
headers.add("Hmac", znptSignUtils.macSHA1(order_dataJSON));*/
org.springframework.http.HttpEntity<Object> httpEntity = new org.springframework.http.HttpEntity<>(order_dataJSON, headers);
RestTemplate restTemplate = new RestTemplate();
restTemplate.setMessageConverters(Collections.singletonList(new StringHttpMessageConverter(Charset.forName("UTF-8"))));
log.info("提交参数:" + order_dataJSON); log.info("提交参数:" + order_dataJSON);
com.winsun.constant.Constant.trustEveryone(); com.winsun.constant.Constant.trustEveryone();
responese = restTemplate.postForEntity("http://localhost:11092/ciop/testPost"/*"https://faas.mini189.cn/function/id-generator-snowflake"+".dev-fn"*/, httpEntity, String.class); responese = Unirest.post("https://applet.mini189.cn/dev/generate")
.header("Content-Type", "application/json;charset=UTF-8")
.header("X-Sign", sign)
.asString();
log.info("移动下单接口，返回信息:" + responese); log.info("移动下单接口，返回信息:" + responese);
System.out.println(responese);
} catch (ResourceAccessException e) { } catch (ResourceAccessException e) {
count++; count++;
if (count < 20) { if (count < 20) {
responese = sendAitransOrder2(map, count); responese = sendAitransOrder2(map, count);
} else { } else {
log.error("单宽带(预付费、移动、融合、续约、增值)下单接口异常尝试20次失误。请检查接口"); log.error("移动(预付费、移动、融合、续约、增值)下单接口异常尝试20次失误。请检查接口");
} }
} catch (Exception e) { } catch (Exception e) {
log.error("[HTTP] [CREATE_ORDER] 预付费下单接口异常"); log.error("[HTTP] [CREATE_ORDER] 预付费下单接口异常");
......
service-manager/src/main/resources/application-local.yml
...@@ -120,9 +120,17 @@ spring: ...@@ -120,9 +120,17 @@ spring:
exprie: 600 exprie: 600
prohibition: 600 prohibition: 600
datasource: datasource:
url: jdbc:mysql://172.18.101.171:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true #url: jdbc:mysql://172.18.101.171:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
username: yzzx url: jdbc:mysql://localhost:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
password: yzzx123!@# #username: yzzx
username: root
#password: yzzx123!@#
password: root
druid:
WebStatFilter:
enabled: false
StatViewServlet:
enabled: false
dynamic: dynamic:
primary: master primary: master
p6spy: true p6spy: true
......
task/src/main/java/com/winsun/TimingTask/OrderTask.java
...@@ -5,10 +5,9 @@ import com.alibaba.fastjson.JSONObject; ...@@ -5,10 +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.auth.core.shiro.ShiroUser;
import com.winsun.bean.*; import com.winsun.bean.*;
import com.winsun.mapper.*; import com.winsun.mapper.*;
import com.winsun.outSideSystem.IntelligenceSendOrder; import com.winsun.outSideSystem.IntelligenceSendOrders;
import com.winsun.service.ISalesListService; import com.winsun.service.ISalesListService;
import com.winsun.smsUtils.SendSmsAndMail; import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.MyBatisPlusUpdateUtils; import com.winsun.utils.MyBatisPlusUpdateUtils;
...@@ -19,12 +18,14 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -19,12 +18,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.text.ParseException; import java.text.ParseException;
import java.util.*; import java.util.*;
/**
*
*/
@Slf4j @Slf4j
@RestController @RestController
@Configuration @Configuration
...@@ -32,8 +33,10 @@ import java.util.*; ...@@ -32,8 +33,10 @@ import java.util.*;
public class OrderTask { public class OrderTask {
private static OrderMapper orderMapper; private static OrderMapper orderMapper;
/*@Autowired
private IntelligenceSendOrder intelligenceSendOrder;*/
@Autowired @Autowired
private IntelligenceSendOrder intelligenceSendOrder; private IntelligenceSendOrders intelligenceSendOrders;
@Autowired @Autowired
private OrderHistoryMapper orderHistoryMapper; private OrderHistoryMapper orderHistoryMapper;
...@@ -52,6 +55,7 @@ public class OrderTask { ...@@ -52,6 +55,7 @@ public class OrderTask {
@Autowired @Autowired
private ISalesListService salesListService; private ISalesListService salesListService;
@Autowired @Autowired
public OrderTask(OrderMapper orderMapper) { public OrderTask(OrderMapper orderMapper) {
OrderTask.orderMapper = orderMapper; OrderTask.orderMapper = orderMapper;
...@@ -61,10 +65,12 @@ public class OrderTask { ...@@ -61,10 +65,12 @@ public class OrderTask {
private RhPhoneMapper rhPhoneMapper; private RhPhoneMapper rhPhoneMapper;
private static Set<String> schoolSet = new HashSet<>(); private static Set<String> schoolSet = new HashSet<>();
{ {
schoolSet.add("星海音乐学院"); schoolSet.add("星海音乐学院");
schoolSet.add("广州美术学院"); schoolSet.add("广州美术学院");
} }
/** /**
* 定时器更新已送货订单 * 定时器更新已送货订单
*/ */
...@@ -79,7 +85,60 @@ public class OrderTask { ...@@ -79,7 +85,60 @@ public class OrderTask {
* 更新移动卡的状态 * 更新移动卡的状态
*/ */
@Scheduled(cron = "0 0/4 * * * ?") @Scheduled(cron = "0 0/4 * * * ?")
public void updateMobileCardStatus() { public void updateMobileCardStatus() throws Exception {
log.info("更新预制卡状态开始");
// 有卡品id，并且未审核中的状态
Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("order_status", "审核中");
wrapper.isNull("kd_order_id");
List<Order> orders = orderMapper.selectList(wrapper);
// 循环请求获取数据
for (Order order : orders) {
if (StringUtils.isNotBlank(order.getOrderId())) {
String body = intelligenceSendOrders.queryStatus(order.getOrderId());
if (StringUtils.isNotBlank(body)) {
Order update = new Order();
update.setId(order.getId());
update.setUpdateTime(new Date());
JSONObject json = JSONObject.parseObject(body);
Map<String, Object> map = JSONObject.parseObject(json.getString("data"));
List<Object> list = (List<Object>) map.get("q");
Map<String, Object> map2 = (Map<String, Object>) list.get(0);
Map<String, Object> orderStatus = (Map<String, Object>) map2.get("订单当前状态");
OrderHistory orderHistory = new OrderHistory();
orderHistory.setOrderId(order.getId());
orderHistory.setCreateDate(new Date());
orderHistory.setStatus("智能平台状态获取:" + orderStatus.get("订单状态名称").toString());
// 未获取到需要的状态不做更新
if ("物流待配送".equals(orderStatus.get("订单状态名称")) || "物流配送中".equals(orderStatus.get("订单状态名称"))
|| "配送成功【待收费】".equals(orderStatus.get("订单状态名称")) || "归档".equals(orderStatus.get("订单状态名称"))) {
orderHistory.setStatus("审核通过,等待配送");
orderHistoryMapper.insert(orderHistory);
update.setThStatus(orderStatus.get("订单状态名称").toString());
update.setOrderStatus("待配送");
update.setMsg(json.get("stateName").toString());
orderMapper.updateById(update);
} else if (orderStatus.get("订单状态名称").equals("待图片审核") || orderStatus.get("订单状态名称").equals("作废")) {
orderHistory.setStatus(orderStatus.get("订单状态名称") + ";" + orderStatus.get("stateName"));
orderHistoryMapper.insert(orderHistory);
update.setThStatus(json.get("stateName").toString());
update.setMsg(json.getString("stateName"));
update.setOrderStatus("异常单");
orderMapper.updateById(update);
}
}
}
}
log.info("更新预制卡状态完成");
}
/*public void updateMobileCardStatus() {
log.info("更新预制卡状态开始"); log.info("更新预制卡状态开始");
// 有卡品id，并且未审核中的状态 // 有卡品id，并且未审核中的状态
Wrapper<Order> wrapper = new EntityWrapper<>(); Wrapper<Order> wrapper = new EntityWrapper<>();
...@@ -126,13 +185,78 @@ public class OrderTask { ...@@ -126,13 +185,78 @@ public class OrderTask {
} }
} }
log.info("更新预制卡状态完成"); log.info("更新预制卡状态完成");
} }*/
/** /**
* 定时器更新智能平台状态 * 定时器更新智能平台状态
*/ */
@Scheduled(cron = "0 0/5 * * * ?") @Scheduled(cron = "0 0/5 * * * ?")
public void updateStatus() { public void updateStatus() throws Exception {
// 获取审核中的订单
Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("order_status", "审核中");
wrapper.isNotNull("kd_order_id");
wrapper.or();
wrapper.eq("order_status", "待配送");
wrapper.isNotNull("kd_order_id");
List<Order> orders = orderMapper.selectList(wrapper);
// 循环请求获取数据
for (Order order : orders) {
if (StringUtils.isNotBlank(order.getOrderId())) {
String boday = intelligenceSendOrders.queryStatus(order.getOrderId());
if (StringUtils.isNotBlank(boday)) {
Order update = new Order();
update.setId(order.getId());
update.setUpdateTime(new Date());
OrderHistory orderHistory = new OrderHistory();
orderHistory.setOrderId(order.getId());
orderHistory.setCreateDate(new Date());
orderHistory.setStatus("智能平台状态获取");
JSONObject json = JSONObject.parseObject(boday);
Map<String, Object> map = JSONObject.parseObject(json.getString("data"));
List<Object> list = (List<Object>) map.get("q");
Map<String, Object> map2 = (Map<String, Object>) list.get(0);
Map<String, Object> orderStatus = (Map<String, Object>) map2.get("订单当前状态");
// 未获取到需要的状态不做更新
if ("归档".equals(orderStatus.get("订单状态名称")) || "受理完成待竣工".equals(json.getString("orderStatus"))) {
orderHistory.setStatus("订单已完成");
orderHistoryMapper.insert(orderHistory);
update.setThStatus(orderStatus.get("订单状态名称").toString());
update.setOrderStatus("已完成");
orderMapper.updateById(update);
//查询该订单的学校名称
String schoolName = orderViewMapper.selectByKdOrderId(order.getKdOrderId());
if (schoolSet.contains(schoolName)) {
order.setNetNumber(order.getNetNumber().split("@")[0]);
}
// 下发短信
SendSmsAndMail.sendSms2(order.getContactNumber(),
order.getNetNumber(),
order.getNetPassword(), "12");
} else if ("作废".equals(orderStatus.get("订单状态名称")) || "下单异常".equals(orderStatus.get("订单状态名称"))) {
orderHistory.setStatus("订单异常请联系管理员");
orderHistoryMapper.insert(orderHistory);
update.setThStatus(json.get("orderStatus").toString());
update.setOrderStatus("异常单");
update.setMsg(json.get("stateName").toString());
orderMapper.updateById(update);
}
}
}
}
}
/*public void updateStatus() {
// 获取审核中的订单 // 获取审核中的订单
Wrapper<Order> wrapper = new EntityWrapper<>(); Wrapper<Order> wrapper = new EntityWrapper<>();
...@@ -192,7 +316,7 @@ public class OrderTask { ...@@ -192,7 +316,7 @@ public class OrderTask {
} }
} }
} }
} }*/
@Scheduled(cron = "0 0 * * * ? ") @Scheduled(cron = "0 0 * * * ? ")
//@Scheduled(cron = "0/5 * * * * ? ") //@Scheduled(cron = "0/5 * * * * ? ")
...@@ -207,28 +331,28 @@ public class OrderTask { ...@@ -207,28 +331,28 @@ public class OrderTask {
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId()); JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId());
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(); Wrapper<Order> wrapper1 = new EntityWrapper();
wrapper1.eq("xb_order_id",Map.get("orderCode")); wrapper1.eq("xb_order_id", Map.get("orderCode"));
wrapper1.eq("id",order.getId()); wrapper1.eq("id", order.getId());
if(Map.get("orderState").toString().equals("3") || Map.get("orderState").toString().equals("13") || if (Map.get("orderState").toString().equals("3") || Map.get("orderState").toString().equals("13") ||
Map.get("orderState").toString().equals("8") || Map.get("orderState").toString().equals("22") || Map.get("orderState").toString().equals("8") || Map.get("orderState").toString().equals("22") ||
Map.get("orderState").toString().equals("21") ){ Map.get("orderState").toString().equals("21")) {
dataMapping.put("order_status", "待处理"); dataMapping.put("order_status", "待处理");
if ("1".equals(order.getIsDelivery())){ if ("1".equals(order.getIsDelivery())) {
dataMapping.put("order_status","待活体"); dataMapping.put("order_status", "待活体");
} }
dataMapping.put("update_time", new Date()); dataMapping.put("update_time", new Date());
appMapper.inserOrderHis(order.getId(), "上传证件受理成功，等待督导处理:"+Map.get("orderState").toString(), new Date(), "定时器查询"); appMapper.inserOrderHis(order.getId(), "上传证件受理成功，等待督导处理:" + Map.get("orderState").toString(), new Date(), "定时器查询");
} }
if(Map.get("orderState").toString().equals("10") || Map.get("orderState").toString().equals("11")){ if (Map.get("orderState").toString().equals("10") || Map.get("orderState").toString().equals("11")) {
dataMapping.put("order_status", "异常单"); dataMapping.put("order_status", "异常单");
appMapper.inserOrderHis(order.getId(), "上传证件受理失败，已设为异常单"+Map.get("orderState").toString(), new Date(), "定时器查询"); appMapper.inserOrderHis(order.getId(), "上传证件受理失败，已设为异常单" + Map.get("orderState").toString(), new Date(), "定时器查询");
} }
orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1); orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
log.info(order.getXbOrderId()+"订单已更新"); log.info(order.getXbOrderId() + "订单已更新");
} catch (Exception e) { } catch (Exception e) {
log.error(order.getXbOrderId()+"订单更新失败",e.getMessage()); log.error(order.getXbOrderId() + "订单更新失败", e.getMessage());
} }
}); });
...@@ -239,12 +363,12 @@ public class OrderTask { ...@@ -239,12 +363,12 @@ public class OrderTask {
try { try {
JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId()); JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId());
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(); Wrapper<Order> wrapper1 = new EntityWrapper();
wrapper1.eq("xb_order_id",Map.get("orderCode")); wrapper1.eq("xb_order_id", Map.get("orderCode"));
wrapper1.eq("id",order.getId()); wrapper1.eq("id", order.getId());
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
if(Map.get("orderState").toString().equals("3") || Map.get("orderState").toString().equals("13")){ if (Map.get("orderState").toString().equals("3") || Map.get("orderState").toString().equals("13")) {
dataMapping.put("order_status", "已完成"); dataMapping.put("order_status", "已完成");
dataMapping.put("update_time", new Date()); dataMapping.put("update_time", new Date());
dataMapping.put("success_time", new Date()); dataMapping.put("success_time", new Date());
...@@ -252,23 +376,24 @@ public class OrderTask { ...@@ -252,23 +376,24 @@ public class OrderTask {
insertRhPhone(order.getBusinessNumber()); insertRhPhone(order.getBusinessNumber());
// 存销售清单 // 存销售清单
insertCompleteOrder(order); insertCompleteOrder(order);
appMapper.inserOrderHis(order.getId(), "订单已完成，省合伙人返回状态码："+Map.get("orderState").toString(), new Date(), "定时器查询"); appMapper.inserOrderHis(order.getId(), "订单已完成，省合伙人返回状态码：" + Map.get("orderState").toString(), new Date(), "定时器查询");
} }
if(Map.get("orderState").toString().equals("10") || Map.get("orderState").toString().equals("11")){ if (Map.get("orderState").toString().equals("10") || Map.get("orderState").toString().equals("11")) {
dataMapping.put("order_status", "异常单"); dataMapping.put("order_status", "异常单");
appMapper.inserOrderHis(order.getId(), "订单受理失败，已设为异常单，省合伙人返回状态码："+Map.get("orderState").toString(), new Date(), "定时器查询"); appMapper.inserOrderHis(order.getId(), "订单受理失败，已设为异常单，省合伙人返回状态码：" + Map.get("orderState").toString(), new Date(), "定时器查询");
} }
orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1); orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
log.info(order.getXbOrderId()+"订单已更新"); log.info(order.getXbOrderId() + "订单已更新");
} catch (Exception e) { } catch (Exception e) {
log.error(order.getXbOrderId()+"订单更新失败",e.getMessage()); log.error(order.getXbOrderId() + "订单更新失败", e.getMessage());
} }
}); });
} }
// 新用户完成存销售清单 // 新用户完成存销售清单
public void insertCompleteOrder(Order order){ public void insertCompleteOrder(Order order) {
try{ try {
SysUser sysUser = sysUserMapper.selectById(order.getHehuorenId()); SysUser sysUser = sysUserMapper.selectById(order.getHehuorenId());
Date date = new Date(); Date date = new Date();
SalesList salesOrder = new SalesList(); SalesList salesOrder = new SalesList();
...@@ -295,29 +420,29 @@ public class OrderTask { ...@@ -295,29 +420,29 @@ public class OrderTask {
salesOrder.setAccount(sysUser.getAccount()); salesOrder.setAccount(sysUser.getAccount());
log.info("新用户完成存销售清单:"+salesOrder); log.info("新用户完成存销售清单:" + salesOrder);
ResponseData<String> stringResponseData = salesListService.addSalesList(salesOrder); ResponseData<String> stringResponseData = salesListService.addSalesList(salesOrder);
if(stringResponseData.getState() != null && "error".equals(stringResponseData.getState())){ if (stringResponseData.getState() != null && "error".equals(stringResponseData.getState())) {
appMapper.inserOrderHis(order.getOrderId(), "新用户完成存销售清单:"+stringResponseData.getMsg(), new Date(), ""); appMapper.inserOrderHis(order.getOrderId(), "新用户完成存销售清单:" + stringResponseData.getMsg(), new Date(), "");
} }
log.info("新用户完成存销售清单:"+order.getOrderId()+":"+stringResponseData); log.info("新用户完成存销售清单:" + order.getOrderId() + ":" + stringResponseData);
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
// 新用户完成存融合清单 // 新用户完成存融合清单
public void insertRhPhone(String data){ public void insertRhPhone(String data) {
Wrapper<RhPhone> wrapper = new EntityWrapper<>(); Wrapper<RhPhone> wrapper = new EntityWrapper<>();
wrapper.eq(StringUtils.isNotBlank(data), "phone",data); wrapper.eq(StringUtils.isNotBlank(data), "phone", data);
List<RhPhone> list = rhPhoneMapper.selectList(wrapper); List<RhPhone> list = rhPhoneMapper.selectList(wrapper);
if(list.size()==0){ if (list.size() == 0) {
RhPhone rhPhone = new RhPhone(); RhPhone rhPhone = new RhPhone();
rhPhone.setPhone(data); rhPhone.setPhone(data);
try { try {
log.info("新用户完成存融合清单:"+rhPhone); log.info("新用户完成存融合清单:" + rhPhone);
rhPhoneMapper.insert(rhPhone); rhPhoneMapper.insert(rhPhone);
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
......
task/src/main/java/com/winsun/TimingTask/RhZhiNenTask.java
...@@ -10,7 +10,7 @@ import com.winsun.constant.Constant; ...@@ -10,7 +10,7 @@ import com.winsun.constant.Constant;
import com.winsun.mapper.OrderMapper; import com.winsun.mapper.OrderMapper;
import com.winsun.mapper.OrderViewMapper; import com.winsun.mapper.OrderViewMapper;
import com.winsun.mapper.UniversityInfoMapper; import com.winsun.mapper.UniversityInfoMapper;
import com.winsun.outSideSystem.IntelligenceSendOrder; import com.winsun.outSideSystem.IntelligenceSendOrders;
import com.winsun.utils.BeanUtil; import com.winsun.utils.BeanUtil;
import com.winsun.utils.MD5Utils; import com.winsun.utils.MD5Utils;
import com.winsun.utils.MyBatisPlusUpdateUtils; import com.winsun.utils.MyBatisPlusUpdateUtils;
...@@ -51,8 +51,10 @@ public class RhZhiNenTask { ...@@ -51,8 +51,10 @@ public class RhZhiNenTask {
private OrderViewMapper orderViewMapper; private OrderViewMapper orderViewMapper;
@Autowired @Autowired
private OrderMapper orderMapper; private OrderMapper orderMapper;
/*@Autowired
private IntelligenceSendOrder intelligenceSendOrder;*/
@Autowired @Autowired
private IntelligenceSendOrder intelligenceSendOrder; private IntelligenceSendOrders intelligenceSendOrders;
/** /**
* 下发智能平台订单 -- 单宽 * 下发智能平台订单 -- 单宽
...@@ -67,7 +69,7 @@ public class RhZhiNenTask { ...@@ -67,7 +69,7 @@ public class RhZhiNenTask {
// 发送下单请求 // 发送下单请求
for(int i = 0; i < orders.size(); ++i) { for(int i = 0; i < orders.size(); ++i) {
intelligenceSendOrder.singleBroadSendOrder(orders.get(i)); intelligenceSendOrders.singleBroadSendOrder(orders.get(i));
} }
}catch(Exception e) { }catch(Exception e) {
...@@ -98,30 +100,22 @@ public class RhZhiNenTask { ...@@ -98,30 +100,22 @@ public class RhZhiNenTask {
log.info("更新待受理订单数：" + updateNum); log.info("更新待受理订单数：" + updateNum);
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
// 查询未下单并且融合时间为今天的订单 // 查询未下单并且融合时间为今天的订单
Wrapper<Order> wrapper = new EntityWrapper<>(); String leftTime = sdf.format(calendar.getTime());
wrapper.in("user_type", "3,10");
wrapper.eq("order_status", "未下单");
wrapper.ge("rh_time", sdf.format(calendar.getTime()));
calendar.add(Calendar.DATE, 1); calendar.add(Calendar.DATE, 1);
wrapper.le("rh_time", sdf.format(calendar.getTime())); String rightTime = sdf.format(calendar.getTime());
List<Order> orders = orderMapper.selectList(wrapper); List<Map<String, Object>> orders = orderMapper.selectRHList(leftTime, rightTime);
Map<String, Object> map = new HashMap<>();
// 发送下单请求 // 发送下单请求
for(int i = 0; i < orders.size(); ++i) { for(int i = 0; i < orders.size(); ++i) {
intelligenceSendOrder.integrateSendOrder(orders.get(i), false); intelligenceSendOrders.integrateSendOrder(orders.get(i), false);
} }
// 无融合时间下单 // 无融合时间下单
wrapper = new EntityWrapper<>(); List<Map<String, Object>> noRhOrders = orderMapper.selectNotRHList();
wrapper.in("user_type", "3,10");
wrapper.eq("order_status", "未下单");
wrapper.isNull("rh_time");
List<Order> noRhOrders = orderMapper.selectList(wrapper);
// 发送下单请求 // 发送下单请求
for(int i = 0; i < noRhOrders.size(); ++i) { for(int i = 0; i < noRhOrders.size(); ++i) {
intelligenceSendOrder.integrateSendOrder(noRhOrders.get(i), true); intelligenceSendOrders.integrateSendOrder(noRhOrders.get(i), true);
} }
}catch(Exception e) { }catch(Exception e) {
...@@ -136,7 +130,7 @@ public class RhZhiNenTask { ...@@ -136,7 +130,7 @@ public class RhZhiNenTask {
//每五分钟调用一次 //每五分钟调用一次
// @Scheduled(cron = "0 0/5 0 * * ? ") // @Scheduled(cron = "0 0/5 0 * * ? ")
//@Scheduled(fixedRate=1000*60) //@Scheduled(fixedRate=1000*60)
@PostMapping("/rhZhiNenTask") /* @PostMapping("/rhZhiNenTask")
public void general() throws Exception { public void general() throws Exception {
Wrapper<Order> wrapper = new EntityWrapper<>(); Wrapper<Order> wrapper = new EntityWrapper<>();
...@@ -285,7 +279,7 @@ public class RhZhiNenTask { ...@@ -285,7 +279,7 @@ public class RhZhiNenTask {
qParams.add(new BasicNameValuePair("transactType", "新宽旧移"));// 办理类型，必填[新宽新移][新宽旧移][旧宽新移][旧宽旧移] qParams.add(new BasicNameValuePair("transactType", "新宽旧移"));// 办理类型，必填[新宽新移][新宽旧移][旧宽新移][旧宽旧移]
signMap.put("transactType", "新宽旧移"); signMap.put("transactType", "新宽旧移");
/* if(orderMap.get("webOrderAmount").toString().equals("0")){ *//* if(orderMap.get("webOrderAmount").toString().equals("0")){
qParams.add(new BasicNameValuePair("ctNumber", (String) order.get("businessNumber")));// 电信号码，办理类型，若选择[新宽旧移]或[旧宽旧移]，此项必填 qParams.add(new BasicNameValuePair("ctNumber", (String) order.get("businessNumber")));// 电信号码，办理类型，若选择[新宽旧移]或[旧宽旧移]，此项必填
signMap.put("ctNumber", (String) order.get("businessNumber")); signMap.put("ctNumber", (String) order.get("businessNumber"));
...@@ -297,7 +291,7 @@ public class RhZhiNenTask { ...@@ -297,7 +291,7 @@ public class RhZhiNenTask {
qParams.add(new BasicNameValuePair("ctNumber", (String) order.get("businessNumber")));// 电信号码，办理类型，若选择[新宽旧移]或[旧宽旧移]，此项必填 qParams.add(new BasicNameValuePair("ctNumber", (String) order.get("businessNumber")));// 电信号码，办理类型，若选择[新宽旧移]或[旧宽旧移]，此项必填
signMap.put("ctNumber", (String) order.get("businessNumber")); signMap.put("ctNumber", (String) order.get("businessNumber"));
*/ *//*
qParams.add(new BasicNameValuePair("addressProvince", "广东省"));// 报装地址-省 办理类型，若选择[新宽新移][新宽旧移]，此项必填 qParams.add(new BasicNameValuePair("addressProvince", "广东省"));// 报装地址-省 办理类型，若选择[新宽新移][新宽旧移]，此项必填
signMap.put("addressProvince", "广东省"); signMap.put("addressProvince", "广东省");
...@@ -661,7 +655,7 @@ public class RhZhiNenTask { ...@@ -661,7 +655,7 @@ public class RhZhiNenTask {
if (StringUtils.isNotBlank(orderNum)) { if (StringUtils.isNotBlank(orderNum)) {
queryOrderJsonObject = getQueryOrderInfo(orderNum, currentTimeStr); queryOrderJsonObject = getQueryOrderInfo(orderNum, currentTimeStr);
log.info("----------调用查询智能订单接口并返回参数信息:" + queryOrderJsonObject); log.info("----------调用查询智能订单接口并返回参数信息:" + queryOrderJsonObject);
/* 5、插入数据到数据库 */ *//* 5、插入数据到数据库 *//*
String state = queryOrderJsonObject.getString("state"); String state = queryOrderJsonObject.getString("state");
String order_id = queryOrderJsonObject.getString("bizEntity"); String order_id = queryOrderJsonObject.getString("bizEntity");
String th_status = queryOrderJsonObject.getString("stateName"); String th_status = queryOrderJsonObject.getString("stateName");
...@@ -686,7 +680,7 @@ public class RhZhiNenTask { ...@@ -686,7 +680,7 @@ public class RhZhiNenTask {
if (StringUtils.isNotBlank(orderNum)) { if (StringUtils.isNotBlank(orderNum)) {
queryOrderJsonObject = getQueryOrderInfo(orderNum, currentTimeStr); queryOrderJsonObject = getQueryOrderInfo(orderNum, currentTimeStr);
log.info("----------调用查询智能订单接口并返回参数信息:" + queryOrderJsonObject); log.info("----------调用查询智能订单接口并返回参数信息:" + queryOrderJsonObject);
/* 5、更新数据库 */ *//* 5、更新数据库 *//*
String state = queryOrderJsonObject.getString("state"); String state = queryOrderJsonObject.getString("state");
HashMap<String, Object> hashMap = new HashMap<>(); HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("order_id",orderNum); hashMap.put("order_id",orderNum);
...@@ -711,9 +705,9 @@ public class RhZhiNenTask { ...@@ -711,9 +705,9 @@ public class RhZhiNenTask {
} }
} }
} }*/
private String QueOrderNum(String orderNum) { /*private String QueOrderNum(String orderNum) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
if (orderNum.equals("12")) { if (orderNum.equals("12")) {
return "1"; // 待提交 return "1"; // 待提交
...@@ -731,9 +725,9 @@ public class RhZhiNenTask { ...@@ -731,9 +725,9 @@ public class RhZhiNenTask {
return "2"; // 待受理(未受理、未受理【待跟进】、待疑难支撑审核、待分局审核、待分销商审核) return "2"; // 待受理(未受理、未受理【待跟进】、待疑难支撑审核、待分局审核、待分销商审核)
} }
} }*/
private net.sf.json.JSONObject getQueryOrderInfo(String orderNum, String currentTimeStr) throws Exception { /*private net.sf.json.JSONObject getQueryOrderInfo(String orderNum, String currentTimeStr) throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(50000) RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(50000)
.setConnectTimeout(50000).setConnectionRequestTimeout(50000).build(); .setConnectTimeout(50000).setConnectionRequestTimeout(50000).build();
...@@ -782,7 +776,7 @@ public class RhZhiNenTask { ...@@ -782,7 +776,7 @@ public class RhZhiNenTask {
httpPost.releaseConnection(); httpPost.releaseConnection();
} }
return resultDataJson; return resultDataJson;
} }*/
private static JSONObject getSaleId(String productId, String currentTimeStr) throws Exception { private static JSONObject getSaleId(String productId, String currentTimeStr) throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
......
task/src/main/resources/application-local.yml
...@@ -125,6 +125,11 @@ spring: ...@@ -125,6 +125,11 @@ spring:
password: yzzx123!@# password: yzzx123!@#
filters: wall,mergeStat filters: wall,mergeStat
max-active: 20 max-active: 20
druid:
WebStatFilter:
enabled: false
StatViewServlet:
enabled: false
devtools: devtools:
restart: restart:
enabled: false enabled: false
......
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