bug

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

@@ -97,7 +97,7 @@ public class TaVisitorAppointmentController extends BaseController {
         
         //校验7天是否可预约
         List<TaMainUsherRecord> mainUsherRecordList = mainUsherRecordService.selectByPhoneAndPlatenumber(taVisitorAppointment.getPhone(),taVisitorAppointment.getPlatNumber());
-        if (mainUsherRecordList.size() < 1){
+        if (mainUsherRecordList.size() > 0){
             return ResponseBean.error("七天之内不能重复预约", HttpStatus.SC_INTERNAL_SERVER_ERROR);
         }
         

src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java

@@ -36,5 +36,5 @@ public interface TaMainUsherRecordMapper extends BaseMapper<TaMainUsherRecord> {
     IPage<TaMainUsherRecord> usherRecords(IPage<TaMainUsherRecord>pg, @Param("personName") String personName, @Param("phone") String phone, @Param("receiver") String receiver, @Param("customerType") String customerType, @Param("customerSource") Integer customerSource, @Param("startTime") Date startTime, @Param("endTime")Date endTime);
     List<TaMainUsherRecord> getCustomersEqualCustomerPageExcel(@Param("personName") String personName, @Param("phone") String phone, @Param("receiver") String receiver, @Param("customerType") String customerType, @Param("customerSource") Integer customerSource, @Param("startTime")Date startTime,@Param("endTime")Date endTime);
 	
-	List<TaMainUsherRecord> getAfterDaysList(@Param("phone") String phone,@Param("platNumber") String platNumber,@Param("afterDays") LocalDateTime afterDays);
+	List<TaMainUsherRecord> getAfterDaysList(@Param("phone") String phone,@Param("plateNumber") String plateNumber,@Param("afterDays") LocalDateTime afterDays);
 }

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

@@ -225,4 +225,7 @@ public class TaCustomer implements Serializable {
     private String receiver;
 
     private Integer customerSource;
+    
+    @TableField(exist = false)
+    private Integer personId;
 }

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

@@ -725,13 +725,13 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     }
     
     @Override
-    public List<TaMainUsherRecord> selectByPhoneAndPlatenumber(String phone, String platNumber) {
+    public List<TaMainUsherRecord> selectByPhoneAndPlatenumber(String phone, String plateNumber) {
         List<TaMainUsherRecord> taMainUsherRecordList = new ArrayList<>();
-        if (StringUtils.isEmpty(phone) && StringUtils.isEmpty(platNumber)){
+        if (StringUtils.isEmpty(phone) && StringUtils.isEmpty(plateNumber)){
             return taMainUsherRecordList;
         }
         SysParam sysParam = sysParamMapper.selectById(CommConstant.APPOINTMENT_VISIT_TIME);
         LocalDateTime afterDays = LocalDateTime.now().plusDays(Long.valueOf(sysParam.getValue()));
-        return taMainUsherRecordMapper.getAfterDaysList(phone,platNumber,afterDays);
+        return taMainUsherRecordMapper.getAfterDaysList(phone,plateNumber,afterDays);
     }
 }

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

@@ -258,6 +258,15 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
     @Override
     public TaPerson newPersonByFront(TaCustomer taCustomer) {
+        if (null != taCustomer.getPersonId()){
+            TaPerson taPerson = new TaPerson();
+            taPerson.setPersonId(taCustomer.getPersonId());
+            // 直接是VIP
+            taPerson.setTypeId(2);
+            taPersonMapper.updateById(taPerson);
+            return taPerson;
+        }
+        
         TaPerson taPerson = new TaPerson();
         taPerson.setAvatar(taCustomer.getAvatar());
         taPerson.setPhone(taCustomer.getPhone());

src/main/resources/mapper/TaVisitingLogMapper.xml

@@ -82,15 +82,18 @@
 
     <select id="selectVisitingList" resultType="com.huiju.welcome.model.TaVisitingLog">
         SELECT
-            *
+            t.create_date as visite_date,
+            t.real_id as real_person,
+            t.avatar
         FROM
-            ta_visiting_log t
+            ta_person t
         WHERE
-            NOT EXISTS ( SELECT * FROM ta_customer_map s WHERE t.person_id = s.person_id OR t.real_person = s.person_id )
-            AND visite_date >= #{todayBegin}
+            NOT EXISTS ( SELECT * FROM ta_customer_map s WHERE t.person_id = s.person_id OR t.real_id = s.person_id )
+            and t.avatar is not null
+            AND t.create_date >= #{todayBegin}
         GROUP BY
-            real_person
+            t.real_id
         ORDER BY
-            visite_date DESC
+            t.create_date DESC
     </select>
 </mapper>

src/main/resources/mapper/TaVisitorAppointmentMapper.xml

@@ -47,9 +47,6 @@
             <if test='null != identity and identity == "channel_manager"'>
                 AND s.user_identity = 'channel_manager'
             </if>
-            <if test='null != identity and identity != "channel_manager"'>
-                AND s.user_identity in ('consultant', 'consultant_manager')
-            </if>
             <if test="nameOrPhone !=null and nameOrPhone !=''">
                 AND ( t.person_name LIKE CONCAT('%',#{nameOrPhone},'%') OR t.phone LIKE CONCAT('%',#{nameOrPhone},'%') )
             </if>