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

common/src/main/resources/com/winsun/mapper/mapping/OrderMapper.xml

@@ -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;
 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,9 +1610,14 @@ 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){
-                continue;
+            if(orderByNumber == null){
+                error.append("没找到对应的合伙人");
+                return ResponseData.error(error.toString(), "导入失败");
             }
             }
+
+
+            String phone = orderByNumber.get(0).getBusinessNumber();
+            if (businessNumber.equals(orderByNumber.get(0).getBusinessNumber())){
                 Order dataOrder = new Order();
                 Order dataOrder = new Order();
                 dataOrder.setId(orderByNumber.get(0).getId());
                 dataOrder.setId(orderByNumber.get(0).getId());
                 dataOrder.setBusinessNumber(String.valueOf(businessNumber));
                 dataOrder.setBusinessNumber(String.valueOf(businessNumber));
@@ -1643,7 +1649,7 @@ public class OrderController extends BaseController {
                                 map1.put("idCardUrl3", orderData.getIdCardzs());
                                 map1.put("idCardUrl3", orderData.getIdCardzs());
                                 map1.put("cardType", orderData.getKapin());
                                 map1.put("cardType", orderData.getKapin());
 
 
-                            if (orderData.getPackageId().equals("49")) {
+                                if ("49".equals(orderData.getPackageId())) {
                                     map1.put("userName", orderData.getParentName());
                                     map1.put("userName", orderData.getParentName());
                                     map1.put("idCardUrl4", orderData.getIdCardzs());
                                     map1.put("idCardUrl4", orderData.getIdCardzs());
                                 } else {
                                 } else {
@@ -1705,15 +1711,19 @@ public class OrderController extends BaseController {
 
 
                 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) {
-                number++;
-            } else {
+                if (integer != 1) {
                     error.append("第" + (i + 1) + "行的更新失败,");
                     error.append("第" + (i + 1) + "行的更新失败,");
+                    //number++;
+                } else {
+
+                }
+            }else {
+                error.append("第" + (i + 1) + "行中数据更新失败(订单编号与办理号码不一致),");
             }
             }
         }
         }
         error.append("成功更新" + number + "条数据！");
         error.append("成功更新" + number + "条数据！");