Skip to content

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

宽带下单更新

parent a6e266a1
Showing with 310 additions and 308 deletions
apply-net/src/main/java/com/winsun/controller/SingleBroadToIntegrateController.java
......@@ -349,11 +349,11 @@ public class SingleBroadToIntegrateController {
if (toIntegrateOrderParam.getRhTime() == null || StringUtils.isBlank(toIntegrateOrderParam.getRhTime())) {
Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("id", uuid);
//Map<String, Object> orderMap = orderMapper.selectForId(order.getId());
Map<String, Object> orderMap = orderMapper.selectForId(order.getId());
new Thread(() -> {
try {
intelligenceSendOrder.integrateSendOrder(order, true);
//intelligenceSendOrders.integrateSendOrder(orderMap, true);
//intelligenceSendOrder.integrateSendOrder(order, true);
intelligenceSendOrders.integrateSendOrder(orderMap, true);
}catch(Exception e) {
e.printStackTrace();
log.info("融合下单失败！");
......
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrders.java
......@@ -1007,7 +1007,7 @@ public class IntelligenceSendOrders {
Map<String, Object> map = JSONObject.parseObject(bodyJsonObject.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("订单当前状态");
//Map<String, Object> orderStatus = (Map<String, Object>) map2.get("订单当前状态");
if (!map2.isEmpty()) {
return responese.getBody();
}
......
common/src/main/java/com/winsun/smsUtils/SendSmsAndMail.java
......@@ -51,9 +51,10 @@ public class SendSmsAndMail {
sb.append("accountSid").append("=").append(ACCOUNT_SID);
sb.append("&to").append("=").append(contactPhone);
if ("2".equals(t)){
speed = speed.replace("https://dx.dianyuanjiangli.com/mobile/#/hhr/handleSuccessful?orderId=", "");
sb.append("&param").append("=").append(URLEncoder.encode(speed,"UTF-8"));
//【飞young校园】尊敬的客户，您已成功下单！如需了解订单详情请点击@_url_@，如有任何问题请点击订单详情页面右上角，咨询客服。
sb.append("&templateid").append("=").append("319129");
sb.append("&templateid").append("=").append("319435");
}else if ("3".equals(t)){
sb.append("&param").append("=").append(URLEncoder.encode(speed,"UTF-8"));
//【飞young校园】尊敬的用户：您已完成手机卡的活体认证，请在5分钟后插卡拨打电话进行激活。
......@@ -78,7 +79,8 @@ public class SendSmsAndMail {
String body = sb.toString() + createCommonParam(ACCOUNT_SID, AUTH_TOKEN);
log.info("send body:" + body);
try {
HttpUtil.post(BASE_URL, body);
String post = HttpUtil.post(BASE_URL, body);
return post;
} catch (Exception e) {
e.printStackTrace();
}
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
......@@ -2215,9 +2215,9 @@ public class OrderController extends BaseController {
map.put("imgUrl2", (String) map.get("idCardUrl2"));
map.put("imgUrl3", (String) map.get("idCardUrl3"));
map.put("imgUrl4", (String) map.get("idCardUrl4"));
str = sendAitransOrder(map, 0);
//kong.unirest.HttpResponse<String> response = sendAitransOrder2(map, 0);
//str = response.getBody();
//str = sendAitransOrder(map, 0);
kong.unirest.HttpResponse<String> response = sendAitransOrder(map, 0);
str = response.getBody();
} catch (Exception e) {
e.printStackTrace();
}
......@@ -2232,7 +2232,7 @@ public class OrderController extends BaseController {
* @throws Exception
*/
// 保存卡品认证信息
public kong.unirest.HttpResponse<String> sendAitransOrder2(Map<String, Object> map, int count) throws Exception {
public kong.unirest.HttpResponse<String> sendAitransOrder(Map<String, Object> map, int count) throws Exception {
log.info("移动下单前已有参数：" + JSONObject.fromObject(map).toString());
Map<String, String> return_data = new HashMap<>();
return_data.put("code", "");
......@@ -2345,7 +2345,7 @@ public class OrderController extends BaseController {
try {
log.info("提交参数:" + order_dataJSON);
com.winsun.constant.Constant.trustEveryone();
responese = Unirest.post("https://applet.mini189.cn/dev/generate")
responese = Unirest.post("https://applet.mini189.cn/prod/generate")
.header("Content-Type", "application/json;charset=UTF-8")
.header("X-Sign", sign)
.asString();
......@@ -2353,7 +2353,7 @@ public class OrderController extends BaseController {
} catch (ResourceAccessException e) {
count++;
if (count < 20) {
responese = sendAitransOrder2(map, count);
responese = sendAitransOrder(map, count);
} else {
log.error("移动(预付费、移动、融合、续约、增值)下单接口异常尝试20次失误。请检查接口");
}
......@@ -2365,302 +2365,302 @@ public class OrderController extends BaseController {
return responese;
}
public String sendAitransOrder(Map<String, Object> map, int count) throws NoSuchAlgorithmException, UnsupportedEncodingException {
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(600000).setConnectTimeout(600000)
.setConnectionRequestTimeout(600000)
// .setProxy(proxy)
.build();
CloseableHttpClient httpclient = HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
log.info("移动下单前已有参数：" + JSONObject.fromObject(map).toString());
String resultStr = "";
HttpEntity entity = null;
// https://icloud.mini189.cn/api/create-order.action
// https://ismarttest.mini189.cn/api/create-order.action
HttpPost httpPost = new HttpPost("https://icloud.mini189.cn/api/create-order.action");
RequestConfig requestConfig = RequestConfig.copy(defaultRequestConfig).build();
httpPost.setConfig(requestConfig);
Map<String, String> signMap = new HashMap<String, String>();
MultipartEntityBuilder builder = MultipartEntityBuilder.create();
ContentType contentType = ContentType.create(HTTP.PLAIN_TEXT_TYPE, Charset.forName("UTF-8"));
builder.addTextBody("service", "order.prepaidgift.create", contentType);// api标识，必填且唯一
signMap.put("service", "order.prepaidgift.create");
builder.addTextBody("userName", (String) map.get("ysmUser"), contentType);// 用户名，必填
signMap.put("userName", (String) map.get("ysmUser"));
builder.addTextBody("timeStamp", (String) map.get("timeStr"), contentType);// 时间戳（YYYYMMDDHHMMSS），必填
signMap.put("timeStamp", (String) map.get("timeStr"));
builder.addTextBody("productCategory", "预付费礼包", contentType);// 业务类型，必填且唯一
signMap.put("productCategory", "预付费礼包");
builder.addTextBody("govEntCustomer", "0", contentType);// 是否政企客户下单:0：否，1：是，必填
signMap.put("govEntCustomer", "0");
builder.addTextBody("agentName", "", contentType);// 代办人姓名（若是政企客户下单必填）
signMap.put("agentName", "");
builder.addTextBody("agentCardNum", "", contentType);// 代办人身份证号码（若是政企客户下单必填）
signMap.put("agentCardNum", "");
builder.addTextBody("customerName", (String) map.get("userName"), contentType);// 客户姓名，必填
signMap.put("customerName", (String) map.get("userName"));
builder.addTextBody("customerPhone", (String) map.get("linkPhone"), contentType);// 客户(代办人)电话，必填
signMap.put("customerPhone", (String) map.get("linkPhone"));
builder.addTextBody("customerCardType", "身份证", contentType);// 证件类型，必填
signMap.put("customerCardType", "身份证");
builder.addTextBody("customerCardNum", (String) map.get("idCard"), contentType);// 证件号码，必填
signMap.put("customerCardNum", (String) map.get("idCard"));
builder.addTextBody("landId", "44094951", contentType);// 揽装工号，必填
signMap.put("landId", "44094951");
builder.addTextBody("comarketingLanId", "", contentType);// 协销工号，选填
signMap.put("comarketingLanId", "");
builder.addTextBody("groupComarketingLanId", "", contentType);//集团协销工号，选填
signMap.put("groupComarketingLanId", "");
builder.addTextBody("orderOutNum", (String) map.get("orderNum"), contentType);//外部订单编号，选填!；
//通过API接口下单，必须传入一个外部接入商的订单编号,该编号与智能营销系统编号一一对应
signMap.put("orderOutNum", (String) map.get("orderNum"));
builder.addTextBody("orderSource", "", contentType);// 订单来源 ，选填
signMap.put("orderSource", "");
builder.addTextBody("orderSourceNum", "", contentType);//
//订单来源单号，选填；与订单来源对应，用于业务上记录订单的来源订单编号
signMap.put("orderSourceNum", "");
builder.addTextBody("salePointCode", "", contentType);// 销售点编码，选填
signMap.put("salePointCode", "");
builder.addTextBody("personCode", "", contentType);// 人员编码，选填
signMap.put("personCode", "");
builder.addTextBody("distributorSmsReceive", "", contentType);// 分销商短信接收号码，选填
signMap.put("distributorSmsReceive", "");
builder.addTextBody("batchPickUp", "0", contentType);// 是否批量提货，必填
// 0：否，1：是
signMap.put("batchPickUp", "0");
builder.addTextBody("deliveryProvince", (String) map.get("sheng"), contentType);// 配送地址-省，必填
signMap.put("deliveryProvince", (String) map.get("sheng"));
builder.addTextBody("deliveryCity", (String) map.get("shi"), contentType);// 配送地址-市，必填
signMap.put("deliveryCity", (String) map.get("shi"));
builder.addTextBody("deliveryDistrict", (String) map.get("xian"), contentType);// 配送地址-区，必填
signMap.put("deliveryDistrict", (String) map.get("xian"));
builder.addTextBody("deliveryAddress", (String) map.get("address"), contentType);// 配送地址-详细地址，必填
signMap.put("deliveryAddress", (String) map.get("address"));
builder.addTextBody("deliveryContact", (String) map.get("userName"), contentType);// 联系人，必填
signMap.put("deliveryContact", (String) map.get("userName"));
builder.addTextBody("deliveryContactPhone", (String) map.get("linkPhone"), contentType);// 联系电话，必填
signMap.put("deliveryContactPhone", (String) map.get("linkPhone"));
builder.addTextBody("deliveryContactPhone2", "", contentType);// 联系电话2，选填
signMap.put("deliveryContactPhone2", "");
builder.addTextBody("invoiced", "0", contentType);// 是否需要发票，必填 0:不需要；1:一次性发票；2:分月发票
signMap.put("invoiced", "0");
builder.addTextBody("invoiceTitle", "", contentType);// 发票抬头，若需要发票必填
signMap.put("invoiceTitle", "");
builder.addTextBody("invoiceDeliveryAddress", "", contentType);// 电子邮箱，若需要发票必填
signMap.put("invoiceDeliveryAddress", "");
builder.addTextBody("deliveryType", "代理商自行发货", contentType);// 发货类型，必填，填写只能填同德仓发货或者代理商自行发货或者 现场派卡（其它信息的要求与代理商自行发货类似）
signMap.put("deliveryType", "代理商自行发货");// 若填写代理商自行发货或现场派卡，则下单时有几个产品，就需要填写多少个实物串号
builder.addTextBody("deliveryCompany", "", contentType);// 配送公司，必填，填写只能填顺丰速运或者如风达或者京东快递或者EMS
signMap.put("deliveryCompany", "");// 若发货类型选择代理商自行发货，则不用填写(填写也无效)
builder.addTextBody("collection", "", contentType);// 回收资料，选填，若填写只能填写1(表示身份证复印件)
signMap.put("collection", "");
builder.addTextBody("gift", "", contentType);// 礼品，选填，请通过礼品列表接口获取
signMap.put("gift", "");
builder.addTextBody("giftNum", "", contentType);// 礼品数量，选填，若礼品填写则必填且为正整数
signMap.put("giftNum", "");
List<Map<String, Object>> productList = new ArrayList<Map<String, Object>>();// 产品信息
List<Map<String, Object>> paymentList = new ArrayList<Map<String, Object>>();// 销售品信息(费用项)
List<Map<String, Object>> inPropertyList = new ArrayList<Map<String, Object>>();// 产品属性
List<Map<String, Object>> appendPropertyList = new ArrayList<Map<String, Object>>();// 产品附加扩展属性
List<Map<String, Object>> addPropertyList = new ArrayList<Map<String, Object>>();// 自定义产品属性
// 下单产品(如有多个请建立多个map，但产品总数不能超过5个)
Map<String, Object> productMap = new HashMap<String, Object>();
// 产品
productMap.put("productId", map.get("productId"));// 产品id,必填，请通过产品列表接口获取
productMap.put("count", "");// 产品数量,选填(若不填默认为1)
// 该数量仅供发货类型为同德仓发货且批量提货为否时填写，若选择代理商自行发货或批量提货为是，则填写无效
productMap.put("count2", "");// 产品数量,选填(若不填默认为1);该数量仅供批量提货为是时使用
// 若选择批量提货为否时，则填写无效
productMap.put("sn", map.get("iccId"));// 实物串号,选填(若选择代理商自行发货，必填;其他情况填写无效)
// 销售品信息(费用项)必填，若有终端，请将费用项填写在此
Map<String, Object> paymentListMap = new HashMap<String, Object>();
paymentListMap.put("id", map.get("salesId"));// 收费项ID，选填；请通过销售品列表接口获取，若不填表示终端补收款
paymentListMap.put("saleName", "");// 销售品名称，选填，若id不填写此项必填写，且只能为终端补收款
// paymentListMap.put("saleAmount", "");// 售价，选填
paymentListMap.put("payType", "3");// 缴费方式，必填（例：payType：3）3：代理商打款4：穗易付7：货到付款9：第三方托收
paymentListMap.put("payAmount", "0");// 打款金额（支付金额），若选择代理商打款或者穗易付，此项必填
paymentListMap.put("saleAmount", "");// 打款金额，若选择货到付款，此项必填
paymentListMap.put("payPlatform", "");// 支付平台，若选择穗易付，此项必填
paymentListMap.put("electronicPayNumber", "");// 支付流水号，若选择穗易付，此项必填
paymentListMap.put("payOrderNumber", "");// 穗易付订单号，若选择穗易付，此项必填
paymentListMap.put("monthUserid", "");//用户ID，缴费方式为“第三方托收”时必填
paymentListMap.put("monthPlatform", "");//签约平台，缴费方式为“第三方托收”时必填
paymentListMap.put("monthFlowno", "");//签约流水号，缴费方式为“第三方托收”时必填
paymentListMap.put("monthNumber", "");//签约协议号，缴费方式为“第三方托收”时必填
paymentListMap.put("monthTime", "");//签约时间，缴费方式为“第三方托收”时必填
paymentListMap.put("monthEffectiveTime", "");//签约生效时间，缴费方式为“第三方托收”时必填
paymentListMap.put("monthUneffectiveTime", "");//签约失效时间，缴费方式为“第三方托收”时必填
paymentList.add(paymentListMap);
productMap.put("payment", paymentList);
// 产品属性 必填业务号码属性,name=业务号码,value=11位数字或者随机；若还有其他属性可建立多个map添加
// 若发货类型选择代理商自行发货,则该value值必须填写11位数字
Map<String, Object> inPropertyListMap = new HashMap<String, Object>();
inPropertyListMap.put("name", "业务号码");
inPropertyListMap.put("value", map.get("orderPhone"));
inPropertyList.add(inPropertyListMap);
productMap.put("inpProperties", inPropertyList);
// 产品自定义属性；选填,没有则为null
// 注：若填写请属性名和属性值都填写，若只填写其中一项则无效
Map<String, Object> addPropertyListMap = new HashMap<String, Object>();
addPropertyListMap.put("name", null);
addPropertyListMap.put("value", null);
addPropertyList.add(addPropertyListMap);
productMap.put("addProperties", addPropertyList);
productList.add(productMap);
// 将对象装换为json字符串
String productJson = JSONArray.fromObject(productList).toString();
log.info("移动下单产品参数：" + productJson);
try {
builder.addTextBody("productJson", URLEncoder.encode(productJson, "UTF-8"), contentType);// 产品信息，必填
signMap.put("productJson", URLEncoder.encode(productJson, "UTF-8"));
} catch (UnsupportedEncodingException e1) {
e1.printStackTrace();
}
//身份证正面，选填
File file1 = new File(map.get("imgUrl1").toString().replace("manager/ciop", FilePath.BACKGROUNDIMG.getValue()).replace("\\", "/"));
//身份证背面，选填
File file2 = new File(map.get("imgUrl2").toString().replace("manager/ciop", FilePath.BACKGROUNDIMG.getValue()).replace("\\", "/"));
//手持证件，选填
File file3 = new File(map.get("imgUrl3").toString().replace("manager/ciop", FilePath.BACKGROUNDIMG.getValue()).replace("\\", "/"));
//手持证件2，选填
File file4 = new File(map.get("imgUrl4").toString().replace("manager/ciop", FilePath.BACKGROUNDIMG.getValue()).replace("\\", "/"));
if (file1 != null) {
ContentBody sfzzmFile = new FileBody(file1);
builder.addPart("sfzzmFile", sfzzmFile);
}
if (file2 != null) {
ContentBody sfzbmFile = new FileBody(file2);
builder.addPart("sfzbmFile", sfzbmFile);
}
if (file3 != null) {
ContentBody sfzscFile = new FileBody(file3);
builder.addPart("sfzscFile", sfzscFile);
}
if (file4 != null) {
ContentBody sfzsc2File = new FileBody(file4);
builder.addPart("sfzsc2File", sfzsc2File);
}
List<String> keys = new ArrayList<String>();
keys.addAll(signMap.keySet());
Collections.sort(keys);// key按字符串升序
String value, plaintext = "";
for (String key : keys) {
value = signMap.get(key);
plaintext = plaintext.concat(value);
}
plaintext = plaintext.concat((String) map.get("sign"));
String sign = CommonMd5.encryption(plaintext);// md5加密
builder.addTextBody("sign", sign, contentType);// 签名，必填
log.info("移动智能平台下单参数：" + plaintext);
try {
//httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
httpPost.setEntity(builder.build());
//System.out.println("[CREATE_ORDER]移动产品下单接口，提交参数" + EntityUtils.toString(httpPost.getEntity(), "UTF-8"));
long startTime = System.currentTimeMillis();
Constant.trustEveryone();
HttpResponse response = httpclient.execute(httpPost);
long endTime = System.currentTimeMillis();
log.info("接口调用时间：" + (endTime - startTime) + "ms");
entity = response.getEntity();
String httpResult = EntityUtils.toString(entity, "UTF-8");
resultStr = httpResult;
log.info("[CREATE_ORDER]预付费下单接口，返回信息:" + httpResult);
httpclient.close();
JSONObject resultDataJson = JSONObject.fromObject(httpResult);
String isSuccess = resultDataJson.getString("status");
String orderNum = resultDataJson.getString("orderNumber");
if ("000001".equals(isSuccess)) {
log.info("[CREATE_ORDER]下单成功,orderNum=" + orderNum);
}
} catch (SSLHandshakeException s) {
count++;
if (count < 20) {
resultStr = sendAitransOrder(map, count);
} else {
log.error("[HTTP] [CREATE_ORDER] 预付费下单接口异常20次");
}
} catch (Exception e) {
log.error("[HTTP] [CREATE_ORDER] 预付费下单接口异常");
e.printStackTrace();
} finally {
httpPost.releaseConnection();
}
return resultStr;
}
// public String sendAitransOrder(Map<String, Object> map, int count) throws NoSuchAlgorithmException, UnsupportedEncodingException {
//// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(600000).setConnectTimeout(600000)
// .setConnectionRequestTimeout(600000)
//// .setProxy(proxy)
// .build();
//
// CloseableHttpClient httpclient = HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
//
// log.info("移动下单前已有参数：" + JSONObject.fromObject(map).toString());
// String resultStr = "";
//
// HttpEntity entity = null;
// // https://icloud.mini189.cn/api/create-order.action
// // https://ismarttest.mini189.cn/api/create-order.action
// HttpPost httpPost = new HttpPost("https://icloud.mini189.cn/api/create-order.action");
//
// RequestConfig requestConfig = RequestConfig.copy(defaultRequestConfig).build();
// httpPost.setConfig(requestConfig);
//
// Map<String, String> signMap = new HashMap<String, String>();
// MultipartEntityBuilder builder = MultipartEntityBuilder.create();
// ContentType contentType = ContentType.create(HTTP.PLAIN_TEXT_TYPE, Charset.forName("UTF-8"));
//
// builder.addTextBody("service", "order.prepaidgift.create", contentType);// api标识，必填且唯一
// signMap.put("service", "order.prepaidgift.create");
//
//
// builder.addTextBody("userName", (String) map.get("ysmUser"), contentType);// 用户名，必填
// signMap.put("userName", (String) map.get("ysmUser"));
//
//
// builder.addTextBody("timeStamp", (String) map.get("timeStr"), contentType);// 时间戳（YYYYMMDDHHMMSS），必填
//
// signMap.put("timeStamp", (String) map.get("timeStr"));
//
// builder.addTextBody("productCategory", "预付费礼包", contentType);// 业务类型，必填且唯一
//
// signMap.put("productCategory", "预付费礼包");
//
// builder.addTextBody("govEntCustomer", "0", contentType);// 是否政企客户下单:0：否，1：是，必填
//
// signMap.put("govEntCustomer", "0");
//
// builder.addTextBody("agentName", "", contentType);// 代办人姓名（若是政企客户下单必填）
// signMap.put("agentName", "");
//
// builder.addTextBody("agentCardNum", "", contentType);// 代办人身份证号码（若是政企客户下单必填）
// signMap.put("agentCardNum", "");
//
// builder.addTextBody("customerName", (String) map.get("userName"), contentType);// 客户姓名，必填
// signMap.put("customerName", (String) map.get("userName"));
//
// builder.addTextBody("customerPhone", (String) map.get("linkPhone"), contentType);// 客户(代办人)电话，必填
// signMap.put("customerPhone", (String) map.get("linkPhone"));
//
// builder.addTextBody("customerCardType", "身份证", contentType);// 证件类型，必填
// signMap.put("customerCardType", "身份证");
//
// builder.addTextBody("customerCardNum", (String) map.get("idCard"), contentType);// 证件号码，必填
// signMap.put("customerCardNum", (String) map.get("idCard"));
//
// builder.addTextBody("landId", "44094951", contentType);// 揽装工号，必填
// signMap.put("landId", "44094951");
//
// builder.addTextBody("comarketingLanId", "", contentType);// 协销工号，选填
// signMap.put("comarketingLanId", "");
//
// builder.addTextBody("groupComarketingLanId", "", contentType);//集团协销工号，选填
// signMap.put("groupComarketingLanId", "");
//
// builder.addTextBody("orderOutNum", (String) map.get("orderNum"), contentType);//外部订单编号，选填!；
// //通过API接口下单，必须传入一个外部接入商的订单编号,该编号与智能营销系统编号一一对应
// signMap.put("orderOutNum", (String) map.get("orderNum"));
//
// builder.addTextBody("orderSource", "", contentType);// 订单来源 ，选填
// signMap.put("orderSource", "");
//
// builder.addTextBody("orderSourceNum", "", contentType);//
// //订单来源单号，选填；与订单来源对应，用于业务上记录订单的来源订单编号
// signMap.put("orderSourceNum", "");
//
// builder.addTextBody("salePointCode", "", contentType);// 销售点编码，选填
// signMap.put("salePointCode", "");
//
// builder.addTextBody("personCode", "", contentType);// 人员编码，选填
// signMap.put("personCode", "");
//
// builder.addTextBody("distributorSmsReceive", "", contentType);// 分销商短信接收号码，选填
// signMap.put("distributorSmsReceive", "");
//
//
// builder.addTextBody("batchPickUp", "0", contentType);// 是否批量提货，必填
// // 0：否，1：是
// signMap.put("batchPickUp", "0");
//
// builder.addTextBody("deliveryProvince", (String) map.get("sheng"), contentType);// 配送地址-省，必填
// signMap.put("deliveryProvince", (String) map.get("sheng"));
//
// builder.addTextBody("deliveryCity", (String) map.get("shi"), contentType);// 配送地址-市，必填
// signMap.put("deliveryCity", (String) map.get("shi"));
//
// builder.addTextBody("deliveryDistrict", (String) map.get("xian"), contentType);// 配送地址-区，必填
// signMap.put("deliveryDistrict", (String) map.get("xian"));
//
// builder.addTextBody("deliveryAddress", (String) map.get("address"), contentType);// 配送地址-详细地址，必填
// signMap.put("deliveryAddress", (String) map.get("address"));
//
// builder.addTextBody("deliveryContact", (String) map.get("userName"), contentType);// 联系人，必填
// signMap.put("deliveryContact", (String) map.get("userName"));
//
// builder.addTextBody("deliveryContactPhone", (String) map.get("linkPhone"), contentType);// 联系电话，必填
// signMap.put("deliveryContactPhone", (String) map.get("linkPhone"));
//
// builder.addTextBody("deliveryContactPhone2", "", contentType);// 联系电话2，选填
// signMap.put("deliveryContactPhone2", "");
//
// builder.addTextBody("invoiced", "0", contentType);// 是否需要发票，必填 0:不需要；1:一次性发票；2:分月发票
//
// signMap.put("invoiced", "0");
//
// builder.addTextBody("invoiceTitle", "", contentType);// 发票抬头，若需要发票必填
// signMap.put("invoiceTitle", "");
//
// builder.addTextBody("invoiceDeliveryAddress", "", contentType);// 电子邮箱，若需要发票必填
// signMap.put("invoiceDeliveryAddress", "");
//
// builder.addTextBody("deliveryType", "代理商自行发货", contentType);// 发货类型，必填，填写只能填同德仓发货或者代理商自行发货或者 现场派卡（其它信息的要求与代理商自行发货类似）
// signMap.put("deliveryType", "代理商自行发货");// 若填写代理商自行发货或现场派卡，则下单时有几个产品，就需要填写多少个实物串号
//
// builder.addTextBody("deliveryCompany", "", contentType);// 配送公司，必填，填写只能填顺丰速运或者如风达或者京东快递或者EMS
// signMap.put("deliveryCompany", "");// 若发货类型选择代理商自行发货，则不用填写(填写也无效)
//
// builder.addTextBody("collection", "", contentType);// 回收资料，选填，若填写只能填写1(表示身份证复印件)
// signMap.put("collection", "");
//
// builder.addTextBody("gift", "", contentType);// 礼品，选填，请通过礼品列表接口获取
// signMap.put("gift", "");
//
// builder.addTextBody("giftNum", "", contentType);// 礼品数量，选填，若礼品填写则必填且为正整数
// signMap.put("giftNum", "");
//
// List<Map<String, Object>> productList = new ArrayList<Map<String, Object>>();// 产品信息
// List<Map<String, Object>> paymentList = new ArrayList<Map<String, Object>>();// 销售品信息(费用项)
// List<Map<String, Object>> inPropertyList = new ArrayList<Map<String, Object>>();// 产品属性
// List<Map<String, Object>> appendPropertyList = new ArrayList<Map<String, Object>>();// 产品附加扩展属性
// List<Map<String, Object>> addPropertyList = new ArrayList<Map<String, Object>>();// 自定义产品属性
// // 下单产品(如有多个请建立多个map，但产品总数不能超过5个)
// Map<String, Object> productMap = new HashMap<String, Object>();
// // 产品
// productMap.put("productId", map.get("productId"));// 产品id,必填，请通过产品列表接口获取
// productMap.put("count", "");// 产品数量,选填(若不填默认为1)
// // 该数量仅供发货类型为同德仓发货且批量提货为否时填写，若选择代理商自行发货或批量提货为是，则填写无效
// productMap.put("count2", "");// 产品数量,选填(若不填默认为1);该数量仅供批量提货为是时使用
// // 若选择批量提货为否时，则填写无效
// productMap.put("sn", map.get("iccId"));// 实物串号,选填(若选择代理商自行发货，必填;其他情况填写无效)
//
// // 销售品信息(费用项)必填，若有终端，请将费用项填写在此
// Map<String, Object> paymentListMap = new HashMap<String, Object>();
// paymentListMap.put("id", map.get("salesId"));// 收费项ID，选填；请通过销售品列表接口获取，若不填表示终端补收款
// paymentListMap.put("saleName", "");// 销售品名称，选填，若id不填写此项必填写，且只能为终端补收款
//// paymentListMap.put("saleAmount", "");// 售价，选填
// paymentListMap.put("payType", "3");// 缴费方式，必填（例：payType：3）3：代理商打款4：穗易付7：货到付款9：第三方托收
// paymentListMap.put("payAmount", "0");// 打款金额（支付金额），若选择代理商打款或者穗易付，此项必填
// paymentListMap.put("saleAmount", "");// 打款金额，若选择货到付款，此项必填
// paymentListMap.put("payPlatform", "");// 支付平台，若选择穗易付，此项必填
// paymentListMap.put("electronicPayNumber", "");// 支付流水号，若选择穗易付，此项必填
// paymentListMap.put("payOrderNumber", "");// 穗易付订单号，若选择穗易付，此项必填
// paymentListMap.put("monthUserid", "");//用户ID，缴费方式为“第三方托收”时必填
// paymentListMap.put("monthPlatform", "");//签约平台，缴费方式为“第三方托收”时必填
// paymentListMap.put("monthFlowno", "");//签约流水号，缴费方式为“第三方托收”时必填
// paymentListMap.put("monthNumber", "");//签约协议号，缴费方式为“第三方托收”时必填
// paymentListMap.put("monthTime", "");//签约时间，缴费方式为“第三方托收”时必填
// paymentListMap.put("monthEffectiveTime", "");//签约生效时间，缴费方式为“第三方托收”时必填
// paymentListMap.put("monthUneffectiveTime", "");//签约失效时间，缴费方式为“第三方托收”时必填
//
// paymentList.add(paymentListMap);
//
// productMap.put("payment", paymentList);
//
// // 产品属性 必填业务号码属性,name=业务号码,value=11位数字或者随机；若还有其他属性可建立多个map添加
// // 若发货类型选择代理商自行发货,则该value值必须填写11位数字
// Map<String, Object> inPropertyListMap = new HashMap<String, Object>();
// inPropertyListMap.put("name", "业务号码");
// inPropertyListMap.put("value", map.get("orderPhone"));
// inPropertyList.add(inPropertyListMap);
// productMap.put("inpProperties", inPropertyList);
//
// // 产品自定义属性；选填,没有则为null
// // 注：若填写请属性名和属性值都填写，若只填写其中一项则无效
// Map<String, Object> addPropertyListMap = new HashMap<String, Object>();
// addPropertyListMap.put("name", null);
// addPropertyListMap.put("value", null);
// addPropertyList.add(addPropertyListMap);
// productMap.put("addProperties", addPropertyList);
//
// productList.add(productMap);
//
// // 将对象装换为json字符串
// String productJson = JSONArray.fromObject(productList).toString();
//
// log.info("移动下单产品参数：" + productJson);
//
// try {
// builder.addTextBody("productJson", URLEncoder.encode(productJson, "UTF-8"), contentType);// 产品信息，必填
// signMap.put("productJson", URLEncoder.encode(productJson, "UTF-8"));
// } catch (UnsupportedEncodingException e1) {
// e1.printStackTrace();
// }
//
// //身份证正面，选填
// File file1 = new File(map.get("imgUrl1").toString().replace("manager/ciop", FilePath.BACKGROUNDIMG.getValue()).replace("\\", "/"));
// //身份证背面，选填
// File file2 = new File(map.get("imgUrl2").toString().replace("manager/ciop", FilePath.BACKGROUNDIMG.getValue()).replace("\\", "/"));
// //手持证件，选填
// File file3 = new File(map.get("imgUrl3").toString().replace("manager/ciop", FilePath.BACKGROUNDIMG.getValue()).replace("\\", "/"));
// //手持证件2，选填
// File file4 = new File(map.get("imgUrl4").toString().replace("manager/ciop", FilePath.BACKGROUNDIMG.getValue()).replace("\\", "/"));
//
// if (file1 != null) {
// ContentBody sfzzmFile = new FileBody(file1);
// builder.addPart("sfzzmFile", sfzzmFile);
// }
// if (file2 != null) {
// ContentBody sfzbmFile = new FileBody(file2);
// builder.addPart("sfzbmFile", sfzbmFile);
// }
// if (file3 != null) {
// ContentBody sfzscFile = new FileBody(file3);
// builder.addPart("sfzscFile", sfzscFile);
// }
// if (file4 != null) {
// ContentBody sfzsc2File = new FileBody(file4);
// builder.addPart("sfzsc2File", sfzsc2File);
// }
//
// List<String> keys = new ArrayList<String>();
// keys.addAll(signMap.keySet());
// Collections.sort(keys);// key按字符串升序
// String value, plaintext = "";
//
// for (String key : keys) {
// value = signMap.get(key);
// plaintext = plaintext.concat(value);
// }
//
// plaintext = plaintext.concat((String) map.get("sign"));
//
// String sign = CommonMd5.encryption(plaintext);// md5加密
// builder.addTextBody("sign", sign, contentType);// 签名，必填
//
// log.info("移动智能平台下单参数：" + plaintext);
//
// try {
//
// //httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
// httpPost.setEntity(builder.build());
// //System.out.println("[CREATE_ORDER]移动产品下单接口，提交参数" + EntityUtils.toString(httpPost.getEntity(), "UTF-8"));
//
// long startTime = System.currentTimeMillis();
// Constant.trustEveryone();
// HttpResponse response = httpclient.execute(httpPost);
// long endTime = System.currentTimeMillis();
// log.info("接口调用时间：" + (endTime - startTime) + "ms");
//
//
// entity = response.getEntity();
//
// String httpResult = EntityUtils.toString(entity, "UTF-8");
// resultStr = httpResult;
//
// log.info("[CREATE_ORDER]预付费下单接口，返回信息:" + httpResult);
// httpclient.close();
// JSONObject resultDataJson = JSONObject.fromObject(httpResult);
//
// String isSuccess = resultDataJson.getString("status");
// String orderNum = resultDataJson.getString("orderNumber");
// if ("000001".equals(isSuccess)) {
// log.info("[CREATE_ORDER]下单成功,orderNum=" + orderNum);
// }
// } catch (SSLHandshakeException s) {
// count++;
// if (count < 20) {
// resultStr = sendAitransOrder(map, count);
// } else {
// log.error("[HTTP] [CREATE_ORDER] 预付费下单接口异常20次");
// }
// } catch (Exception e) {
// log.error("[HTTP] [CREATE_ORDER] 预付费下单接口异常");
// e.printStackTrace();
// } finally {
// httpPost.releaseConnection();
// }
//
// return resultStr;
// }
@Permission(menuname = "更新存量升级订单状态", value = "setUpgradeStatus", method = RequestMethod.POST)
public ResponseData setUpgradeStatus(@RequestParam("orderId") String orderId, @RequestParam("auditType") String auditType, @RequestParam("contentMsg") String contentMsg) {
......
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