Commit ceb990eb by 伍思炜

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

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