原溪2.2

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

@@ -10,9 +10,11 @@ import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.SysUser;
 import com.huiju.welcome.model.TaFirstUsherRecord;
+import com.huiju.welcome.model.TaMainUsherRecord;
 import com.huiju.welcome.model.TaVisitorAppointment;
 import com.huiju.welcome.model.TaWechatUser;
 import com.huiju.welcome.service.ISysUserService;
+import com.huiju.welcome.service.ITaMainUsherRecordService;
 import com.huiju.welcome.service.ITaVisitorAppointmentService;
 import com.huiju.welcome.service.ITaWechatUserService;
 import com.huiju.welcome.utils.*;
@@ -28,6 +30,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -49,6 +52,9 @@ public class TaVisitorAppointmentController extends BaseController {
 
     @Autowired
     ISysUserService iSysUserService;
+    
+    @Autowired
+    private ITaMainUsherRecordService mainUsherRecordService;
 
     @GetMapping("/appointment")
     public ResponseBean list(
@@ -88,7 +94,13 @@ public class TaVisitorAppointmentController extends BaseController {
         if (resp.getCode() != HttpStatus.SC_OK) {
             return resp;
         }
-
+        
+        //校验7天是否可预约
+        List<TaMainUsherRecord> mainUsherRecordList = mainUsherRecordService.selectByPhoneAndPlatenumber(taVisitorAppointment.getPhone(),taVisitorAppointment.getPlatNumber());
+        if (mainUsherRecordList.size() < 1){
+            return ResponseBean.error("七天之内不能重复预约", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+        }
+        
         TaWechatUser user = iTaWechatUserService.getById(Integer.valueOf(JWTUtils.getSubject(request)));
         SysUser sysUser = iSysUserService.getById(user.getPersonId());
         taVisitorAppointment.setCreateUser(sysUser.getUserId());

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

@@ -35,4 +35,6 @@ public interface TaMainUsherRecordMapper extends BaseMapper<TaMainUsherRecord> {
     Integer getRecIdByCustomerIdCurrentDate(@Param("customerId")Integer customerId);
     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);
 }

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

@@ -56,4 +56,6 @@ public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
     List<UsherRecordExcel> getCustomersEqualCustomerPageExcel(String personName, String phone, String receiver, String customerType, Integer customerSource, Date startTime,Date endTime);
 
     IPage<TaMainUsherRecord> usherRecords(String personName, String phone, String receiver, String customerType, Integer customerSource, Date startTime, Date endTime, Integer pageNum, Integer pageSize);
+	
+	List<TaMainUsherRecord> selectByPhoneAndPlatenumber(String phone, String platNumber);
 }

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

@@ -649,50 +649,28 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         if (null == taMainUsherRecord) {
             return false;
         }
-
-        boolean changed = false;
-        if (!StringUtils.isEmpty(params.getString("avatar"))) {
-            customer.setAvatar(params.getString("avatar"));
-            taMainUsherRecord.setAvatar(params.getString("avatar"));
-
-            // 修改人脸并下发
-            TaPerson taPerson = iTaPersonService.getByIdOrReal(taMainUsherRecord.getPersonId());
-            if (null == taPerson) {
-                return false;
-            }
-            taPerson.setAvatar(params.getString("avatar"));
-            iTaPersonService.updateById(taPerson);
-            cameraService.dispatchPerson(taPerson);
-
-            changed = true;
-        }
-
-        if (!StringUtils.isEmpty(params.getString("plateNumber"))) {
-            customer.setPlateNumber(params.getString("plateNumber"));
-            customer.setCarModel(params.getString("carModel"));
-            customer.setCarColor(params.getString("carColor"));
-            customer.setCarImage(params.getString("carImage"));
-            taMainUsherRecord.setPlateNumber(params.getString("plateNumber"));
-            taMainUsherRecord.setCarModel(params.getString("carModel"));
-            taMainUsherRecord.setColor(params.getString("carColor"));
-            taMainUsherRecord.setCarImage(params.getString("carImage"));
-            changed = true;
-        }
-
-        if (!StringUtils.isEmpty(params.getString("receiver"))) {
-            customer.setReceiver(params.getString("receiver"));
-            taMainUsherRecord.setReceiver(params.getString("receiver"));
-            changed = true;
+        
+        if (StringUtils.isEmpty(params.getString("avatar"))) {
+           //清空阿里云头像
         }
+    
+        customer.setPlateNumber(params.getString("plateNumber"));
+        customer.setCarModel(params.getString("carModel"));
+        customer.setCarColor(params.getString("carColor"));
+        customer.setCarImage(params.getString("carImage"));
+        taMainUsherRecord.setPlateNumber(params.getString("plateNumber"));
+        taMainUsherRecord.setCarModel(params.getString("carModel"));
+        taMainUsherRecord.setColor(params.getString("carColor"));
+        taMainUsherRecord.setCarImage(params.getString("carImage"));
+    
+        customer.setReceiver(params.getString("receiver"));
+        taMainUsherRecord.setReceiver(params.getString("receiver"));
 
-        if (changed) {
-            boolean a = taCustomerMapper.updateById(customer) > 0;
-            boolean b = taMainUsherRecordMapper.updateById(taMainUsherRecord) > 0;
-
-            return a && b;
-        }
+        
+        boolean a = taCustomerMapper.updateById(customer) > 0;
+        boolean b = taMainUsherRecordMapper.updateById(taMainUsherRecord) > 0;
 
-        return false;
+        return a && b;
     }
 
     private TaCustomer newCustomerByPerson(TaPerson taPerson) throws Exception {

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

@@ -76,6 +76,9 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
 
     @Autowired
     IMessageService iMessageService;
+    
+    @Autowired
+    private SysParamMapper sysParamMapper;
 
     @Override
     public boolean updateNormal(List<TaMainUsherRecord> records) {
@@ -720,4 +723,15 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
         page.setCurrent(pageNum == null ? 1 : pageNum);
         return taMainUsherRecordMapper.usherRecords(page,personName,phone,receiver,customerType,customerSource,startTime,endTime);
     }
+    
+    @Override
+    public List<TaMainUsherRecord> selectByPhoneAndPlatenumber(String phone, String platNumber) {
+        List<TaMainUsherRecord> taMainUsherRecordList = new ArrayList<>();
+        if (StringUtils.isEmpty(phone) && StringUtils.isEmpty(platNumber)){
+            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);
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.huiju.welcome.utils;
 
+import java.io.Serializable;
+
 public class CommConstant {
 
     // 置业
@@ -53,4 +55,9 @@ public class CommConstant {
      * 未归属
      */
     public final static String CUSTOMER_UNATTRIBUTION = "unattribution";
+    
+    /**
+     * 最大预约到访时间
+     */
+    public static final String APPOINTMENT_VISIT_TIME = "appointment-visit-time";
 }

src/main/resources/mapper/TaMainUsherRecordMapper.xml

@@ -134,4 +134,17 @@ WHERE
         </where>
         order by t.visite_date desc
     </select>
+
+    <select id="getAfterDaysList" resultType="com.huiju.welcome.model.TaMainUsherRecord">
+        select  * from  ta_main_usher_record where 1=1
+        <if test="phone !=null and phone != ''">
+            and phone = #{phone}
+        </if>
+        <if test="plateNumber !=null and plateNumber != ''">
+            and plate_number = #{plateNumber}
+        </if>
+        <if test="afterDays != null">
+            and DATE_FORMAT(visite_date, '%Y-%m-%d' ) = DATE_FORMAT(#{afterDays}, '%Y-%m-%d' )
+        </if>
+    </select>
 </mapper>