Skip to content

G
gdtel-gztel-school-center
Commit eb7a4b93 by 黄森林
Options

督导开发

parent f262fd5f
Showing with 238 additions and 241 deletions
common/src/main/java/com/winsun/mapper/OrderMapper.java
...@@ -51,4 +51,7 @@ public interface OrderMapper extends BaseMapper<Order> { ...@@ -51,4 +51,7 @@ public interface OrderMapper extends BaseMapper<Order> {
@Select("select xb_order_id xbOrderId from `hhr_order` where order_number = #{orderNumber}") @Select("select xb_order_id xbOrderId from `hhr_order` where order_number = #{orderNumber}")
String selectxbOrderIdByOrderNumber(String orderNumber); String selectxbOrderIdByOrderNumber(String orderNumber);
@Select("select ysm from `hhr_user` where id = #{id}")
String selectYsmById(String id);
} }
common/src/main/java/com/winsun/utils/OrderManage.java
...@@ -4,7 +4,6 @@ import lombok.extern.slf4j.Slf4j; ...@@ -4,7 +4,6 @@ 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;
import org.apache.http.HttpEntity; import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair; import org.apache.http.NameValuePair;
import org.apache.http.client.config.RequestConfig; import org.apache.http.client.config.RequestConfig;
...@@ -35,46 +34,29 @@ import java.util.*; ...@@ -35,46 +34,29 @@ import java.util.*;
@Slf4j @Slf4j
public class OrderManage { public class OrderManage {
private InputStream in = this.getClass().getResourceAsStream("/txtfiledetail.properties");
private Properties prop = new Properties();
// 预实名接口发起 // 预实名接口发起
public String sendOrder(Map<String, Object> map){ public String sendOrder(Map<String, Object> map) {
try {
prop.load(in);
} catch (IOException e1) {
e1.printStackTrace();
}
String hhr_img = prop.getProperty("hhr_img");
String str = ""; String str = "";
try {
try{
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String timeStr = simpleDateFormat.format(new Date()); String timeStr = simpleDateFormat.format(new Date());
String cardType = (String)map.get("cardType"); String cardType = (String) map.get("cardType");
if(cardType.contains("大王卡")){ if (cardType.contains("大王卡")) {
map.put("productId", "483"); map.put("productId", "483");
map.put("salesId", "1185"); map.put("salesId", "1185");
}else if(cardType.contains("天翼学生证")){ } else if (cardType.contains("天翼学生证")) {
map.put("productId", "1327"); map.put("productId", "1327");
map.put("salesId", "4453"); map.put("salesId", "4453");
}else { } else {
map.put("productId", "727"); map.put("productId", "727");
map.put("salesId", "2137"); map.put("salesId", "2137");
} }
map.put("timeStr", timeStr); map.put("timeStr", timeStr);
map.put("orderNum", "XY"+timeStr);
map.put("imgUrl1", (String)map.get("idCardUrl1"));
map.put("imgUrl2", (String)map.get("idCardUrl2"));
map.put("imgUrl3", (String)map.get("idCardUrl3"));
map.put("imgUrl4", (String)map.get("idCardUrl4"));
str = sendAitransOrder(map); str = sendAitransOrder(map);
}catch(Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
...@@ -82,7 +64,7 @@ public class OrderManage { ...@@ -82,7 +64,7 @@ public class OrderManage {
} }
// 保存卡品认证信息 // 保存卡品认证信息
public static String sendAitransOrder(Map<String, Object> map) throws NoSuchAlgorithmException, UnsupportedEncodingException{ public String sendAitransOrder(Map<String, Object> map) throws NoSuchAlgorithmException, UnsupportedEncodingException {
RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(600000).setConnectTimeout(600000) RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(600000).setConnectTimeout(600000)
.setConnectionRequestTimeout(600000).build(); .setConnectionRequestTimeout(600000).build();
...@@ -101,124 +83,124 @@ public class OrderManage { ...@@ -101,124 +83,124 @@ public class OrderManage {
Map<String, String> signMap = new HashMap<String, String>(); Map<String, String> signMap = new HashMap<String, String>();
MultipartEntityBuilder builder = MultipartEntityBuilder.create(); MultipartEntityBuilder builder = MultipartEntityBuilder.create();
ContentType contentType = ContentType.create(HTTP.PLAIN_TEXT_TYPE,Charset.forName("UTF-8")); ContentType contentType = ContentType.create(HTTP.PLAIN_TEXT_TYPE, Charset.forName("UTF-8"));
builder.addTextBody("service", "order.prepaidgift.create",contentType);// api标识，必填且唯一 builder.addTextBody("service", "order.prepaidgift.create", contentType);// api标识，必填且唯一
signMap.put("service", "order.prepaidgift.create"); signMap.put("service", "order.prepaidgift.create");
builder.addTextBody("userName", (String)map.get("ysmUser"),contentType);// 用户名，必填 builder.addTextBody("userName", (String) map.get("ysmUser"), contentType);// 用户名，必填
signMap.put("userName", (String)map.get("ysmUser")); signMap.put("userName", (String) map.get("ysmUser"));
builder.addTextBody("timeStamp", (String)map.get("timeStr"),contentType);// 时间戳（YYYYMMDDHHMMSS），必填 builder.addTextBody("timeStamp", (String) map.get("timeStr"), contentType);// 时间戳（YYYYMMDDHHMMSS），必填
signMap.put("timeStamp", (String)map.get("timeStr")); signMap.put("timeStamp", (String) map.get("timeStr"));
builder.addTextBody("productCategory", "预付费礼包",contentType);// 业务类型，必填且唯一 builder.addTextBody("productCategory", "预付费礼包", contentType);// 业务类型，必填且唯一
signMap.put("productCategory", "预付费礼包"); signMap.put("productCategory", "预付费礼包");
builder.addTextBody("govEntCustomer", "0",contentType);// 是否政企客户下单:0：否，1：是，必填 builder.addTextBody("govEntCustomer", "0", contentType);// 是否政企客户下单:0：否，1：是，必填
signMap.put("govEntCustomer", "0"); signMap.put("govEntCustomer", "0");
builder.addTextBody("agentName", "",contentType);// 代办人姓名（若是政企客户下单必填） builder.addTextBody("agentName", "", contentType);// 代办人姓名（若是政企客户下单必填）
signMap.put("agentName", ""); signMap.put("agentName", "");
builder.addTextBody("agentCardNum", "",contentType);// 代办人身份证号码（若是政企客户下单必填） builder.addTextBody("agentCardNum", "", contentType);// 代办人身份证号码（若是政企客户下单必填）
signMap.put("agentCardNum", ""); signMap.put("agentCardNum", "");
builder.addTextBody("customerName", (String)map.get("userName"),contentType);// 客户姓名，必填 builder.addTextBody("customerName", (String) map.get("userName"), contentType);// 客户姓名，必填
signMap.put("customerName", (String)map.get("userName")); signMap.put("customerName", (String) map.get("userName"));
builder.addTextBody("customerPhone", (String)map.get("linkPhone"),contentType);// 客户(代办人)电话，必填 builder.addTextBody("customerPhone", (String) map.get("linkPhone"), contentType);// 客户(代办人)电话，必填
signMap.put("customerPhone", (String)map.get("linkPhone")); signMap.put("customerPhone", (String) map.get("linkPhone"));
builder.addTextBody("customerCardType", "身份证",contentType);// 证件类型，必填 builder.addTextBody("customerCardType", "身份证", contentType);// 证件类型，必填
signMap.put("customerCardType", "身份证"); signMap.put("customerCardType", "身份证");
builder.addTextBody("customerCardNum", (String)map.get("idCard"),contentType);// 证件号码，必填 builder.addTextBody("customerCardNum", (String) map.get("idCard"), contentType);// 证件号码，必填
signMap.put("customerCardNum", (String)map.get("idCard")); signMap.put("customerCardNum", (String) map.get("idCard"));
builder.addTextBody("landId", "44094951",contentType);// 揽装工号，必填 builder.addTextBody("landId", "44094951", contentType);// 揽装工号，必填
signMap.put("landId", "44094951"); signMap.put("landId", "44094951");
builder.addTextBody("comarketingLanId", "",contentType);// 协销工号，选填 builder.addTextBody("comarketingLanId", "", contentType);// 协销工号，选填
signMap.put("comarketingLanId", ""); signMap.put("comarketingLanId", "");
builder.addTextBody("groupComarketingLanId","",contentType);//集团协销工号，选填 builder.addTextBody("groupComarketingLanId", "", contentType);//集团协销工号，选填
signMap.put("groupComarketingLanId",""); signMap.put("groupComarketingLanId", "");
builder.addTextBody("orderOutNum",(String)map.get("orderNum"),contentType);//外部订单编号，选填!； builder.addTextBody("orderOutNum", (String) map.get("orderNum"), contentType);//外部订单编号，选填!；
//通过API接口下单，必须传入一个外部接入商的订单编号,该编号与智能营销系统编号一一对应 //通过API接口下单，必须传入一个外部接入商的订单编号,该编号与智能营销系统编号一一对应
signMap.put("orderOutNum",(String)map.get("orderNum")); signMap.put("orderOutNum", (String) map.get("orderNum"));
builder.addTextBody("orderSource", "",contentType);// 订单来源 ，选填 builder.addTextBody("orderSource", "校园合伙人", contentType);// 订单来源 ，选填
signMap.put("orderSource", ""); signMap.put("orderSource", "校园合伙人");
builder.addTextBody("orderSourceNum", "",contentType);// builder.addTextBody("orderSourceNum", (String) map.get("orderNum"), contentType);//
//订单来源单号，选填；与订单来源对应，用于业务上记录订单的来源订单编号 //订单来源单号，选填；与订单来源对应，用于业务上记录订单的来源订单编号
signMap.put("orderSourceNum", ""); signMap.put("orderSourceNum", (String) map.get("orderNum"));
builder.addTextBody("salePointCode", "",contentType);// 销售点编码，选填 builder.addTextBody("salePointCode", "", contentType);// 销售点编码，选填
signMap.put("salePointCode", ""); signMap.put("salePointCode", "");
builder.addTextBody("personCode", "",contentType);// 人员编码，选填 builder.addTextBody("personCode", "", contentType);// 人员编码，选填
signMap.put("personCode", ""); signMap.put("personCode", "");
builder.addTextBody("distributorSmsReceive", "",contentType);// 分销商短信接收号码，选填 builder.addTextBody("distributorSmsReceive", "", contentType);// 分销商短信接收号码，选填
signMap.put("distributorSmsReceive", ""); signMap.put("distributorSmsReceive", "");
builder.addTextBody("batchPickUp", "0",contentType);// 是否批量提货，必填 builder.addTextBody("batchPickUp", "0", contentType);// 是否批量提货，必填
// 0：否，1：是 // 0：否，1：是
signMap.put("batchPickUp", "0"); signMap.put("batchPickUp", "0");
builder.addTextBody("deliveryProvince", (String) map.get("sheng"),contentType);// 配送地址-省，必填 builder.addTextBody("deliveryProvince", (String) map.get("sheng"), contentType);// 配送地址-省，必填
signMap.put("deliveryProvince", (String) map.get("sheng")); signMap.put("deliveryProvince", (String) map.get("sheng"));
builder.addTextBody("deliveryCity", (String) map.get("shi"),contentType);// 配送地址-市，必填 builder.addTextBody("deliveryCity", (String) map.get("shi"), contentType);// 配送地址-市，必填
signMap.put("deliveryCity",(String) map.get("shi")); signMap.put("deliveryCity", (String) map.get("shi"));
builder.addTextBody("deliveryDistrict", (String) map.get("xian"),contentType);// 配送地址-区，必填 builder.addTextBody("deliveryDistrict", (String) map.get("xian"), contentType);// 配送地址-区，必填
signMap.put("deliveryDistrict", (String) map.get("xian")); signMap.put("deliveryDistrict", (String) map.get("xian"));
builder.addTextBody("deliveryAddress", (String) map.get("address"),contentType);// 配送地址-详细地址，必填 builder.addTextBody("deliveryAddress", (String) map.get("address"), contentType);// 配送地址-详细地址，必填
signMap.put("deliveryAddress", (String) map.get("address")); signMap.put("deliveryAddress", (String) map.get("address"));
builder.addTextBody("deliveryContact", (String)map.get("userName"),contentType);// 联系人，必填 builder.addTextBody("deliveryContact", (String) map.get("userName"), contentType);// 联系人，必填
signMap.put("deliveryContact", (String)map.get("userName")); signMap.put("deliveryContact", (String) map.get("userName"));
builder.addTextBody("deliveryContactPhone", (String)map.get("linkPhone"),contentType);// 联系电话，必填 builder.addTextBody("deliveryContactPhone", (String) map.get("linkPhone"), contentType);// 联系电话，必填
signMap.put("deliveryContactPhone", (String)map.get("linkPhone")); signMap.put("deliveryContactPhone", (String) map.get("linkPhone"));
builder.addTextBody("deliveryContactPhone2", "",contentType);// 联系电话2，选填 builder.addTextBody("deliveryContactPhone2", "", contentType);// 联系电话2，选填
signMap.put("deliveryContactPhone2", ""); signMap.put("deliveryContactPhone2", "");
builder.addTextBody("invoiced", "0",contentType);// 是否需要发票，必填 0:不需要；1:一次性发票；2:分月发票 builder.addTextBody("invoiced", "0", contentType);// 是否需要发票，必填 0:不需要；1:一次性发票；2:分月发票
signMap.put("invoiced", "0"); signMap.put("invoiced", "0");
builder.addTextBody("invoiceTitle", "",contentType);// 发票抬头，若需要发票必填 builder.addTextBody("invoiceTitle", "", contentType);// 发票抬头，若需要发票必填
signMap.put("invoiceTitle", ""); signMap.put("invoiceTitle", "");
builder.addTextBody("invoiceDeliveryAddress", "",contentType);// 电子邮箱，若需要发票必填 builder.addTextBody("invoiceDeliveryAddress", "", contentType);// 电子邮箱，若需要发票必填
signMap.put("invoiceDeliveryAddress", ""); signMap.put("invoiceDeliveryAddress", "");
builder.addTextBody("deliveryType", "代理商自行发货",contentType);// 发货类型，必填，填写只能填同德仓发货或者代理商自行发货或者 现场派卡（其它信息的要求与代理商自行发货类似） builder.addTextBody("deliveryType", "代理商自行发货", contentType);// 发货类型，必填，填写只能填同德仓发货或者代理商自行发货或者 现场派卡（其它信息的要求与代理商自行发货类似）
signMap.put("deliveryType", "代理商自行发货");// 若填写代理商自行发货或现场派卡，则下单时有几个产品，就需要填写多少个实物串号 signMap.put("deliveryType", "代理商自行发货");// 若填写代理商自行发货或现场派卡，则下单时有几个产品，就需要填写多少个实物串号
builder.addTextBody("deliveryCompany", "",contentType);// 配送公司，必填，填写只能填顺丰速运或者如风达或者京东快递或者EMS builder.addTextBody("deliveryCompany", "", contentType);// 配送公司，必填，填写只能填顺丰速运或者如风达或者京东快递或者EMS
signMap.put("deliveryCompany", "");// 若发货类型选择代理商自行发货，则不用填写(填写也无效) signMap.put("deliveryCompany", "");// 若发货类型选择代理商自行发货，则不用填写(填写也无效)
builder.addTextBody("collection", "",contentType);// 回收资料，选填，若填写只能填写1(表示身份证复印件) builder.addTextBody("collection", "", contentType);// 回收资料，选填，若填写只能填写1(表示身份证复印件)
signMap.put("collection", ""); signMap.put("collection", "");
builder.addTextBody("gift", "",contentType);// 礼品，选填，请通过礼品列表接口获取 builder.addTextBody("gift", "", contentType);// 礼品，选填，请通过礼品列表接口获取
signMap.put("gift", ""); signMap.put("gift", "");
builder.addTextBody("giftNum", "",contentType);// 礼品数量，选填，若礼品填写则必填且为正整数 builder.addTextBody("giftNum", "", contentType);// 礼品数量，选填，若礼品填写则必填且为正整数
signMap.put("giftNum", ""); signMap.put("giftNum", "");
List<Map<String, Object>> productList = new ArrayList<Map<String, Object>>();// 产品信息 List<Map<String, Object>> productList = new ArrayList<Map<String, Object>>();// 产品信息
...@@ -280,7 +262,7 @@ public class OrderManage { ...@@ -280,7 +262,7 @@ public class OrderManage {
// 将对象装换为json字符串 // 将对象装换为json字符串
String productJson = JSONArray.fromObject(productList).toString(); String productJson = JSONArray.fromObject(productList).toString();
try { try {
builder.addTextBody("productJson", URLEncoder.encode(productJson, "UTF-8"),contentType);// 产品信息，必填 builder.addTextBody("productJson", URLEncoder.encode(productJson, "UTF-8"), contentType);// 产品信息，必填
signMap.put("productJson", URLEncoder.encode(productJson, "UTF-8")); signMap.put("productJson", URLEncoder.encode(productJson, "UTF-8"));
} catch (UnsupportedEncodingException e1) { } catch (UnsupportedEncodingException e1) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
...@@ -288,13 +270,13 @@ public class OrderManage { ...@@ -288,13 +270,13 @@ public class OrderManage {
} }
//身份证正面，选填 //身份证正面，选填
File file1 = new File((String)map.get("imgUrl1")); File file1 = new File((String) map.get("imgUrl1"));
//身份证背面，选填 //身份证背面，选填
File file2 = new File((String)map.get("imgUrl2")); File file2 = new File((String) map.get("imgUrl2"));
//手持证件，选填 //手持证件，选填
File file3 = new File((String)map.get("imgUrl3")); File file3 = new File((String) map.get("imgUrl3"));
//手持证件2，选填 //手持证件2，选填
File file4 = new File((String)map.get("imgUrl4")); File file4 = new File((String) map.get("imgUrl4"));
if (file1 != null) { if (file1 != null) {
ContentBody sfzzmFile = new FileBody(file1); ContentBody sfzzmFile = new FileBody(file1);
...@@ -323,11 +305,11 @@ public class OrderManage { ...@@ -323,11 +305,11 @@ public class OrderManage {
plaintext = plaintext.concat(value); plaintext = plaintext.concat(value);
} }
plaintext = plaintext.concat((String)map.get("sign")); plaintext = plaintext.concat((String) map.get("sign"));
String sign = MD5Utils.md5(plaintext);// md5加密 String sign = MD5Utils.md5(plaintext);// md5加密
builder.addTextBody("sign", sign,contentType);// 签名，必填 builder.addTextBody("sign", sign, contentType);// 签名，必填
try { try {
...@@ -366,9 +348,9 @@ public class OrderManage { ...@@ -366,9 +348,9 @@ public class OrderManage {
} }
// 查询移互平台产品列表 // 查询移互平台产品列表
public String queryProduct() throws NoSuchAlgorithmException, UnsupportedEncodingException{ public String queryProduct() throws NoSuchAlgorithmException, UnsupportedEncodingException {
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
Map<String,String> signMap = new HashMap<String,String>();//待签名参数 Map<String, String> signMap = new HashMap<String, String>();//待签名参数
String resultStr = ""; String resultStr = "";
RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(50000) RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(50000)
...@@ -388,36 +370,36 @@ public class OrderManage { ...@@ -388,36 +370,36 @@ public class OrderManage {
httpPost.setConfig(requestConfig); httpPost.setConfig(requestConfig);
qParams.add(new BasicNameValuePair("service", "product.prepaid.query"));//api标识，必填 qParams.add(new BasicNameValuePair("service", "product.prepaid.query"));//api标识，必填
signMap.put("service","product.prepaid.query"); signMap.put("service", "product.prepaid.query");
//product.broadband.query为单宽带,product.prepaid.query为预付费,product.mobile.query为移动产品,product.combined.query为融合产品 //product.broadband.query为单宽带,product.prepaid.query为预付费,product.mobile.query为移动产品,product.combined.query为融合产品
//product.kdxy.query为宽带续约,product.zzyw.query为增值业务 //product.kdxy.query为宽带续约,product.zzyw.query为增值业务
qParams.add(new BasicNameValuePair("userName", "ruany"));//用户名，必填 qParams.add(new BasicNameValuePair("userName", "ruany"));//用户名，必填
signMap.put("userName","ruany"); signMap.put("userName", "ruany");
qParams.add(new BasicNameValuePair("timeStamp",timeStr));//时间戳（YYYYMMDDHHMMSS） ，必填 qParams.add(new BasicNameValuePair("timeStamp", timeStr));//时间戳（YYYYMMDDHHMMSS） ，必填
signMap.put("timeStamp",timeStr); signMap.put("timeStamp", timeStr);
qParams.add(new BasicNameValuePair("business","预付费礼包"));//产品类型，必填 qParams.add(new BasicNameValuePair("business", "预付费礼包"));//产品类型，必填
signMap.put("business","预付费礼包"); signMap.put("business", "预付费礼包");
//填写单宽带,预付费礼包,移动产品,融合产品,宽带续约,增值业务 //填写单宽带,预付费礼包,移动产品,融合产品,宽带续约,增值业务
List<String> keys = new ArrayList<String>(); List<String> keys = new ArrayList<String>();
keys.addAll(signMap.keySet()); keys.addAll(signMap.keySet());
Collections.sort(keys);//key按字符串升序 Collections.sort(keys);//key按字符串升序
String value,plaintext = ""; String value, plaintext = "";
for(String key : keys){ for (String key : keys) {
value = signMap.get(key); value = signMap.get(key);
plaintext = plaintext.concat(value); plaintext = plaintext.concat(value);
} }
plaintext = plaintext.concat("3df143292455bfea88bc613c53004d36"); plaintext = plaintext.concat("3df143292455bfea88bc613c53004d36");
String sign = MD5Utils.md5(plaintext);//md5加密 String sign = MD5Utils.md5(plaintext);//md5加密
qParams.add(new BasicNameValuePair("sign",sign));//签名，必填 qParams.add(new BasicNameValuePair("sign", sign));//签名，必填
try { try {
httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
httpPost.setEntity(new UrlEncodedFormEntity(qParams,"UTF-8")); httpPost.setEntity(new UrlEncodedFormEntity(qParams, "UTF-8"));
log.info("[CREATE_ORDER]单宽带(预付费、移动、融合、续约、增值)下单接口，提交参数:" + EntityUtils.toString(httpPost.getEntity(), "UTF-8")); log.info("[CREATE_ORDER]单宽带(预付费、移动、融合、续约、增值)下单接口，提交参数:" + EntityUtils.toString(httpPost.getEntity(), "UTF-8"));
HttpResponse response = httpclient.execute(httpPost); HttpResponse response = httpclient.execute(httpPost);
...@@ -433,8 +415,8 @@ public class OrderManage { ...@@ -433,8 +415,8 @@ public class OrderManage {
String isSuccess = resultDataJson.getString("status"); String isSuccess = resultDataJson.getString("status");
//JSONArray jsonArray = resultDataJson.getJSONArray("list"); //JSONArray jsonArray = resultDataJson.getJSONArray("list");
if("000001".equals(isSuccess)){ if ("000001".equals(isSuccess)) {
log.info("[CREATE_ORDER]查询单宽带(预付费、移动、融合、续约、增值)产品成功,list="+resultDataJson.toString()); log.info("[CREATE_ORDER]查询单宽带(预付费、移动、融合、续约、增值)产品成功,list=" + resultDataJson.toString());
} }
} catch (Exception e) { } catch (Exception e) {
log.error("[HTTP] [CREATE_ORDER] 查询单宽带(预付费、移动、融合、续约、增值)产品接口异常"); log.error("[HTTP] [CREATE_ORDER] 查询单宽带(预付费、移动、融合、续约、增值)产品接口异常");
...@@ -447,9 +429,9 @@ public class OrderManage { ...@@ -447,9 +429,9 @@ public class OrderManage {
} }
// 查询移互平台产品销售Id // 查询移互平台产品销售Id
public String querySalesId() throws NoSuchAlgorithmException, UnsupportedEncodingException{ public String querySalesId() throws NoSuchAlgorithmException, UnsupportedEncodingException {
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
Map<String,String> signMap = new HashMap<String,String>();//待签名参数 Map<String, String> signMap = new HashMap<String, String>();//待签名参数
RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(50000) RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(50000)
.setConnectTimeout(50000).setConnectionRequestTimeout(50000).build(); .setConnectTimeout(50000).setConnectionRequestTimeout(50000).build();
CloseableHttpClient httpclient = HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig) CloseableHttpClient httpclient = HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig)
...@@ -465,34 +447,34 @@ public class OrderManage { ...@@ -465,34 +447,34 @@ public class OrderManage {
String timeStr = simpleDateFormat.format(new Date()); String timeStr = simpleDateFormat.format(new Date());
qParams.add(new BasicNameValuePair("service", "sale.query"));//api标识，必填 qParams.add(new BasicNameValuePair("service", "sale.query"));//api标识，必填
signMap.put("service","sale.query"); signMap.put("service", "sale.query");
qParams.add(new BasicNameValuePair("userName", "ruany"));//用户名，必填 qParams.add(new BasicNameValuePair("userName", "ruany"));//用户名，必填
signMap.put("userName","ruany"); signMap.put("userName", "ruany");
qParams.add(new BasicNameValuePair("timeStamp",timeStr));//时间戳（YYYYMMDDHHMMSS） ，必填 qParams.add(new BasicNameValuePair("timeStamp", timeStr));//时间戳（YYYYMMDDHHMMSS） ，必填
signMap.put("timeStamp",timeStr); signMap.put("timeStamp", timeStr);
qParams.add(new BasicNameValuePair("productId","729"));//产品ID qParams.add(new BasicNameValuePair("productId", "729"));//产品ID
signMap.put("productId","729"); signMap.put("productId", "729");
List<String> keys = new ArrayList<String>(); List<String> keys = new ArrayList<String>();
keys.addAll(signMap.keySet()); keys.addAll(signMap.keySet());
Collections.sort(keys);//key按字符串升序 Collections.sort(keys);//key按字符串升序
String value,plaintext = ""; String value, plaintext = "";
String result = ""; String result = "";
for(String key : keys){ for (String key : keys) {
value = signMap.get(key); value = signMap.get(key);
plaintext = plaintext.concat(value); plaintext = plaintext.concat(value);
} }
plaintext = plaintext.concat("3df143292455bfea88bc613c53004d36"); plaintext = plaintext.concat("3df143292455bfea88bc613c53004d36");
String sign = MD5Utils.md5(plaintext);//md5加密 String sign = MD5Utils.md5(plaintext);//md5加密
qParams.add(new BasicNameValuePair("sign",sign));//签名，必填 qParams.add(new BasicNameValuePair("sign", sign));//签名，必填
try { try {
httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
httpPost.setEntity(new UrlEncodedFormEntity(qParams,"UTF-8")); httpPost.setEntity(new UrlEncodedFormEntity(qParams, "UTF-8"));
log.info( log.info(
"[CREATE_ORDER]获取销售品列表接口，提交参数:" + EntityUtils.toString(httpPost.getEntity(), "UTF-8")); "[CREATE_ORDER]获取销售品列表接口，提交参数:" + EntityUtils.toString(httpPost.getEntity(), "UTF-8"));
...@@ -508,8 +490,8 @@ public class OrderManage { ...@@ -508,8 +490,8 @@ public class OrderManage {
String isSuccess = resultDataJson.getString("status"); String isSuccess = resultDataJson.getString("status");
JSONArray jsonArray = resultDataJson.getJSONArray("list"); JSONArray jsonArray = resultDataJson.getJSONArray("list");
if("000001".equals(isSuccess)){ if ("000001".equals(isSuccess)) {
log.info("[CREATE_ORDER]获取销售品成功,list="+jsonArray.toString()); log.info("[CREATE_ORDER]获取销售品成功,list=" + jsonArray.toString());
} }
result = httpResult; result = httpResult;
...@@ -524,11 +506,11 @@ public class OrderManage { ...@@ -524,11 +506,11 @@ public class OrderManage {
} }
// 智能平台订单查询接口 // 智能平台订单查询接口
public String queryOrder(Map<String, Object> map) throws Exception{ public String queryOrder(Map<String, Object> map) throws Exception {
String result = ""; String result = "";
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
Map<String,String> signMap = new HashMap<String,String>();//待签名参数 Map<String, String> signMap = new HashMap<String, String>();//待签名参数
RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(50000) RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(50000)
.setConnectTimeout(50000).setConnectionRequestTimeout(50000).build(); .setConnectTimeout(50000).setConnectionRequestTimeout(50000).build();
...@@ -542,42 +524,42 @@ public class OrderManage { ...@@ -542,42 +524,42 @@ public class OrderManage {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String timeStr = simpleDateFormat.format(new Date()); String timeStr = simpleDateFormat.format(new Date());
map.put("timeStr",timeStr); map.put("timeStr", timeStr);
qParams.add(new BasicNameValuePair("service", "query.order.status"));//api标识，必填 qParams.add(new BasicNameValuePair("service", "query.order.status"));//api标识，必填
signMap.put("service","query.order.status"); signMap.put("service", "query.order.status");
qParams.add(new BasicNameValuePair("userName", (String)map.get("ysmUser")));//用户名，必填 qParams.add(new BasicNameValuePair("userName", (String) map.get("ysmUser")));//用户名，必填
signMap.put("userName",(String)map.get("ysmUser")); signMap.put("userName", (String) map.get("ysmUser"));
qParams.add(new BasicNameValuePair("timeStamp",(String)map.get("timeStr")));//时间戳（YYYYMMDDHHMMSS） ，必填 qParams.add(new BasicNameValuePair("timeStamp", (String) map.get("timeStr")));//时间戳（YYYYMMDDHHMMSS） ，必填
signMap.put("timeStamp",(String)map.get("timeStr")); signMap.put("timeStamp", (String) map.get("timeStr"));
qParams.add(new BasicNameValuePair("orderNumber",(String)map.get("znOrderNum")));//智能平台订单编号，非必填 qParams.add(new BasicNameValuePair("orderNumber", (String) map.get("znOrderNum")));//智能平台订单编号，非必填
signMap.put("orderNumber",(String)map.get("znOrderNum")); signMap.put("orderNumber", (String) map.get("znOrderNum"));
qParams.add(new BasicNameValuePair("outOrderNum",""));//外部订单编号，非必填 qParams.add(new BasicNameValuePair("outOrderNum", ""));//外部订单编号，非必填
signMap.put("outOrderNum",""); signMap.put("outOrderNum", "");
List<String> keys = new ArrayList<String>(); List<String> keys = new ArrayList<String>();
keys.addAll(signMap.keySet()); keys.addAll(signMap.keySet());
Collections.sort(keys);//key按字符串升序 Collections.sort(keys);//key按字符串升序
String value,plaintext = ""; String value, plaintext = "";
for(String key : keys){ for (String key : keys) {
value = signMap.get(key); value = signMap.get(key);
plaintext = plaintext.concat(value); plaintext = plaintext.concat(value);
} }
plaintext = plaintext.concat((String)map.get("sign")); plaintext = plaintext.concat((String) map.get("sign"));
String sign = MD5Utils.md5(plaintext);//md5加密 String sign = MD5Utils.md5(plaintext);//md5加密
qParams.add(new BasicNameValuePair("sign",sign));//签名，必填 qParams.add(new BasicNameValuePair("sign", sign));//签名，必填
try { try {
httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
httpPost.setEntity(new UrlEncodedFormEntity(qParams,"UTF-8")); httpPost.setEntity(new UrlEncodedFormEntity(qParams, "UTF-8"));
// System.out.println( // System.out.println(
// "[CREATE_ORDER]获取销售品列表接口，提交参数:" + EntityUtils.toString(httpPost.getEntity(), "UTF-8")); // "[CREATE_ORDER]获取销售品列表接口，提交参数:" + EntityUtils.toString(httpPost.getEntity(), "UTF-8"));
...@@ -588,19 +570,19 @@ public class OrderManage { ...@@ -588,19 +570,19 @@ public class OrderManage {
String httpResult = EntityUtils.toString(entity, "UTF-8"); String httpResult = EntityUtils.toString(entity, "UTF-8");
httpclient.close(); httpclient.close();
// System.out.println("[CREATE_ORDER]获取销售品列表接口，返回信息:" + httpResult); // System.out.println("[CREATE_ORDER]获取销售品列表接口，返回信息:" + httpResult);
if(httpResult.equals("\r\n\r\nnull\r\n\r\n")){ if (httpResult.equals("\r\n\r\nnull\r\n\r\n")) {
}else{ } else {
JSONObject resultDataJson = JSONObject.fromObject(httpResult); JSONObject resultDataJson = JSONObject.fromObject(httpResult);
String isSuccess = resultDataJson.getString("status"); String isSuccess = resultDataJson.getString("status");
result = httpResult; result = httpResult;
if("000001".equals(isSuccess)){ if ("000001".equals(isSuccess)) {
log.info("[CREATE_ORDER]获取销售品成功,list="+resultDataJson.toString()); log.info("[CREATE_ORDER]获取销售品成功,list=" + resultDataJson.toString());
String stateName = resultDataJson.getString("stateName"); String stateName = resultDataJson.getString("stateName");
if (stateName.equals("待配送")||stateName.equals("物流配送中")){ if (stateName.equals("待配送") || stateName.equals("物流配送中")) {
return "1"; return "1";
}else if(stateName.equals("待图片审核")||stateName.equals("作废")){ } else if (stateName.equals("待图片审核") || stateName.equals("作废")) {
return "0"; return "0";
} }
...@@ -618,11 +600,11 @@ public class OrderManage { ...@@ -618,11 +600,11 @@ public class OrderManage {
} }
// 智能平台订单查询接口，定时任务根据智能平台返回的订单号去查询更新 order_view表的订单状态 // 智能平台订单查询接口，定时任务根据智能平台返回的订单号去查询更新 order_view表的订单状态
public Map<String,Object> queryOrder2(Map<String, Object> map) throws Exception{ public Map<String, Object> queryOrder2(Map<String, Object> map) throws Exception {
Map<String,Object> resultMap = new HashMap<String,Object>(); Map<String, Object> resultMap = new HashMap<String, Object>();
String result = ""; String result = "";
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
Map<String,String> signMap = new HashMap<String,String>();//待签名参数 Map<String, String> signMap = new HashMap<String, String>();//待签名参数
RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(50000) RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(50000)
.setConnectTimeout(50000).setConnectionRequestTimeout(50000).build(); .setConnectTimeout(50000).setConnectionRequestTimeout(50000).build();
...@@ -637,42 +619,42 @@ public class OrderManage { ...@@ -637,42 +619,42 @@ public class OrderManage {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String timeStr = simpleDateFormat.format(new Date()); String timeStr = simpleDateFormat.format(new Date());
map.put("timeStr",timeStr); map.put("timeStr", timeStr);
qParams.add(new BasicNameValuePair("service", "query.order.status"));//api标识，必填 qParams.add(new BasicNameValuePair("service", "query.order.status"));//api标识，必填
signMap.put("service","query.order.status"); signMap.put("service", "query.order.status");
qParams.add(new BasicNameValuePair("userName", (String)map.get("ysmUser")));//用户名，必填 qParams.add(new BasicNameValuePair("userName", (String) map.get("ysmUser")));//用户名，必填
signMap.put("userName",(String)map.get("ysmUser")); signMap.put("userName", (String) map.get("ysmUser"));
qParams.add(new BasicNameValuePair("timeStamp",(String)map.get("timeStr")));//时间戳（YYYYMMDDHHMMSS） ，必填 qParams.add(new BasicNameValuePair("timeStamp", (String) map.get("timeStr")));//时间戳（YYYYMMDDHHMMSS） ，必填
signMap.put("timeStamp",(String)map.get("timeStr")); signMap.put("timeStamp", (String) map.get("timeStr"));
qParams.add(new BasicNameValuePair("orderNumber",(String)map.get("znOrderNum")));//智能平台订单编号，非必填 qParams.add(new BasicNameValuePair("orderNumber", (String) map.get("znOrderNum")));//智能平台订单编号，非必填
signMap.put("orderNumber",(String)map.get("znOrderNum")); signMap.put("orderNumber", (String) map.get("znOrderNum"));
qParams.add(new BasicNameValuePair("outOrderNum",""));//外部订单编号，非必填 qParams.add(new BasicNameValuePair("outOrderNum", ""));//外部订单编号，非必填
signMap.put("outOrderNum",""); signMap.put("outOrderNum", "");
List<String> keys = new ArrayList<String>(); List<String> keys = new ArrayList<String>();
keys.addAll(signMap.keySet()); keys.addAll(signMap.keySet());
Collections.sort(keys);//key按字符串升序 Collections.sort(keys);//key按字符串升序
String value,plaintext = ""; String value, plaintext = "";
for(String key : keys){ for (String key : keys) {
value = signMap.get(key); value = signMap.get(key);
plaintext = plaintext.concat(value); plaintext = plaintext.concat(value);
} }
plaintext = plaintext.concat((String)map.get("sign")); plaintext = plaintext.concat((String) map.get("sign"));
String sign = MD5Utils.md5(plaintext);//md5加密 String sign = MD5Utils.md5(plaintext);//md5加密
qParams.add(new BasicNameValuePair("sign",sign));//签名，必填 qParams.add(new BasicNameValuePair("sign", sign));//签名，必填
try { try {
httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
httpPost.setEntity(new UrlEncodedFormEntity(qParams,"UTF-8")); httpPost.setEntity(new UrlEncodedFormEntity(qParams, "UTF-8"));
// System.out.println( // System.out.println(
// "[CREATE_ORDER]获取销售品列表接口，提交参数:" + EntityUtils.toString(httpPost.getEntity(), "UTF-8")); // "[CREATE_ORDER]获取销售品列表接口，提交参数:" + EntityUtils.toString(httpPost.getEntity(), "UTF-8"));
...@@ -683,9 +665,9 @@ public class OrderManage { ...@@ -683,9 +665,9 @@ public class OrderManage {
String httpResult = EntityUtils.toString(entity, "UTF-8"); String httpResult = EntityUtils.toString(entity, "UTF-8");
httpclient.close(); httpclient.close();
// System.out.println("[CREATE_ORDER]获取销售品列表接口，返回信息:" + httpResult); // System.out.println("[CREATE_ORDER]获取销售品列表接口，返回信息:" + httpResult);
if(httpResult.equals("\r\n\r\nnull\r\n\r\n")){ if (httpResult.equals("\r\n\r\nnull\r\n\r\n")) {
}else{ } else {
/* /*
* 状态ID 状态名称 * 状态ID 状态名称
1 未受理 1 未受理
...@@ -704,19 +686,19 @@ public class OrderManage { ...@@ -704,19 +686,19 @@ public class OrderManage {
String isSuccess = resultDataJson.getString("status"); String isSuccess = resultDataJson.getString("status");
result = httpResult; result = httpResult;
resultMap.put("result", result); resultMap.put("result", result);
if("000001".equals(isSuccess)){ if ("000001".equals(isSuccess)) {
log.info("[CREATE_ORDER]获取销售品成功,list="+resultDataJson.toString()); log.info("[CREATE_ORDER]获取销售品成功,list=" + resultDataJson.toString());
String state = resultDataJson.getString("state"); String state = resultDataJson.getString("state");
System.out.println("单宽智能平台订单返回状态码："+state); System.out.println("单宽智能平台订单返回状态码：" + state);
if("10".equals(state)||"11".equals(state)){ if ("10".equals(state) || "11".equals(state)) {
resultMap.put("type", "已完成"); resultMap.put("type", "已完成");
resultMap.put("state", state); resultMap.put("state", state);
return resultMap; return resultMap;
}else if("1".equals(state)||"3".equals(state)||"8".equals(state)||"9".equals(state)||"12".equals(state)||"25".equals(state)) { } else if ("1".equals(state) || "3".equals(state) || "8".equals(state) || "9".equals(state) || "12".equals(state) || "25".equals(state)) {
resultMap.put("type", "办理中"); resultMap.put("type", "办理中");
resultMap.put("state", state); resultMap.put("state", state);
return resultMap; return resultMap;
}else if("13".equals(state)||"14".equals(state)||"18".equals(state)) { } else if ("13".equals(state) || "14".equals(state) || "18".equals(state)) {
resultMap.put("type", "异常单"); resultMap.put("type", "异常单");
resultMap.put("state", state); resultMap.put("state", state);
return resultMap; return resultMap;
...@@ -735,5 +717,4 @@ public class OrderManage { ...@@ -735,5 +717,4 @@ public class OrderManage {
} }
} }
service-manager/src/main/java/com/winsun/controller/supervisorController.java
package com.winsun.controller; package com.winsun.controller;
import com.alibaba.fastjson.JSON;
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.base.controller.BaseController; import com.winsun.auth.core.base.controller.BaseController;
...@@ -33,13 +34,16 @@ import java.util.Map; ...@@ -33,13 +34,16 @@ import java.util.Map;
@RequestMapping("/supervisor") @RequestMapping("/supervisor")
public class supervisorController extends BaseController { public class supervisorController extends BaseController {
private static String REPLACE="new/ciop";
private static PackageMapper packageMapper; private static PackageMapper packageMapper;
private static OrderMapper orderMapper; private static OrderMapper orderMapper;
private static YsmUserMapper ysmUserMapper; private static YsmUserMapper ysmUserMapper;
@Autowired @Autowired
public supervisorController(PackageMapper packageMapper, OrderMapper orderMapper,YsmUserMapper ysmUserMapper) { public supervisorController(PackageMapper packageMapper, OrderMapper orderMapper, YsmUserMapper ysmUserMapper) {
supervisorController.packageMapper = packageMapper; supervisorController.packageMapper = packageMapper;
supervisorController.orderMapper = orderMapper; supervisorController.orderMapper = orderMapper;
supervisorController.ysmUserMapper = ysmUserMapper; supervisorController.ysmUserMapper = ysmUserMapper;
...@@ -58,12 +62,12 @@ public class supervisorController extends BaseController { ...@@ -58,12 +62,12 @@ public class supervisorController extends BaseController {
return ResponseData.error("无数据权限"); return ResponseData.error("无数据权限");
}*/ }*/
if(StringUtils.isNotBlank(orderId)){ if (StringUtils.isNotBlank(orderId)) {
ResponseData<String> verification = verification(orderId); ResponseData<String> verification = verification(orderId);
if(!verification.isSuccess()){ if (!verification.isSuccess()) {
return ResponseData.error("订单不存在或异常！"); return ResponseData.error("订单不存在或异常！");
} }
}else { } else {
return ResponseData.error("页面已失效，请重新登录！"); return ResponseData.error("页面已失效，请重新登录！");
} }
Wrapper<Order> wrapper = new EntityWrapper<>(); Wrapper<Order> wrapper = new EntityWrapper<>();
...@@ -106,24 +110,24 @@ public class supervisorController extends BaseController { ...@@ -106,24 +110,24 @@ public class supervisorController extends BaseController {
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限"); return ResponseData.error("无数据权限");
}*/ }*/
if(StringUtils.isNotBlank(orderId)){ if (StringUtils.isNotBlank(orderId)) {
ResponseData<String> verification = verification(orderId); ResponseData<String> verification = verification(orderId);
if(!verification.isSuccess()){ if (!verification.isSuccess()) {
return ResponseData.error("订单不存在或异常！"); return ResponseData.error("订单不存在或异常！");
} }
}else { } else {
return ResponseData.error("页面已失效，请重新登录！"); return ResponseData.error("页面已失效，请重新登录！");
} }
Wrapper wrapper = new EntityWrapper<>(); Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id",orderId); wrapper.eq("id", orderId);
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("order_status", "异常单"); dataMapping.put("order_status", "异常单");
Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
if(integer == 0){ if (integer == 0) {
return ResponseData.error("置为异常单失败！"); return ResponseData.error("置为异常单失败！");
}else { } else {
//orderMapper.inserOrderHis(orderId,"已置为异常单",new Date(),user.getName()); //orderMapper.inserOrderHis(orderId,"已置为异常单",new Date(),user.getName());
orderMapper.inserOrderHis(orderId,"已置为异常单",new Date(),"测试"); orderMapper.inserOrderHis(orderId, "已置为异常单", new Date(), "测试");
return ResponseData.success("置为异常单成功！"); return ResponseData.success("置为异常单成功！");
} }
} }
...@@ -136,48 +140,48 @@ public class supervisorController extends BaseController { ...@@ -136,48 +140,48 @@ public class supervisorController extends BaseController {
* @return * @return
*/ */
@RequestMapping(value = "daichuliUpdate", method = RequestMethod.POST) @RequestMapping(value = "daichuliUpdate", method = RequestMethod.POST)
public ResponseData<String> daiChuLiUpdate(@RequestParam("orderId") String orderId,@RequestParam("type") String type) { public ResponseData<String> daiChuLiUpdate(@RequestParam("orderId") String orderId, @RequestParam("type") String type) {
/* ShiroUser user = getShiroUser(); /* ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限"); return ResponseData.error("无数据权限");
}*/ }*/
if(StringUtils.isNotBlank(orderId) ){ if (StringUtils.isNotBlank(orderId)) {
ResponseData<String> verification = verification(orderId); ResponseData<String> verification = verification(orderId);
if(!verification.isSuccess()){ if (!verification.isSuccess()) {
return ResponseData.error("订单不存在或异常！"); return ResponseData.error("订单不存在或异常！");
} }
}else { } else {
return ResponseData.error("页面已失效，请重新登录！"); return ResponseData.error("页面已失效，请重新登录！");
} }
Wrapper wrapper = new EntityWrapper<>(); Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id",orderId); wrapper.eq("id", orderId);
Order order = orderMapper.selectById(orderId); Order order = orderMapper.selectById(orderId);
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
int xb = order.getXbType(); int xb = order.getXbType();
if("0".equals(type)){ if ("0".equals(type)) {
if(xb == 1){ if (xb == 1) {
dataMapping.put("order_status", "待配送"); dataMapping.put("order_status", "待配送");
dataMapping.put("send_type", "快递"); dataMapping.put("send_type", "快递");
}else { } else {
dataMapping.put("order_status", "待选号"); dataMapping.put("order_status", "待选号");
dataMapping.put("send_type", "快递"); dataMapping.put("send_type", "快递");
} }
} }
if("1".equals(type)){ if ("1".equals(type)) {
if(xb == 1){ if (xb == 1) {
dataMapping.put("order_status", "待活体"); dataMapping.put("order_status", "待活体");
dataMapping.put("send_type", "送货上门"); dataMapping.put("send_type", "送货上门");
}else { } else {
dataMapping.put("order_status", "待选号"); dataMapping.put("order_status", "待选号");
dataMapping.put("send_type", "送货上门"); dataMapping.put("send_type", "送货上门");
} }
} }
Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
if(integer == 0){ if (integer == 0) {
return ResponseData.error("实名提交失败！"); return ResponseData.error("实名提交失败！");
}else { } else {
//user.getName() //user.getName()
orderMapper.inserOrderHis(orderId,"实名提交成功，"+dataMapping.get("order_status"),new Date(),"测试"); orderMapper.inserOrderHis(orderId, "实名提交成功，" + dataMapping.get("order_status"), new Date(), "测试");
return ResponseData.success("实名提交成功！"); return ResponseData.success("实名提交成功！");
} }
} }
...@@ -189,40 +193,49 @@ public class supervisorController extends BaseController { ...@@ -189,40 +193,49 @@ public class supervisorController extends BaseController {
* @return * @return
*/ */
@RequestMapping(value = "daiXuanHaoUpdate", method = RequestMethod.POST) @RequestMapping(value = "daiXuanHaoUpdate", method = RequestMethod.POST)
public ResponseData<String> daiXuanHaoUpdate(@RequestParam("orderId") String orderId,@RequestParam("businessNumber") String businessNumber,@RequestParam(value = "iccid",required = false) String iccid) { public ResponseData<String> daiXuanHaoUpdate(@RequestParam("orderId") String orderId, @RequestParam("businessNumber") String businessNumber, @RequestParam(value = "iccid", required = false) String iccid) {
/* ShiroUser user = getShiroUser(); /* ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限"); return ResponseData.error("无数据权限");
}*/ }*/
if(StringUtils.isNotBlank(orderId) ){ if (StringUtils.isNotBlank(orderId)) {
ResponseData<String> verification = verification(orderId); ResponseData<String> verification = verification(orderId);
if(!verification.isSuccess()){ if (!verification.isSuccess()) {
return ResponseData.error("订单不存在或异常！"); return ResponseData.error("订单不存在或异常！");
} }
}else { } else {
return ResponseData.error("页面已失效，请重新登录！"); return ResponseData.error("页面已失效，请重新登录！");
} }
Order order = orderMapper.selectById(orderId); Order order = orderMapper.selectById(orderId);
if(StringUtils.isBlank(businessNumber)){ if (StringUtils.isBlank(businessNumber)) {
return ResponseData.error("请输入办理号码！"); return ResponseData.error("请输入办理号码！");
} }
String s = yZPlaceAnOrder(orderId, businessNumber, iccid);
Map map = JSON.parseObject(s, Map.class);
if(s==null){
return ResponseData.error("选号失败！");
}
if(StringUtils.isNotBlank(map.get("msg").toString())){
orderMapper.inserOrderHis(orderId, "选号提交失败，" + map.get("msg").toString(), new Date(), "测试");
return ResponseData.error(map.get("msg").toString());
}
Wrapper wrapper = new EntityWrapper<>(); Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id",orderId); wrapper.eq("id", orderId);
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
if("快递".equals(order.getSendType())){ dataMapping.put("order_id", map.get("orderNumber").toString());
if ("快递".equals(order.getSendType())) {
dataMapping.put("order_status", "审核中"); dataMapping.put("order_status", "审核中");
dataMapping.put("business_iccid", iccid); dataMapping.put("business_iccid", iccid);
dataMapping.put("business_number", businessNumber); } else {
}else {
dataMapping.put("order_status", "已完成"); dataMapping.put("order_status", "已完成");
dataMapping.put("business_number", businessNumber);
} }
dataMapping.put("business_number", businessNumber);
Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
if(integer == 0){ if (integer == 0) {
return ResponseData.error("选号提交失败！"); return ResponseData.error("选号提交失败！");
}else { } else {
//user.getName() //user.getName()
orderMapper.inserOrderHis(orderId,"选号提交成功，"+dataMapping.get("order_status"),new Date(),"测试"); orderMapper.inserOrderHis(orderId, "选号提交成功，" + dataMapping.get("order_status"), new Date(), "测试");
return ResponseData.success("选号提交成功！"); return ResponseData.success("选号提交成功！");
} }
} }
...@@ -234,103 +247,103 @@ public class supervisorController extends BaseController { ...@@ -234,103 +247,103 @@ public class supervisorController extends BaseController {
* @return * @return
*/ */
@RequestMapping(value = "daiPeiSongUpdate", method = RequestMethod.POST) @RequestMapping(value = "daiPeiSongUpdate", method = RequestMethod.POST)
public ResponseData<String> daiPeiSongUpdate(@RequestParam("orderId") String orderId,@RequestParam("kuaidiOrder") String kuaidiOrder,@RequestParam(value = "expressDelivery") String expressDelivery) { public ResponseData<String> daiPeiSongUpdate(@RequestParam("orderId") String orderId, @RequestParam("kuaidiOrder") String kuaidiOrder, @RequestParam(value = "expressDelivery") String expressDelivery) {
/* ShiroUser user = getShiroUser(); /* ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限"); return ResponseData.error("无数据权限");
}*/ }*/
if(StringUtils.isNotBlank(orderId) ){ if (StringUtils.isNotBlank(orderId)) {
ResponseData<String> verification = verification(orderId); ResponseData<String> verification = verification(orderId);
if(!verification.isSuccess()){ if (!verification.isSuccess()) {
return ResponseData.error("订单不存在或异常！"); return ResponseData.error("订单不存在或异常！");
} }
}else { } else {
return ResponseData.error("页面已失效，请重新登录！"); return ResponseData.error("页面已失效，请重新登录！");
} }
Order order = orderMapper.selectById(orderId); Order order = orderMapper.selectById(orderId);
if(StringUtils.isBlank(kuaidiOrder)){ if (StringUtils.isBlank(kuaidiOrder)) {
return ResponseData.error("请输入快递单号！"); return ResponseData.error("请输入快递单号！");
} }
if(StringUtils.isBlank(expressDelivery)){ if (StringUtils.isBlank(expressDelivery)) {
return ResponseData.error("请选择快递公司！"); return ResponseData.error("请选择快递公司！");
} }
Wrapper wrapper = new EntityWrapper<>(); Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id",orderId); wrapper.eq("id", orderId);
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
int xbType = order.getXbType(); int xbType = order.getXbType();
if(xbType == 1){ if (xbType == 1) {
dataMapping.put("order_status", "待活体"); dataMapping.put("order_status", "待活体");
}else { } else {
dataMapping.put("order_status", "已完成"); dataMapping.put("order_status", "已完成");
} }
dataMapping.put("company", expressDelivery); dataMapping.put("company", expressDelivery);
dataMapping.put("kuaidi_order", kuaidiOrder); dataMapping.put("kuaidi_order", kuaidiOrder);
Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
if(integer == 0){ if (integer == 0) {
return ResponseData.error("配送方式提交失败！"); return ResponseData.error("配送方式提交失败！");
}else { } else {
//user.getName() //user.getName()
orderMapper.inserOrderHis(orderId,"提交成功，"+dataMapping.get("order_status"),new Date(),"测试"); orderMapper.inserOrderHis(orderId, "提交成功，" + dataMapping.get("order_status"), new Date(), "测试");
return ResponseData.success("配送方式提交成功！"); return ResponseData.success("配送方式提交成功！");
} }
} }
/** /**
* 验证订单 * 验证订单
*
* @param orderId * @param orderId
* @return * @return
*/ */
public ResponseData<String> verification(String orderId) { public ResponseData<String> verification(String orderId) {
Wrapper wrapper = new EntityWrapper<>(); Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id",orderId); wrapper.eq("id", orderId);
List list = orderMapper.selectList(wrapper); List list = orderMapper.selectList(wrapper);
if(list.size() == 1){ if (list.size() == 1) {
return ResponseData.success("ok"); return ResponseData.success("ok");
}else if(list.size() == 0){ } else if (list.size() == 0) {
return ResponseData.error("订单不存在！"); return ResponseData.error("订单不存在！");
}else { } else {
return ResponseData.error("订单异常！"); return ResponseData.error("订单异常！");
} }
} }
/** /**
* 预制卡下单 * 预制卡下单
*
* @param orderId * @param orderId
* @param businessNumber * @param businessNumber
* @param iccid * @param iccid
* @return * @return
*/ */
public String yZPlaceAnOrder(String orderId,String businessNumber,String iccid){ public String yZPlaceAnOrder(String orderId, String businessNumber, String iccid) {
Order order = orderMapper.selectById(orderId); Order order = orderMapper.selectById(orderId);
YsmUser ysmUser = ysmUserMapper.selectById(order.getHehuorenId()); String s = orderMapper.selectYsmById(order.getHehuorenId());
YsmUser ysmUser = ysmUserMapper.selectById(s);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("ysmUser",ysmUser.getUserName()); map.put("ysmUser", ysmUser.getUserName());
map.put("timeStr",new Date().getTime());// 时间戳（YYYYMMDDHHMMSS），必填 map.put("userName", order.getCustomerName());// 客户姓名，必填// 联系人，必填
map.put("userName",order.getCustomerName());// 客户姓名，必填// 联系人，必填 map.put("linkPhone", order.getContactNumber());// 客户(代办人)电话，必填
map.put("linkPhone",order.getContactNumber());// 客户(代办人)电话，必填 map.put("idCard", order.getIdCard());
map.put("idCard",order.getIdCard());
// map.put("orderNum",order.getUserName());//通过API接口下单，必须传入一个外部接入商的订单编号,该编号与智能营销系统编号一一对应
String[] split = order.getSite().split("/"); String[] split = order.getSite().split("/");
map.put("sheng",split[0]);// 配送地址-省，必填 map.put("sheng", split[0]);
map.put("shi",split[1]);// 配送地址-市，必填 map.put("shi", split[1]);
map.put("xian",split[2]); map.put("xian", split[2]);
map.put("address",order.getAddress()); map.put("address", order.getAddress());
// map.put("productId",order.getUserName()); map.put("iccId", iccid);
map.put("iccId",iccid); map.put("orderPhone", order.getBusinessNumber());
// map.put("salesId",order.getUserName());// 收费项ID，选填；请通过销售品列表接口获取，若不填表示终端补收款 map.put("orderNum", order.getOrderNumber());
map.put("imgUrl1", order.getIdCardz().replace(REPLACE,"enclosure"));
// map.put("orderPhone",order.getUserName()); map.put("imgUrl2", order.getIdCardf().replace(REPLACE,"enclosure"));
map.put("imgUrl1",order.getIdCardz()); map.put("imgUrl3", order.getIdCardzs().replace(REPLACE,"enclosure"));
map.put("imgUrl2",order.getIdCardf()); map.put("imgUrl4", order.getIdCardzs().replace(REPLACE,"enclosure"));
map.put("imgUrl3",order.getIdCardzs()); map.put("sign", ysmUser.getSign());
map.put("cardType",order.getKapin());
map.put("imgUrl4",order.getStudenCard());
map.put("sign",ysmUser.getSign());
try { try {
return OrderManage.sendAitransOrder(map); OrderManage orderManage = new OrderManage();
}catch (Exception e){ return orderManage.sendOrder(map);
log.info("预制卡下单失败",e.getMessage()); } catch (Exception e) {
log.info("预制卡下单失败", e.getMessage());
} }
return null; return null;
} }
} }
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