Merge branch 'v4' of http://git.ycjcjy.com/welcome/service-welcome3 into v4

src/main/java/com.huiju.welcome/controller/TaCustomerController.java

@@ -12,6 +12,7 @@ import com.huiju.welcome.service.*;
 import com.huiju.welcome.utils.DateUtils;
 import com.huiju.welcome.utils.JWTUtils;
 import com.huiju.welcome.utils.StatusUtils;
+import com.huiju.welcome.utils.StringUtils;
 import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,6 +58,9 @@ public class TaCustomerController extends BaseController {
     @Autowired
     ISysUserService iSysUserService;
 
+    @Autowired
+    ITaCarService iTaCarService;
+
     /**
      * 保存对象
      * @param taCustomer 实体对象
@@ -77,6 +81,12 @@ public class TaCustomerController extends BaseController {
         taCustomer.setConsultantId(user.getUserId());
         taCustomer.setRealtyConsultant(user.getUsername());
 
+        if (!StringUtils.isEmpty(taCustomer.getPlateNumber())) {
+            TaCar taCar = iTaCarService.getById(taCustomer.getPlateNumber());
+            taCustomer.setCarColor(taCar.getColor());
+            taCustomer.setCarModel(taCar.getCarModel());
+        }
+
         ResponseBean responseBean = new ResponseBean();
         try {
             // 会员保存之前, 先保存人员
@@ -113,7 +123,9 @@ public class TaCustomerController extends BaseController {
             iTaCustomerMapService.saveBatch(customerMapList);
 
             // 新增会员来访信息
-            iTaMainUsherRecordService.newRecordByConsultant(taCustomer, follows);
+            if (!StringUtils.isEmpty(taCustomer.getAvatar())) {
+                iTaMainUsherRecordService.newRecordByConsultant(taCustomer, follows);
+            }
 
             taCustomer.setStatus(StatusUtils.Normal);
             taCustomer.setCreateDate(LocalDateTime.now());
@@ -168,6 +180,12 @@ public class TaCustomerController extends BaseController {
         TaCustomer taCustomer = JSONObject.parseObject(paramStr, TaCustomer.class);
         JSONArray follows = params.getJSONArray("follows");
 
+        if (!StringUtils.isEmpty(taCustomer.getPlateNumber()) && StringUtils.isEmpty(taCustomer.getCarModel())) {
+            TaCar taCar = iTaCarService.getById(taCustomer.getPlateNumber());
+            taCustomer.setCarColor(taCar.getColor());
+            taCustomer.setCarModel(taCar.getCarModel());
+        }
+
         ResponseBean responseBean = new ResponseBean();
         try {
 
@@ -200,7 +218,9 @@ public class TaCustomerController extends BaseController {
 //                taCustomer.setRemark(originRemark);
 //            }
 
-            iTaMainUsherRecordService.updateByCustomer(taCustomer, follows, JWTUtils.getSubject(request));
+            if (!StringUtils.isEmpty(taCustomer.getAvatar())) {
+                iTaMainUsherRecordService.updateByCustomer(taCustomer, follows, JWTUtils.getSubject(request));
+            }
 
             //taCustomer.setRemark(null);
             if (iTaCustomerService.updateById(taCustomer)){
@@ -241,6 +261,7 @@ public class TaCustomerController extends BaseController {
 
             responseBean.addSuccess(cust);
         }catch (Exception e){
+            e.printStackTrace();
             logger.error("taCustomerGetByID -=- {}",e.toString());
             responseBean.addError(e.getMessage());
         }

src/main/java/com.huiju.welcome/controller/TaGoodsOrdersController.java

@@ -49,6 +49,8 @@ public class TaGoodsOrdersController extends BaseController {
     public ITaMainUsherRecordService iTaMainUsherRecordService;
     @Autowired
     public ITaCustomerService iTaCustomerService;
+    @Autowired
+    public ITaWechatUserService iTaWechatUserService;
 
 
     /**
@@ -61,7 +63,9 @@ public class TaGoodsOrdersController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             String userId = JWTUtils.getSubject(request);
-            SysUser sysUser = iSysUserService.getById(userId);
+            TaWechatUser user = iTaWechatUserService.getById(userId);
+
+            SysUser sysUser = iSysUserService.getById(user.getPersonId());
             taGoodsOrders.setUserId(sysUser.getUserId());
             taGoodsOrders.setUserName(sysUser.getUsername());
             taGoodsOrders.setUserType(sysUser.getUserIdentity());
@@ -74,7 +78,7 @@ public class TaGoodsOrdersController extends BaseController {
                 //
                 TaCustomer cust = iTaCustomerService.getById(taGoodsOrders.getCustomerId());
                 if (cust != null) {
-                    boolean ok = iTaMainUsherRecordService.newRecordByConsultant(cust, null);
+                    boolean ok = iTaMainUsherRecordService.newRecordByConsultant(cust, new JSONArray());
 
                     if (!ok) {
                         return ResponseBean.error("更新客户到访失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);

src/main/java/com.huiju.welcome/controller/TaWechatUserController.java

@@ -94,7 +94,7 @@ public class TaWechatUserController extends BaseController {
             map.put("identity", "");
         } else if (null != taWechatUser.getPersonId()) {
             SysUser sysUser = iSysUserService.getById(taWechatUser.getPersonId());
-            if (StatusUtils.Normal == sysUser.getStatus()) {
+            if (null != sysUser && StatusUtils.Normal == sysUser.getStatus()) {
                 map.put("identity", sysUser.getUserIdentity());
             }
         }

src/main/java/com.huiju.welcome/model/TaCustomer.java

@@ -64,6 +64,8 @@ public class TaCustomer implements Serializable {
 
     private String realtyConsultant;
 
+    private String carColor;
+
     @TableField(exist = false)
     private List<TaPerson> group;
 

src/main/java/com.huiju.welcome/model/TaFirstUsherRecord.java

@@ -59,4 +59,6 @@ public class TaFirstUsherRecord implements Serializable {
     private String driverImage;
 
     private String licenseImage;
+
+    private String phone;
 }

src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaCustomer;
+import com.huiju.welcome.model.TaFirstUsherRecord;
 import com.huiju.welcome.model.TaMainUsherRecord;
 import com.huiju.welcome.model.TaPerson;
 
@@ -48,4 +49,6 @@ public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
     TaMainUsherRecord getTodayRecord(Integer customerId);
     
     boolean updateMainUsherRecord(TaMainUsherRecord taMainUsherRecord, Integer customerId, String subject);
+
+    TaMainUsherRecord newRecordByFirstUsher(TaFirstUsherRecord taFirstUsherRecord, TaCustomer taCustomer);
 }

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

@@ -115,7 +115,7 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
             if (null != personId && personId > 0) {
                 // 是否内部人员
                 TaPerson taPerson = iTaPersonService.getByIdOrReal(personId);
-                if (null != taPerson.getTypeId() && taPerson.getTypeId() == CommConstant.TYPE_INNER_PERSON) {
+                if (null != taPerson && null != taPerson.getTypeId() && taPerson.getTypeId() == CommConstant.TYPE_INNER_PERSON) {
                     taCarRecordMapper.insert(taCarRecord);
                     iTaCarService.newCarByDevice(taCarRecord);
                     return true;

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

@@ -50,6 +50,9 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
     @Autowired
     ITaMainUsherRecordService iTaMainUsherRecordService;
 
+    @Autowired
+    ITaFirstUsherRecordService iTaFirstUsherRecordService;
+
     @Autowired
     ITaVisitorAppointmentService iTaVisitorAppointmentService;
 
@@ -240,8 +243,9 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
 
     @Override
     public Map<String, Object> getHistoryRecBy(Map<String, Object> filters) {
+        String phone = filters.get("phone").toString();
         Map<String, Object> result = new HashMap<String, Object>(){{
-            put("phone", filters.get("phone").toString());
+            put("phone", phone);
         }};
 
         List<TaVisitorAppointment> appointments = iTaVisitorAppointmentService.getAppointmentsBy(filters);
@@ -255,7 +259,7 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
             result.put("customerId", "");
         }
 
-        List<TaCustomer> custs = taCustomerMapper.getSomeCustMayBe(null, filters.get("phone").toString());
+        List<TaCustomer> custs = taCustomerMapper.getSomeCustMayBe(null, phone);
         if (null != custs && custs.size() > 0) {
             result.put("source", "customer");
             result.put("name", custs.get(0).getCustomerName());
@@ -267,7 +271,22 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
             result.put("customerId", custs.get(0).getCustomerId());
         }
 
-        return result;
+        // 如果车牌不存在, 查询车辆来访记录
+        // 只使用最近的一次记录
+        if (null == result.get("plateNumber")) {
+            QueryWrapper<TaFirstUsherRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("phone", phone);
+            queryWrapper.ge("status", StatusUtils.Ready);
+            queryWrapper.orderByDesc("visite_date");
+            queryWrapper.last("limit 1");
+
+            TaFirstUsherRecord taFirstUsherRecord = iTaFirstUsherRecordService.getOne(queryWrapper);
+            if (null != taFirstUsherRecord && null != taFirstUsherRecord.getPlateNumber()) {
+                result.put("plateNumber", taFirstUsherRecord.getPlateNumber());
+            }
+        }
+
+      return result;
     }
 
     @Override

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

@@ -121,20 +121,37 @@ public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecor
         }
 
         // 查找客户
-        TaCustomer taCustomer = iTaCustomerService.getByPhoneOrPlate(null, taFirstUsherRecord.getPlateNumber());
+        TaCustomer taCustomer = iTaCustomerService.getByPhoneOrPlate(taFirstUsherRecord.getPhone(), taFirstUsherRecord.getPlateNumber());
         if (null == taCustomer) return true;
 
         // 更新车型
         if (null != taFirstUsherRecord.getCarModel()) {
             taCustomer.setCarModel(taFirstUsherRecord.getCarModel());
-            iTaCustomerService.updateById(taCustomer);
+            taCustomer.setCarColor(taFirstUsherRecord.getColor());
         }
 
+        // 更新车牌
+        if (StringUtils.isEmpty(taCustomer.getPlateNumber())) {
+            taCustomer.setPlateNumber(taFirstUsherRecord.getPlateNumber());
+        }
+
+        iTaCustomerService.updateById(taCustomer);
+
         // 更新到访记录
         TaMainUsherRecord taMainUsherRecord = iTaMainUsherRecordService.getTodayRecord(taCustomer.getCustomerId());
+        if (null == taMainUsherRecord) {
+            iTaMainUsherRecordService.newRecordByFirstUsher(taFirstUsherRecord, taCustomer);
+        } else {
+
+            if (null != taFirstUsherRecord.getCarModel()) {
+                taMainUsherRecord.setCarModel(taFirstUsherRecord.getCarModel());
+                taMainUsherRecord.setColor(taFirstUsherRecord.getColor());
+            }
+
+            if (StringUtils.isEmpty(taMainUsherRecord.getPlateNumber())) {
+                taMainUsherRecord.setPlateNumber(taFirstUsherRecord.getPlateNumber());
+            }
 
-        if (null != taMainUsherRecord && null != taFirstUsherRecord.getCarModel()) {
-            taMainUsherRecord.setCarModel(taFirstUsherRecord.getCarModel());
             iTaMainUsherRecordService.updateById(taMainUsherRecord);
         }
 
@@ -173,6 +190,14 @@ public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecor
 
     private void notifyConsultant(TaFirstUsherRecord taFirstUsherRecord) {
         String plateNumber = taFirstUsherRecord.getPlateNumber();
+//        String phone = taFirstUsherRecord.getPhone();
+
+//        TaCustomer taCustomer = iTaCustomerService.getByPhoneOrPlate(phone, plateNumber);
+//        if (null != taCustomer) {
+//            try {
+//                iTaCustomerService.notifyConsultant(taCustomer);
+//            } catch (Exception e) {}
+//        }
 
         // 依据车牌判断是否老客户来访
         if (!StringUtils.isEmpty(plateNumber)) {

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

@@ -109,7 +109,7 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
 
     @Override
     public boolean newRecordByConsultant(TaCustomer taCustomer, JSONArray follows) {
-        if (StringUtils.isEmpty(taCustomer.getRemark()) && (null == follows || follows.size() == 0)) {
+        if (StringUtils.isEmpty(taCustomer.getRemark()) && null == follows) {
             return false;
         }
 
@@ -147,6 +147,8 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
         taMainUsherRecord.setChannel(taCustomer.getChannel());
         taMainUsherRecord.setPurpose(taCustomer.getPurpose());
         taMainUsherRecord.setPlateNumber(taCustomer.getPlateNumber());
+        taMainUsherRecord.setCarModel(taCustomer.getCarModel());
+        taMainUsherRecord.setColor(taCustomer.getCarColor());
         taMainUsherRecord.setVisiteDate(LocalDateTime.now());
         taMainUsherRecord.setRemark(taCustomer.getRemark());
 
@@ -496,7 +498,35 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     
         return true;
     }
-    
+
+    @Override
+    public TaMainUsherRecord newRecordByFirstUsher(TaFirstUsherRecord taFirstUsherRecord, TaCustomer taCustomer) {
+        TaMainUsherRecord taMainUsherRecord = new TaMainUsherRecord();
+        taMainUsherRecord.setColor(taFirstUsherRecord.getColor());
+        taMainUsherRecord.setPlateNumber(taFirstUsherRecord.getPlateNumber());
+        taMainUsherRecord.setStatus(StatusUtils.Normal);
+        taMainUsherRecord.setAvatar(taFirstUsherRecord.getDriverImage());
+        taMainUsherRecord.setPhone(taFirstUsherRecord.getPhone());
+        taMainUsherRecord.setVisiteDate(taFirstUsherRecord.getVisiteDate());
+        taMainUsherRecord.setCarModel(taFirstUsherRecord.getCarModel());
+        taMainUsherRecord.setChannel(taFirstUsherRecord.getChannel());
+        taMainUsherRecord.setPurpose(taFirstUsherRecord.getPurpose());
+        taMainUsherRecord.setCarImage(taFirstUsherRecord.getCarImage());
+
+        if (null != taCustomer) {
+            taMainUsherRecord.setPersonId(taCustomer.getCustomerId());
+            taMainUsherRecord.setCustomerId(taCustomer.getCustomerId());
+            taMainUsherRecord.setConsultantId(taCustomer.getConsultantId());
+            taMainUsherRecord.setPersonName(taCustomer.getCustomerName());
+            taMainUsherRecord.setRealtyConsultant(taCustomer.getRealtyConsultant());
+            taMainUsherRecord.setSex(taCustomer.getSex());
+            taMainUsherRecord.setPhone(taCustomer.getPhone());
+        }
+
+        taMainUsherRecordMapper.insert(taMainUsherRecord);
+        return taMainUsherRecord;
+    }
+
     private TaMainUsherRecord newRecordByPerson(TaPerson taPerson) {
         TaMainUsherRecord taMainUsherRecord = new TaMainUsherRecord();
         taMainUsherRecord.setPersonName(taPerson.getName());

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

@@ -70,6 +70,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Autowired
     private ITaVisitingWordsService visitingWordsService;
 
+    @Autowired
+    private ITaCustomerService iTaCustomerService;
+
     @Autowired
     private XFYun xfYun;
     
@@ -368,7 +371,29 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         String words = taPerson.getWords();
         Integer sex = "2".equals(taPerson.getSex()) ? 2 : 1;
         String personName = taPerson.getName();
-        if (null == personName) personName = "";
+
+        // 是否有映射客户
+        TaCustomer taCustomer = iTaCustomerService.getSameByPerson(taPerson.getRealId());
+        if (null != taCustomer) {
+            if (null != taCustomer.getSex()) {
+                sex = taCustomer.getSex();
+            }
+
+            personName = taCustomer.getCustomerName();
+        }
+        if (null == personName || "".equals(personName)) {
+            personName = "";
+        } else {
+            // 客户名称只取姓
+            personName = personName.substring(0, 1);
+            if (1 == sex) {
+                personName += "先生";
+            } else {
+                personName += "女士";
+            }
+        }
+
+        taPerson.setName(personName);
 
         // 检查是不是有定制语音
         QueryWrapper<TaCustomWords> wrapper = new QueryWrapper<>();

src/main/java/com.huiju.welcome/utils/CommConstant.java

@@ -6,7 +6,7 @@ public class CommConstant {
     public final static String IDENTITY_MAINUSHER = "main-usher";
     public final static String IDENTITY_BARUSHER = "bar-usher";
 
-    public final static String PAGE_MY_CUSTOMER = "pages/client/myclient/myclient";
+    public final static String PAGE_MY_CUSTOMER = "pages/client/clientdetail/clientdetail";
 
     public final static String WECHAT_CLIENT_MINIAPP = "miniapp";
 

src/main/resources/mapper/TaCustomerMapper.xml

@@ -21,11 +21,10 @@
     <select id="customerPage" resultType="com.huiju.welcome.model.TaCustomer">
         select
         *,
-        tct.to_user_name as agentUserName,
-        tct.to_user_id as agentUserId,
-        tct.transfer_id as transferId
+        consultant_id as agentUserId,
+        realty_consultant as agentUserName,
+        "" as transferId
         from ta_customer tac
-        left join ta_customer_transfer tct on tac.customer_id = tct.customer_id
         <where>
             <if test="customerName !=null and customerName != ''">
                 and tac.customer_name LIKE CONCAT('%',#{customerName},'%')
@@ -39,7 +38,7 @@
                 and   tac.plate_number LIKE CONCAT('%',#{platNumber},'%')
             </if>
             <if test="agentUserId != null">
-                and tct.to_user_id = #{agentUserId}
+                and tac.consultant_id = #{agentUserId}
             </if>
         </where>
         order by create_date desc