bug fix

src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java

@@ -640,6 +640,7 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
             return false;
         }
 
+
         TaCustomer customer = taCustomerMapper.selectById(customerId);
         if (null == customer) {
             return false;
@@ -649,42 +650,50 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         if (null == taMainUsherRecord) {
             return false;
         }
-        
-        //原本有人脸先删在增
-        if (!StringUtils.isEmpty(customer.getAvatar())){
-            //阿里云删除人脸
-            cameraService.deleteFace(taMainUsherRecord.getPersonId());
-        }
-        
-        if (StringUtils.isEmpty(params.getString("avatar"))) {
-            customer.setAvatar(params.getString("avatar"));
-            taMainUsherRecord.setAvatar(params.getString("avatar"));
+
+        Integer newPerson = params.getInteger("personId");
+        Integer orignPerson = taMainUsherRecord.getPersonId();
+        if (orignPerson != newPerson) {
             //解除人脸关系
-            QueryWrapper<TaCustomerMap> customerMapQueryWrapper = new QueryWrapper<>();
-            customerMapQueryWrapper.eq("person_id",taMainUsherRecord.getPersonId());
-            taCustomerMapMapper.delete(customerMapQueryWrapper);
-            taMainUsherRecord.setPersonId(null);
-        }else {
-            customer.setAvatar(params.getString("avatar"));
-            taMainUsherRecord.setAvatar(params.getString("avatar"));
-            // 修改人脸并下发
-            TaPerson taPerson = iTaPersonService.getByIdOrReal(taMainUsherRecord.getPersonId());
-            if (null == taPerson) {
-                return false;
+            if (null != orignPerson) {
+                QueryWrapper<TaCustomerMap> customerMapQueryWrapper = new QueryWrapper<>();
+                customerMapQueryWrapper.eq("customer_id", customerId);
+                customerMapQueryWrapper.eq("person_id", orignPerson);
+                taCustomerMapMapper.delete(customerMapQueryWrapper);
+            }
+
+            // 生成新的人脸关系
+            if (null != newPerson) {
+                QueryWrapper<TaCustomerMap> wrapper = new QueryWrapper<>();
+//            wrapper.eq("customer_id", customerId);
+                wrapper.eq("person_id", newPerson);
+                List<TaCustomerMap> customerMapList = taCustomerMapMapper.selectList(wrapper);
+                if (null != customerMapList && customerMapList.size() > 0) {
+                    Integer custId = customerMapList.get(0).getCustomerId();
+                    if (customerMapList.size() > 1 || customerId != custId) {
+                        log.error("数据异常, 人员 {} 没有映射到 客户 {}", newPerson, customerId);
+                        return false;
+                    }
+                } else {
+                    TaCustomerMap taCustomerMap = new TaCustomerMap();
+                    taCustomerMap.setPersonId(newPerson);
+                    taCustomerMap.setCustomerId(customerId);
+                    taCustomerMapMapper.insert(taCustomerMap);
+                }
             }
-            taPerson.setAvatar(params.getString("avatar"));
-            iTaPersonService.updateById(taPerson);
-            cameraService.dispatchPerson(taPerson);
         }
-    
+
+        customer.setAvatar(params.getString("avatar"));
         customer.setPlateNumber(params.getString("plateNumber"));
         customer.setCarModel(params.getString("carModel"));
         customer.setCarColor(params.getString("carColor"));
         customer.setCarImage(params.getString("carImage"));
+        taMainUsherRecord.setAvatar(params.getString("avatar"));
         taMainUsherRecord.setPlateNumber(params.getString("plateNumber"));
         taMainUsherRecord.setCarModel(params.getString("carModel"));
         taMainUsherRecord.setColor(params.getString("carColor"));
         taMainUsherRecord.setCarImage(params.getString("carImage"));
+        taMainUsherRecord.setPersonId(newPerson);
     
         customer.setReceiver(params.getString("receiver"));
         taMainUsherRecord.setReceiver(params.getString("receiver"));