Skip to content

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

移动订单导入方式(iccid填号) 更新反馈信息和校验导入信息与原订单信息中的办理号码

parent f6481ca0
Showing with 106 additions and 96 deletions
common/src/main/resources/com/winsun/mapper/mapping/OrderMapper.xml
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
order by create_time desc order by create_time desc
</select> </select>
<select id="selectOrderIdByOrderNumber" parameterType="String" resultType="com.winsun.bean.Order"> <select id="selectOrderIdByOrderNumber" parameterType="String" resultMap="broadBandOrder">
select * from hhr_order where order_number = #{orderNumber} select * from hhr_order where order_number = #{orderNumber}
</select> </select>
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
...@@ -62,6 +62,7 @@ import java.security.NoSuchAlgorithmException; ...@@ -62,6 +62,7 @@ import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.*; import java.util.*;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
...@@ -1609,111 +1610,120 @@ public class OrderController extends BaseController { ...@@ -1609,111 +1610,120 @@ public class OrderController extends BaseController {
String businessNumber = map.get("b").toString(); String businessNumber = map.get("b").toString();
String iccid = map.get("c").toString(); String iccid = map.get("c").toString();
List<Order> orderByNumber = orderMapper.selectOrderIdByOrderNumber(orderNumber); List<Order> orderByNumber = orderMapper.selectOrderIdByOrderNumber(orderNumber);
if(orderByNumber.size()==0){ if(orderByNumber == null){
continue; error.append("没找到对应的合伙人");
return ResponseData.error(error.toString(), "导入失败");
} }
Order dataOrder = new Order();
dataOrder.setId(orderByNumber.get(0).getId());
dataOrder.setBusinessNumber(String.valueOf(businessNumber)); String phone = orderByNumber.get(0).getBusinessNumber();
dataOrder.setBusinessIccid(String.valueOf(iccid)); if (businessNumber.equals(orderByNumber.get(0).getBusinessNumber())){
dataOrder.setSendType("快递"); Order dataOrder = new Order();
dataOrder.setOrderStatus("提交中"); dataOrder.setId(orderByNumber.get(0).getId());
try { dataOrder.setBusinessNumber(String.valueOf(businessNumber));
// 更新订单 dataOrder.setBusinessIccid(String.valueOf(iccid));
Integer num = orderMapper.updateById(dataOrder); dataOrder.setSendType("快递");
if (num > 0) { dataOrder.setOrderStatus("提交中");
executorService.execute(new Runnable() { try {
public void run() { // 更新订单
String id = dataOrder.getId(); Integer num = orderMapper.updateById(dataOrder);
Order orderData = orderMapper.selectById(dataOrder.getId()); if (num > 0) {
String hehuoren_id = orderData.getHehuorenId(); executorService.execute(new Runnable() {
String business_number = orderData.getBusinessNumber(); public void run() {
String business_iccid = orderData.getBusinessIccid(); String id = dataOrder.getId();
Map<String, Object> partnerById = orderMapper.findPartnerById(hehuoren_id); Order orderData = orderMapper.selectById(dataOrder.getId());
String name = orderData.getHehuorenName(); String hehuoren_id = orderData.getHehuorenId();
Map<String, Object> map1 = new HashMap<>(); String business_number = orderData.getBusinessNumber();
String business_iccid = orderData.getBusinessIccid();
int ysm = Integer.parseInt(partnerById.get("ysm").toString()); Map<String, Object> partnerById = orderMapper.findPartnerById(hehuoren_id);
Map<String, Object> ysmById = orderMapper.findYsmById(ysm); String name = orderData.getHehuorenName();
map1.put("ysmUser",ysmById.get("user_name")); Map<String, Object> map1 = new HashMap<>();
map1.put("sign",ysmById.get("sign"));
int ysm = Integer.parseInt(partnerById.get("ysm").toString());
map1.put("idCardUrl1", orderData.getIdCardz()); Map<String, Object> ysmById = orderMapper.findYsmById(ysm);
map1.put("idCardUrl2", orderData.getIdCardf()); map1.put("ysmUser",ysmById.get("user_name"));
map1.put("idCardUrl3", orderData.getIdCardzs()); map1.put("sign",ysmById.get("sign"));
map1.put("cardType", orderData.getKapin());
map1.put("idCardUrl1", orderData.getIdCardz());
if (orderData.getPackageId().equals("49")) { map1.put("idCardUrl2", orderData.getIdCardf());
map1.put("userName", orderData.getParentName()); map1.put("idCardUrl3", orderData.getIdCardzs());
map1.put("idCardUrl4", orderData.getIdCardzs()); map1.put("cardType", orderData.getKapin());
} else {
map1.put("userName", orderData.getCustomerName()); if ("49".equals(orderData.getPackageId())) {
map1.put("idCardUrl4", orderData.getStudenCard()); map1.put("userName", orderData.getParentName());
} map1.put("idCardUrl4", orderData.getIdCardzs());
map1.put("linkPhone", orderData.getContactNumber()); } else {
map1.put("idCard", orderData.getIdCard()); map1.put("userName", orderData.getCustomerName());
map1.put("orderPhone", business_number); map1.put("idCardUrl4", orderData.getStudenCard());
map1.put("iccId", business_iccid); }
map1.put("linkPhone", orderData.getContactNumber());
String site = orderData.getSite(); map1.put("idCard", orderData.getIdCard());
String[] split = site.split(" "); map1.put("orderPhone", business_number);
map1.put("iccId", business_iccid);
map1.put("sheng",split[0]); String site = orderData.getSite();
map1.put("shi",split[1]); String[] split = site.split(" ");
map1.put("xian",split[2]);
map1.put("address",orderData.getAddress()); map1.put("sheng",split[0]);
map1.put("shi",split[1]);
String result=""; map1.put("xian",split[2]);
result = sendOrder(map1);
map1.put("address",orderData.getAddress());
JSONObject resultDataJson = JSONObject.fromObject(result);
String orderNum = resultDataJson.getString("orderNumber"); String result="";
Order order = new Order(); result = sendOrder(map1);
order.setId(id);
order.setUpdateTime(new Date()); JSONObject resultDataJson = JSONObject.fromObject(result);
if (Is.isNoEmpty(orderNum)) { String orderNum = resultDataJson.getString("orderNumber");
order.setSendType("快递"); Order order = new Order();
order.setOrderStatus("审核中"); order.setId(id);
order.setOrderId(orderNum); order.setUpdateTime(new Date());
}else{ if (Is.isNoEmpty(orderNum)) {
order.setOrderStatus("异常单"); order.setSendType("快递");
String msg = resultDataJson.getString("msg"); order.setOrderStatus("审核中");
order.setMsg(msg); order.setOrderId(orderNum);
}else{
order.setOrderStatus("异常单");
String msg = resultDataJson.getString("msg");
order.setMsg(msg);
try {
orderMapper.inserOrderHis(id,"审核失败",new Date(),"智能平台审核");
} catch (Exception e) {
e.printStackTrace();
}
}
try { try {
orderMapper.inserOrderHis(id,"审核失败",new Date(),"智能平台审核"); Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("id", order.getId());
orderMapper.update(order, wrapper);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
try { });
Wrapper<Order> wrapper = new EntityWrapper<>(); }
wrapper.eq("id", order.getId()); number+=num;
orderMapper.update(order, wrapper); } catch (Exception e) {
} catch (Exception e) { e.printStackTrace();
e.printStackTrace();
}
}
});
} }
number+=num;
} catch (Exception e) {
e.printStackTrace();
}
try { try {
// 新增订单流转记录 // 新增订单流转记录
appMapper.inserOrderHis(dataOrder.getId(), "实名验证中", new Date(), user.getName()); integer = appMapper.inserOrderHis(dataOrder.getId(), "实名验证中", new Date(), user.getName());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
if (integer == 1) { if (integer != 1) {
number++; error.append("第" + (i + 1) + "行的更新失败,");
} else { //number++;
error.append("第" + (i + 1) + "行的更新失败,"); } else {
}
}else {
error.append("第" + (i + 1) + "行中数据更新失败(订单编号与办理号码不一致),");
} }
} }
error.append("成功更新" + number + "条数据！"); error.append("成功更新" + number + "条数据！");
......
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