Merge branch 'master' into master-background-manager

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempDTO.java

@@ -25,7 +25,16 @@ public class AppUserPositionTempDTO {
     private String name;
 
 
-    @ApiModelProperty(value = "职位id")
+    @ApiModelProperty(value = "身份id")
     private Integer positionId;
 
+    @ApiModelProperty(value = "员工职位id")
+    private Integer jobId;
+
+    @ApiModelProperty(value = "分公司id")
+    private Integer companyId;
+
+    @ApiModelProperty(value = "分公司")
+    private String companyName;
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempFindDTO.java

@@ -14,4 +14,5 @@ public class AppUserPositionTempFindDTO extends PageParam {
      private String phone;
      private String name;
      private Integer status;
+     private Integer companyId;
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserJobLevel.java

+package com.github.wxiaoqi.security.admin.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+
+/**
+ * 用户职位表
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-09 10:00:42
+ */
+@Data
+@Table(name = "app_user_job_level")
+public class AppUserJobLevel implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  主键id
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键id")
+    private Integer id;
+	
+	    /**
+     *  角色名称
+     */
+    @Column(name = "name")
+	@ApiModelProperty(value = "角色名称")
+    private String name;
+	
+	    /**
+     *  等级
+     */
+    @Column(name = "level")
+	@ApiModelProperty(value = "等级")
+    private Integer level;
+	
+
+    /**
+     *  状态：0-正常；1-禁用
+     */
+    @Column(name = "status")
+	@ApiModelProperty(value = "状态：0-正常；1-禁用")
+    private Integer status;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  更新时间
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+	
+	    /**
+     *  是否删除：0-正常；1-删除
+     */
+    @Column(name = "is_del")
+	@ApiModelProperty(value = "是否删除：0-正常；1-删除")
+    private Integer isDel;
+	
+
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserPositionTemp.java

@@ -43,6 +43,19 @@ public class AppUserPositionTemp implements Serializable {
 	@ApiModelProperty(value = "职位id")
     private Integer positionId;
 
+    @Column(name = "job_id")
+    @ApiModelProperty(value = "员工职位id")
+    private Integer jobId;
+
+
+    @Column(name = "company_id")
+    @ApiModelProperty(value = "分公司id")
+    private Integer companyId;
+
+    @Column(name = "company_name")
+    @ApiModelProperty(value = "分公司名称")
+    private String companyName;
+
 	@Column(name = "name")
 	@ApiModelProperty(value = "姓名")
 	private String name;
@@ -51,6 +64,11 @@ public class AppUserPositionTemp implements Serializable {
     @Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间", hidden = true )
     private Long crtTime;
+
+
+    @Column(name = "upd_time")
+    @ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
 	
 
     @Column(name = "is_del")

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserPositionTempVo.java

@@ -37,4 +37,18 @@ public class AppUserPositionTempVo {
 
     @ApiModelProperty(value = "创建时间", hidden = true )
     private Long crtTime;
+
+    @ApiModelProperty(value = "员工职位id")
+    private Integer jobId;
+
+    @ApiModelProperty(value = "员工职位名称")
+    private String jobName;
+
+
+    @ApiModelProperty(value = "分公司id")
+    private Integer companyId;
+
+
+    @ApiModelProperty(value = "分公司名称")
+    private String companyName;
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserJobLevelBiz.java

+package com.github.wxiaoqi.security.admin.biz;
+
+import com.github.wxiaoqi.security.admin.dto.UserPostionDTO;
+import com.github.wxiaoqi.security.admin.entity.AppUserJobLevel;
+import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
+import com.github.wxiaoqi.security.admin.mapper.AppUserJobLevelMapper;
+import com.github.wxiaoqi.security.admin.mapper.AppUserPositionMapper;
+import com.github.wxiaoqi.security.admin.vo.WalletPostionVo;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 用户身份职位表
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-09 10:00:42
+ */
+@Transactional
+@Service
+public class AppUserJobLevelBiz extends BaseBiz<AppUserJobLevelMapper, AppUserJobLevel> {
+
+
+    public Map<Integer, AppUserJobLevel> findJobIdAndJobMapByIds(List<Integer> jobIds) {
+        Map<Integer,AppUserJobLevel> postionMap = new HashMap<>();
+        List<AppUserJobLevel> data= mapper.selectByIdList(jobIds);
+        if(CollectionUtils.isEmpty(data)){
+            return postionMap;
+        }
+        postionMap = data.stream().collect(Collectors.toMap(AppUserJobLevel::getId, Function.identity()));
+        return postionMap;
+    }
+
+    public Map<Integer, String> findJobIdAndNameMap() {
+        List<AppUserJobLevel> postions = selectListAll();
+        return postions.stream().collect(Collectors.toMap(AppUserJobLevel::getId,AppUserJobLevel::getName));
+    }
+}
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionBiz.java

@@ -3,15 +3,12 @@ package com.github.wxiaoqi.security.admin.biz;
 import com.github.wxiaoqi.security.admin.dto.UserPostionDTO;
 import com.github.wxiaoqi.security.admin.vo.WalletPostionVo;
 import org.apache.commons.collections.CollectionUtils;
-import org.jsoup.select.Collector;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-
 import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
 import com.github.wxiaoqi.security.admin.mapper.AppUserPositionMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempDTO;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempFindDTO;
+import com.github.wxiaoqi.security.admin.entity.AppUserJobLevel;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
 import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
@@ -13,6 +14,8 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -51,12 +54,28 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
 
     private Map<Integer, String> postionIdAndNameMap;
 
+    @Autowired
+    private VehicleFeign vehicleFeign;
+
+    @Autowired
+    AppUserJobLevelBiz jobLevelBiz;
+
 
     public ObjectRestResponse add(AppUserPositionTempDTO appUserPositionTempDTO) {
         if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone()) || StringUtils.isBlank(appUserPositionTempDTO.getName())
                 || appUserPositionTempDTO.getPositionId() == null || appUserPositionTempDTO.getPositionId() == 0) {
             return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
         }
+        Integer companyId=appUserPositionTempDTO.getCompanyId();
+        String companyName=appUserPositionTempDTO.getCompanyName();
+       if (!(companyId!=null&&companyId>0&&StringUtils.isNotBlank(companyName)))
+           return  ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
+        BranchCompany branchCompany=vehicleFeign.companyId(companyName);
+        if (branchCompany==null){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
+        }
+        companyId=branchCompany.getId();
+        companyName=branchCompany.getName();
         String phone = appUserPositionTempDTO.getPhone();
         Integer id = appUserPositionTempDTO.getId() == null ? 0 : appUserPositionTempDTO.getId();
         Example example = new Example(AppUserPositionTemp.class);
@@ -73,6 +92,8 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         AppUserPositionTemp userPositionTemp = new AppUserPositionTemp();
         BeanUtils.copyProperties(appUserPositionTempDTO, userPositionTemp);
         userPositionTemp.setUserId(userId);
+        userPositionTemp.setCompanyId(companyId);
+        userPositionTemp.setCompanyName(companyName);
         //编辑
         if (id == null || id == 0) {
             insertSelective(userPositionTemp);
@@ -103,14 +124,18 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         if (StringUtils.isNotEmpty(appUserPositionTempFindDTO.getPhone())) {
             criteria.andEqualTo("phone", appUserPositionTempFindDTO.getPhone());
         }
+        if (Objects.nonNull(appUserPositionTempFindDTO.getCompanyId())) {
+            criteria.andEqualTo("companyId", appUserPositionTempFindDTO.getCompanyId());
+        }
         if(Objects.nonNull(appUserPositionTempFindDTO.getStatus())) {
             if (DataStatus.USERED.code == appUserPositionTempFindDTO.getStatus()) {
-                criteria.andIsNotNull("userId");
+                criteria.andNotEqualTo("userId",0);
             }
             if (DataStatus.NO_USERED.code == appUserPositionTempFindDTO.getStatus()) {
-                criteria.andIsNull("userId");
+                criteria.andEqualTo("userId",0);
             }
         }
+        example.setOrderByClause("upd_time desc");
         PageDataVO<AppUserPositionTemp> pageDataVO = PageDataVO.pageInfo(appUserPositionTempFindDTO.getPage(), appUserPositionTempFindDTO.getLimit(), () -> mapper.selectByExample(example));
         List<AppUserPositionTemp> data = pageDataVO.getData();
         if (CollectionUtils.isEmpty(data)) {
@@ -122,14 +147,17 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
 
         List<Integer> postionIds = data.stream().map(AppUserPositionTemp::getPositionId).collect(Collectors.toList());
         Map<Integer, AppUserPosition> postionMap = appUserPositionBiz.findPostionIdAndPostionMapByIds(postionIds);
-
+        List<Integer> jobIds = data.stream().map(AppUserPositionTemp::getJobId).collect(Collectors.toList());
+        Map<Integer, AppUserJobLevel> jobMap = jobLevelBiz.findJobIdAndJobMapByIds(jobIds);
         List<AppUserPositionTempVo> appUserPositionTempVos = new ArrayList<>();
         AppUserPositionTempVo appUserPositionTempVo;
         for (AppUserPositionTemp appUserPositionTemp : data) {
             appUserPositionTempVo = new AppUserPositionTempVo();
             BeanUtils.copyProperties(appUserPositionTemp, appUserPositionTempVo);
             String postionName = postionMap == null ? "" : postionMap.get(appUserPositionTemp.getPositionId())==null?"":postionMap.get(appUserPositionTemp.getPositionId()).getName();
+            String jobName = jobMap == null ? "" : jobMap.get(appUserPositionTemp.getJobId())==null?"":jobMap.get(appUserPositionTemp.getJobId()).getName();
             appUserPositionTempVo.setPositionName(postionName);
+            appUserPositionTempVo.setJobName(jobName);
             appUserPositionTempVo.setStatus(appUserPositionTemp.getUserId() == null ? DataStatus.NO_USERED.code : appUserPositionTemp.getUserId()==0?DataStatus.NO_USERED.code:DataStatus.USERED.code);
             appUserPositionTempVos.add(appUserPositionTempVo);
         }
@@ -165,26 +193,67 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                 if (StringUtils.isEmpty(postionName)){
                     throw new BaseException("身份为空");
                 }
-                //根据手机号查询userId
-                AppUserLogin userLogin = loginBiz.checkeUserLogin(phone);
+                if (StringUtils.isNotBlank(name)){
+                    name.replaceAll(" ","");
+                }
+                Example example = new Example(AppUserPositionTemp.class);
+                example.createCriteria().andEqualTo("phone", phone).andEqualTo("isDel", 0);
+                List<AppUserPositionTemp> list = selectByExample(example);
+                Integer id=0;
+                Integer userId=0;
+                if (list.size()>0){
+                    AppUserPositionTemp appUserPositionTemp1= list.get(0);
+                    id=appUserPositionTemp1.getId();
+                    userId=appUserPositionTemp1.getUserId();
+                }
+                if (userId==null||userId==0){
+                    //根据手机号查询userId
+                    AppUserLogin userLogin = loginBiz.checkeUserLogin(phone);
+                    if (Objects.nonNull(userLogin)) {
+                        userId=userLogin.getId();
+                    }
+                }
                 for (Map.Entry<Integer, String> integerStringEntry : entrySet) {
                     if (integerStringEntry.getValue().contains(postionName)) {
                         postionId = integerStringEntry.getKey();
                         break;
                     }
                 }
+                String companyName=data[3];
+                Integer companyId=0;
+                if (StringUtils.isNotBlank(companyName)){
+                    BranchCompany branchCompany=vehicleFeign.companyId(companyName);
+                    if (branchCompany!=null){
+                        companyId=branchCompany.getId();
+                        companyName=branchCompany.getName();
+                    }else {
+                        companyName=null;
+                    }
+                }
+                String jobName=data[4];
+                Integer jobId=2;
+                if (StringUtils.isNotBlank(jobName)&&jobName.contains("销售")){
+                    jobId=1;
+                }
                 appUserPositionTemp = new AppUserPositionTemp();
-                appUserPositionTemp.setCrtTime(Instant.now().toEpochMilli());
                 appUserPositionTemp.setName(name);
                 appUserPositionTemp.setPositionId(postionId);
                 appUserPositionTemp.setPhone(phone);
-                appUserPositionTemp.setUserId(0);
-                if (Objects.nonNull(userLogin)) {
+                appUserPositionTemp.setCompanyId(companyId);
+                appUserPositionTemp.setCompanyName(companyName);
+                appUserPositionTemp.setJobId(jobId);
+                if (userId!=null&&userId>0) {
                     //更新用户身份信息
-                    detailBiz.updateUserPositionByUserId(userLogin.getId(), postionId);
-                    appUserPositionTemp.setUserId(userLogin.getId());
+                    detailBiz.updateUserPositionByUserId(userId, postionId);
+                    appUserPositionTemp.setUserId(userId);
+                }
+                if (id!=null&&id>0){
+                    appUserPositionTemp.setId(id);
+                    updateSelectiveById(appUserPositionTemp);
+                }else {
+                    insertSelective(appUserPositionTemp);
                 }
-                mapper.insertWithIgnoreRepeat(appUserPositionTemp);
+
             } catch (BaseException ex) {
                 errorResultMap = new HashMap<>(1);
                 errorResultMap.put("num", i);
@@ -229,4 +298,5 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         postionIdAndNameMap = appUserPositionBiz.findPostionIdAndNameMap() == null ? Collections.EMPTY_MAP : appUserPositionBiz.findPostionIdAndNameMap();
     }
 
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserMemberLevelBiz.java

 package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
+import com.ace.cache.annotation.CacheClear;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -52,6 +53,7 @@ public class UserMemberLevelBiz extends BaseBiz<BaseUserMemberLevelMapper,BaseUs
        return levelAndDiscountMap;
     }
 
+    @CacheClear(key = "member")
     public void updateMemberBaseInfo(BaseUserMemberLevel baseUserMemberLevel) {
         int affectRows = mapper.updateByPrimaryKeySelective(baseUserMemberLevel);
         if (affectRows==0){

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserJobLevelMapper.java

+package com.github.wxiaoqi.security.admin.mapper;
+
+import com.github.wxiaoqi.security.admin.entity.AppUserJobLevel;
+import tk.mybatis.mapper.additional.idlist.IdListMapper;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 用户身份职位表
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-09 10:00:42
+ */
+public interface AppUserJobLevelMapper extends Mapper<AppUserJobLevel>, IdListMapper<AppUserJobLevel,Integer> {
+
+
+
+
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppUserPositionController.java

 package com.github.wxiaoqi.security.admin.rest.admin;
 
+import com.github.wxiaoqi.security.admin.biz.AppUserJobLevelBiz;
 import com.github.wxiaoqi.security.admin.biz.AppUserPositionBiz;
 import com.github.wxiaoqi.security.admin.biz.AppUserPositionTempBiz;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempDTO;
@@ -30,9 +31,17 @@ public class AppUserPositionController {
     @Autowired
     private AppUserPositionBiz appUserPositionBiz;
 
+    @Autowired
+    private AppUserJobLevelBiz jobLevelBiz;
+
     @Autowired
     private AppUserPositionTempBiz appUserPositionTempBiz;
 
+    @GetMapping("/jobs")
+    public ObjectRestResponse  findAllJobs() {
+        return ObjectRestResponse.succ(jobLevelBiz.selectListAll());
+    }
+
     @GetMapping("/postions")
     public ObjectRestResponse<List<WalletPostionVo>> findAllPostions() {
         List<WalletPostionVo> walletPostionVos = appUserPositionBiz.findAllPostions();
@@ -50,10 +59,19 @@ public class AppUserPositionController {
      * 新增或编辑身份信息
      * @return
      */
-    @PostMapping("/add")
+    @PostMapping("/addUserPostion")
     public ObjectRestResponse<Void> addUserPostion(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO){
-         appUserPositionTempBiz.add(appUserPositionTempDTO);
-        return ObjectRestResponse.succ();
+        return appUserPositionTempBiz.add(appUserPositionTempDTO);
+    }
+
+    /**
+     * 新增或编辑身份信息
+     * @return
+     */
+    @PostMapping("/updUserPostion")
+    public ObjectRestResponse<Void> updUserPostion(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO){
+
+        return appUserPositionTempBiz.add(appUserPositionTempDTO);
     }
 
     /**

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/CustomerServiceBiz.java

@@ -11,6 +11,7 @@ import com.xxfc.platform.im.entity.CustomerService;
 import com.xxfc.platform.im.mapper.CustomerServiceMapper;
 import com.xxfc.platform.im.vo.CustomerServiceVO;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,32 +55,32 @@ public class CustomerServiceBiz extends BaseBiz<CustomerServiceMapper, CustomerS
         CustomerService customerService = new CustomerService();
         BeanUtils.copyProperties(customerServiceDTO, customerService);
 
-         if (Objects.isNull(customerServiceDTO.getId())){
-             customerService.setCreateTime(Instant.now().toEpochMilli());
-             customerService.setName(String.format("%s%s", NICK_PRE_NAME, customerServiceDTO.getTelphone()));
-             customerService.setIsDel(false);
-             customerService.setPassword(INIT_PASSWORD);
-             Map<String, Object> imMap = new HashMap<>(2);
-             imMap.put("telephone", customerServiceDTO.getTelphone());
-             imMap.put("password", INIT_PASSWORD);
-             imMap.put("nickname", customerService.getName());
-             BaseResponse imResponse = userBiz.register(imMap);
-             String imResult = imResponse.getMessage();
-             JSONObject jsonObject = JSON.parseObject(imResult);
-             Map<String, Object> data = (Map<String, Object>) jsonObject.get("data");
-             Object userId = data.get("userId");
-             if (Objects.isNull(userId)) {
-                 throw new BaseException("注册失败");
-             }
-             customerService.setImUserId((Integer) userId);
-             mapper.insertSelective(customerService);
-         }else {
-             customerService.setUpdateTime(Instant.now().toEpochMilli());
-             if (!StringUtils.isEmpty(customerServiceDTO.getPassword())){
-                 userBiz.updatePasswordByPhone(customerServiceDTO.getTelphone(),customerServiceDTO.getPassword());
-             }
-             mapper.updateByPrimaryKeySelective(customerService);
-         }
+        if (Objects.isNull(customerServiceDTO.getId())) {
+            customerService.setCreateTime(Instant.now().toEpochMilli());
+            customerService.setName(String.format("%s%s", NICK_PRE_NAME, customerServiceDTO.getTelphone()));
+            customerService.setIsDel(false);
+            customerService.setPassword(StringUtils.isEmpty(customerServiceDTO.getPassword()) ? INIT_PASSWORD : customerServiceDTO.getPassword().trim().length() > 0 ? customerServiceDTO.getPassword() : INIT_PASSWORD);
+            Map<String, Object> imMap = new HashMap<>(2);
+            imMap.put("telephone", customerServiceDTO.getTelphone());
+            imMap.put("password", DigestUtils.md5Hex(customerService.getPassword()));
+            imMap.put("nickname", customerService.getName());
+            BaseResponse imResponse = userBiz.register(imMap);
+            String imResult = imResponse.getMessage();
+            JSONObject jsonObject = JSON.parseObject(imResult);
+            Map<String, Object> data = (Map<String, Object>) jsonObject.get("data");
+            Object userId = data.get("userId");
+            if (Objects.isNull(userId)) {
+                throw new BaseException("注册失败");
+            }
+            customerService.setImUserId((Integer) userId);
+            mapper.insertSelective(customerService);
+        } else {
+            customerService.setUpdateTime(Instant.now().toEpochMilli());
+            if (!StringUtils.isEmpty(customerServiceDTO.getPassword())) {
+                userBiz.updatePasswordByPhone(customerServiceDTO.getTelphone(), customerServiceDTO.getPassword());
+            }
+            mapper.updateByPrimaryKeySelective(customerService);
+        }
 
 
     }
@@ -121,24 +122,24 @@ public class CustomerServiceBiz extends BaseBiz<CustomerServiceMapper, CustomerS
     public void updatePasswordByPhone(String telphone, String password) {
         Example example = new Example(CustomerService.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("telphone",telphone);
+        criteria.andEqualTo("telphone", telphone);
 
         CustomerService customerService = new CustomerService();
-        customerService.setPassword(password);
+        customerService.setPassword(DigestUtils.md5Hex(password));
         customerService.setUpdateTime(Instant.now().toEpochMilli());
-        mapper.updateByExampleSelective(customerService,example);
+        mapper.updateByExampleSelective(customerService, example);
     }
 
     public PageDataVO<CustomerServiceVO> findCustomerServiceWithPage(Integer page, Integer limit) {
-         PageDataVO<CustomerServiceVO> dataVO = new PageDataVO<>();
+        PageDataVO<CustomerServiceVO> dataVO = new PageDataVO<>();
 
         Example example = new Example(CustomerService.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("isDel",false);
+        criteria.andEqualTo("isDel", false);
 
-      PageDataVO<CustomerService> pageDataVO = PageDataVO.pageInfo(page,limit,()->mapper.selectByExample(example));
+        PageDataVO<CustomerService> pageDataVO = PageDataVO.pageInfo(page, limit, () -> mapper.selectByExample(example));
         List<CustomerService> data = pageDataVO.getData();
-        if (CollectionUtils.isEmpty(data)){
+        if (CollectionUtils.isEmpty(data)) {
             return dataVO;
         }
 
@@ -146,22 +147,22 @@ public class CustomerServiceBiz extends BaseBiz<CustomerServiceMapper, CustomerS
         CustomerServiceVO customerServiceVO;
         for (CustomerService customerService : data) {
             customerServiceVO = new CustomerServiceVO();
-            BeanUtils.copyProperties(customerService,customerServiceVO);
+            BeanUtils.copyProperties(customerService, customerServiceVO);
             customerServiceVOS.add(customerServiceVO);
         }
 
-         dataVO.setPageSize(pageDataVO.getPageSize());
-         dataVO.setPageNum(pageDataVO.getPageNum());
-         dataVO.setTotalPage(pageDataVO.getTotalPage());
-         dataVO.setTotalCount(pageDataVO.getTotalCount());
-         dataVO.setData(customerServiceVOS);
+        dataVO.setPageSize(pageDataVO.getPageSize());
+        dataVO.setPageNum(pageDataVO.getPageNum());
+        dataVO.setTotalPage(pageDataVO.getTotalPage());
+        dataVO.setTotalCount(pageDataVO.getTotalCount());
+        dataVO.setData(customerServiceVOS);
         return dataVO;
     }
 
     public CustomerServiceDTO findCustomerServiceById(Long id) {
-         CustomerServiceDTO customerServiceDTO = new CustomerServiceDTO();
+        CustomerServiceDTO customerServiceDTO = new CustomerServiceDTO();
         CustomerService customerService = mapper.selectByPrimaryKey(id);
-        BeanUtils.copyProperties(customerService,customerServiceDTO);
+        BeanUtils.copyProperties(customerService, customerServiceDTO);
         return customerServiceDTO;
     }
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/DeductionTypeEnum.java

@@ -8,6 +8,7 @@ public enum DeductionTypeEnum {
     VIOLATE_CANCEL(101, "提前取消违约金"),
     VIOLATE_ADVANCE(102, "提前还车违约金"),
     VIOLATE_DELAY(103, "延迟还车违约金"),
+    VIOLATE_CHANGE_C(104, "更换还车公司费用"),
     CONSUME(201, "消费金额"),
     DAMAGES(301, "赔偿金（定损）"),
     VIOLATE_TRAFFIC_DEDUCT(401, "违章扣款"),

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderViolateEnum.java

@@ -7,6 +7,7 @@ import java.util.Map;
 public enum OrderViolateEnum {
     BEFORE(1, "提前"),
     AFTER(2, "延期"),
+    CHANGE(3, "更换还车公司"),
     ;
     /**
      * 编码

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java

@@ -279,4 +279,18 @@ public class BaseOrder implements Serializable {
 	@ApiModelProperty(value = "返回的优惠券")
 	@Column(name = "back_coupon")
 	String backCoupon;
+
+	/**
+	 * 促成人后台管理系统用户id
+	 */
+	@ApiModelProperty(value = "促成人后台管理系统用户id")
+	@Column(name = "facilitate_id")
+	Integer facilitateId;
+
+	/**
+	 * 促成人联系方式
+	 */
+	@ApiModelProperty(value = "促成人联系方式")
+	@Column(name = "facilitate_phone")
+	String facilitatePhone;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/inter/OrderDetail.java

@@ -33,4 +33,12 @@ public interface OrderDetail extends OrderItemInter {
 
     public void setAppUserDTO(AppUserDTO appUserDTO);
 
+//    public Integer getFacilitateId();
+//
+//    public void setFacilitateId(Integer facilitateId);
+
+    public String getFacilitatePhone();
+
+    public void setFacilitatePhone(String facilitatePhone);
+
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/DedDetailDTO.java

@@ -32,7 +32,7 @@ public class DedDetailDTO {
 
 
     //作为：DedDetail ：2、车辆损坏 3、其他
-    //作为：violate_amount_detail 1--提前还车 2--延期还车 3--消费超额
+    //作为：violate_amount_detail 1--提前还车 2--延期还车 3--更换还车公司费用
     Integer type;
 
     //小雨都不知道什么东西

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/MemberBO.java

@@ -11,6 +11,7 @@ import com.xxfc.platform.order.entity.OrderTourDetail;
 import com.xxfc.platform.order.entity.inter.OrderDetail;
 import com.xxfc.platform.tour.entity.TourGood;
 import com.xxfc.platform.tour.entity.TourUser;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -20,6 +21,12 @@ public class MemberBO extends OrderMemberDetail implements OrderDetail {
     private BaseOrder order;
     private BaseUserMemberLevel baseUserMemberLevel;
     AppUserDTO appUserDTO;
+    /**
+     * 促成人联系方式
+     */
+    @ApiModelProperty(value = "促成人联系方式")
+    String facilitatePhone;
+
     /**
      * 下单来源，1--app；2--小程序
      */

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.order.pojo.order;
 
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
+import com.xxfc.platform.vehicle.entity.BookRecordUpdateLog;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import lombok.Data;
 
@@ -21,6 +22,9 @@ public class OrderPageVO extends BaseOrder {
 
     List<VehicleUserLicense> vehicleUserLicenses;
 
+    //更换还车公司记录
+    List<BookRecordUpdateLog> bookRecordUpdateLogs;
+
     /**
      * 用户名
      */

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/RentVehicleBO.java

@@ -25,6 +25,12 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
     private Integer rentFreeDay;
     private AppUserDTO appUserDTO;
 
+    /**
+     * 促成人联系方式
+     */
+    @ApiModelProperty(value = "促成人联系方式")
+    String facilitatePhone;
+
     /**
      * 下单来源，1--app；2--小程序
      */

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/TourBO.java

@@ -11,6 +11,7 @@ import com.xxfc.platform.order.entity.inter.OrderDetail;
 import com.xxfc.platform.tour.entity.TourGood;
 import com.xxfc.platform.tour.entity.TourUser;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -21,6 +22,11 @@ public class TourBO extends OrderTourDetail implements OrderDetail {
     TourGood tourGood;
     List<TourUser> tourUsers;
     AppUserDTO appUserDTO;
+    /**
+     * 促成人联系方式
+     */
+    @ApiModelProperty(value = "促成人联系方式")
+    String facilitatePhone;
 
     /**
      * 下单来源，1--app；2--小程序

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/add/AddOrderCommonDTO.java

@@ -3,6 +3,8 @@ package com.xxfc.platform.order.pojo.order.add;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+
 @Data
 public class AddOrderCommonDTO {
     /**
@@ -17,4 +19,16 @@ public class AddOrderCommonDTO {
      */
     @ApiModelProperty(value = "优惠券ids")
     private String couponIds;
+
+//    /**
+//     * 促成人后台管理系统用户id
+//     */
+//    @ApiModelProperty(value = "促成人后台管理系统用户id")
+//    Integer facilitateId;
+
+    /**
+     * 促成人联系方式
+     */
+    @ApiModelProperty(value = "促成人联系方式")
+    String facilitatePhone;
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSONArray;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
@@ -16,17 +16,15 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
-import com.google.gson.JsonObject;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
 import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
 import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.BaseOrderMapper;
-import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
@@ -48,6 +46,7 @@ import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
+import com.xxfc.platform.vehicle.util.DistanceUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -57,15 +56,16 @@ import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.entity.Example;
 
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant.*;
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.*;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
+import static com.xxfc.platform.universal.constant.DictionaryKey.ILLEGAL_TYPE;
 
 /**
  * @author zjw
@@ -315,8 +315,57 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
                 initDedDetail(dedDetailDTO, OrderViolateEnum.AFTER.getCode(), cost, stringBuilder);
             }
         }
-        orderPageVO.setDedDetailDTO(JSONObject.toJSONString(dedDetailDTO));
+        JSONArray jsonArray = new JSONArray();
+        if ((dedDetailDTO.getCost() != null && dedDetailDTO.getCost().doubleValue() != 0) || (dedDetailDTO.getExcessCost()!=null && dedDetailDTO.getExcessCost().doubleValue() != 0)) {
+            jsonArray.add(dedDetailDTO);
+        }
+        DedDetailDTO dedDetailDTO1 = new DedDetailDTO();
+        //添加更改还车公司计算费用
+        if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getBookRecordId() != null) {
+            //查询是否有更换还车记录
+            List<BookRecordUpdateLog> bookRecordUpdateLogs = vehicleFeign.get(orderPageVO.getOrderRentVehicleDetail().getBookRecordId()).getData();
+            if(bookRecordUpdateLogs != null && bookRecordUpdateLogs.size() > 0) {
+                orderPageVO.setBookRecordUpdateLogs(bookRecordUpdateLogs);
+                //有更换记录，则需要计算更换费用
+                //原始公司经纬度，列表中最后一个 bookRecordUpdateLogs.get(bookRecordUpdateLogs.size -1 ) 最后还车公司是列表中的第一条中的getNewRetCompanyId
+                BookRecordUpdateLog oldCompany = bookRecordUpdateLogs.get(bookRecordUpdateLogs.size() -1);
+                BookRecordUpdateLog newCompany = bookRecordUpdateLogs.get(0);
+                if (oldCompany != null && newCompany != null) {
+                    CompanyDetail oldCompanyDetail = vehicleFeign.getCompanyDetail(oldCompany.getOldRetCompanyId()).getData();
+                    CompanyDetail newCompanyDetail = vehicleFeign.getCompanyDetail(newCompany.getNewRetCompanyId()).getData();
+                    if (oldCompanyDetail.getLatitude() != null && oldCompanyDetail.getLongitude() != null && newCompanyDetail.getLongitude() != null && newCompanyDetail.getLatitude() != null) {
+                        //根据经纬度获取两个公司的距离
+                        double distance = DistanceUtil.getDistance(oldCompanyDetail.getLongitude().doubleValue(), oldCompanyDetail.getLatitude().doubleValue(), newCompanyDetail.getLongitude().doubleValue(), newCompanyDetail.getLatitude().doubleValue());
+                        log.info("两个公司的距离为(米)： {}", distance);
+                        BigDecimal distanceNum = new BigDecimal(distance + "").divide(new BigDecimal("1000"), 0, BigDecimal.ROUND_UP);
+                        //取出费用计算的单价
+                        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+                        BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(ILLEGAL_TYPE + "_" + DictionaryKey.ILLEGAL_FEE_PRICE).getDetail());
+                        BigDecimal totalCost = distanceNum.multiply(illegalReserve);
+                        log.info("更换两个公司的总费用为： {}", totalCost);
+                        StringBuilder stringBuilder = new StringBuilder();
+                        stringBuilder.append(illegalReserve);
+                        stringBuilder.append(" x ");
+                        stringBuilder.append(distanceNum);
+                        stringBuilder.append("(KM)");
+                        stringBuilder.append(" = ");
+                        stringBuilder.append(totalCost);
+                        stringBuilder.append("元");
+                        dedDetailDTO1.setCost(totalCost);
+                       initDedDetail(dedDetailDTO1, OrderViolateEnum.CHANGE.getCode(), totalCost, stringBuilder);
+                    }
+                }
+            }
+        }
+        if (dedDetailDTO1.getCost() != null && dedDetailDTO1.getCost().doubleValue() != 0) {
+            jsonArray.add(dedDetailDTO1);
+        }
+        orderPageVO.setDedDetailDTO(jsonArray.toJSONString());
     }
+
+
+
+
     public void initDedDetail(DedDetailDTO dedDetailDTO, Integer type, BigDecimal cost, StringBuilder stringBuilder) {
         String detailName = null;
         if (type == OrderViolateEnum.BEFORE.getCode()) {
@@ -325,6 +374,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         } else if (type == OrderViolateEnum.AFTER.getCode()) {
             dedDetailDTO.setType(OrderViolateEnum.AFTER.getCode());
             detailName = "延期还车违约金";
+        } else if (type == OrderViolateEnum.CHANGE.getCode()) {
+            dedDetailDTO.setType(OrderViolateEnum.CHANGE.getCode());
+            detailName = "更换还车公司";
         }
         //900元+违约金（￥900x2天=）1800元
         dedDetailDTO.setDeductions(stringBuilder.toString());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -481,12 +481,18 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
     private void handleCrosstownDetail(OrderVehicleCrosstown crosstown, OrderAccountDetail oad, CancelStartedVO csv) {
         try{
             if(null != crosstown.getViolateDetail()) {
-                DedDetailDTO vio = JSONUtil.toBean(crosstown.getViolateDetail(), DedDetailDTO.class);
-
-                if(OrderViolateEnum.BEFORE.getCode().equals(vio.getType())) {
-                    handleViolateDetail(DeductionTypeEnum.VIOLATE_ADVANCE, oad, vio, csv);
-                }else if(OrderViolateEnum.AFTER.getCode().equals(vio.getType())) {
-                    handleViolateDetail(DeductionTypeEnum.VIOLATE_DELAY, oad, vio, csv);
+                //修改代码
+                List<DedDetailDTO> vios = JSONUtil.toList(JSONUtil.parseArray(crosstown.getViolateDetail()), DedDetailDTO.class);
+                //DedDetailDTO vio = JSONUtil.toBean(crosstown.getViolateDetail(), DedDetailDTO.class);
+
+                for(DedDetailDTO vio : vios) {
+                    if(OrderViolateEnum.BEFORE.getCode().equals(vio.getType())) {
+                        handleViolateDetail(DeductionTypeEnum.VIOLATE_ADVANCE, oad, vio, csv);
+                    }else if(OrderViolateEnum.AFTER.getCode().equals(vio.getType())) {
+                        handleViolateDetail(DeductionTypeEnum.VIOLATE_DELAY, oad, vio, csv);
+                    }else if(OrderViolateEnum.CHANGE.getCode().equals(vio.getType())) {
+                        handleViolateDetail(DeductionTypeEnum.VIOLATE_CHANGE_C, oad, vio, csv);
+                    }
                 }
             }
         }catch (Exception e) {
@@ -495,6 +501,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
     }
 
     private void handleViolateDetail(DeductionTypeEnum dte, OrderAccountDetail oad, DedDetailDTO vio, CancelStartedVO csv) {
+        Boolean flag = Boolean.FALSE;
         for(OrderAccountDeduction deduction : oad.getDeductions()) {
             if(dte.getCode().equals(deduction.getType())) {
                 deduction.setName(vio.getDeductions());
@@ -504,10 +511,24 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                 deduction.setAmount(vio.getCost());
 
                 //设置订单明细参数
-                csv.setViolateAmount(deduction.getAmount());
-                csv.setViolateDesc(deduction.getName());
+                csv.setViolateAmount(csv.getViolateAmount().add(diff));
+                csv.setViolateDesc(csv.getViolateDesc()+ deduction.getName());
+                flag = Boolean.TRUE;
+                break;
             }
         }
+
+        //如果没有修改，则添加
+        if(Boolean.FALSE.equals(flag)) {
+            OrderAccountDeduction oadNew = initDeduction(vio.getCost(), vio.getDeductions(), dte, OrderAccountDeduction.ORIGIN_DEPOSIT);
+            oad.getDeductions().add(oadNew);
+            //修改归还押金金额
+            oad.setDepositAmount(oad.getDepositAmount().subtract(oadNew.getAmount()));
+
+            //设置订单明细参数
+            csv.setViolateAmount(csv.getViolateAmount().add(oadNew.getAmount()));
+            csv.setViolateDesc(csv.getViolateDesc()+ oadNew.getName());
+        }
     }
 
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -12,7 +12,6 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.activity.user.UserInfoBiz;
-import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
 import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
 import com.xxfc.platform.order.contant.enumerate.CrosstownTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.DepositRefundStatus;
@@ -35,7 +34,6 @@ import com.xxfc.platform.vehicle.pojo.VehicleDepartureVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -184,16 +182,19 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 return ObjectRestResponse.createFailedResult(3503, "无收车权限");
             }
         }
+        Vehicle vehicle = null;
+        RestResponse<Vehicle> vehicleRestResponse = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
+        log.info("获取车辆信息返回消息：{}", vehicleRestResponse.getMessage());
+        if (vehicleRestResponse.getData() != null) {
+            vehicle = vehicleRestResponse.getData();
+        }
+        if (vehicle == null) {
+            return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode(), ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc());
+        }
+//        if (vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
+//            return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode(), ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc());
+//        }
         if (baseOrder.getStatus() != -1) {
-            Vehicle vehicle = null;
-            RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
-            log.info("获取车辆信息返回消息：{}", restResponse.getMessage());
-            if (restResponse.getData() != null) {
-                vehicle = restResponse.getData();
-            }
-            if (vehicle == null) {
-                return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode(), ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc());
-            }
             if (vehicle.getMileageLastUpdate() != null) {
                 //判断车辆公里数
                 if (orderVehicleCrosstownDto.getMileage() == null || orderVehicleCrosstownDto.getMileage() < vehicle.getMileageLastUpdate()) {
@@ -264,13 +265,16 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         }
         //延期扣除费用
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getViolateDetail())) {
-            JSONObject jsonObject = JSONObject.parseObject(orderVehicleCrosstownDto.getViolateDetail());
-            if (jsonObject != null) {
-                if (jsonObject.getString("cost") != null) {
-                    cost += Double.parseDouble(jsonObject.getString("cost"));
-                }
-                if (jsonObject.getString("excessCost") != null) {
-                    cost += Double.parseDouble(jsonObject.getString("excessCost"));
+            JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getViolateDetail());
+            if(jsonArray != null && jsonArray.size() > 0) {
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
+                    if (jsonObject.getString("cost") != null) {
+                        cost += Double.parseDouble(jsonObject.getString("cost"));
+                    }
+                    if (jsonObject.getString("excessCost") != null) {
+                        cost += Double.parseDouble(jsonObject.getString("excessCost"));
+                    }
                 }
             }
         }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java

@@ -289,6 +289,15 @@ public class OrderCancelBiz {
 
                     //站点总人数减少
                     tourFeign.updateTourGoodPersonNum(otd.getVerificationId(), TourFeign.TOTAL_PERSON, (otd.getTotalNumber() * -1));
+
+                    //已付款的取消订单发送消息
+                    try {
+                        AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
+                        //处理后台用户提醒短信的发送
+                        orderMsgBiz.handelMsgCancel(orvd, otd, omd, baseOrder, appUserDTO);
+                    }catch (Exception e) {
+                        log.error(e.getMessage(), e);
+                    }
                 }
             }
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderMsgBiz.java

@@ -283,9 +283,11 @@ public class OrderMsgBiz {
                     if(null != orvd.getEndCompanyId() && !SYS_FALSE.equals(orvd.getEndCompanyId())) {
 
                         //新的账单 记录 OUT_ORDER_FUND 返回订单款取消订单
+                        //查询 201, "取消订单退款" 并且状态为真
                         OrderAccount orderAccount = orderAccountBiz.selectOne(new OrderAccount(){{
                             setOrderId(baseOrder.getId());
                             setAccountType(AccountTypeEnum.OUT_ORDER_FUND.getCode());
+                            setAccountStatus(SYS_TRUE);
                         }});
 
                         if(BigDecimal.ZERO.equals(orderAccount.getDeductAmount())) {
@@ -311,8 +313,6 @@ public class OrderMsgBiz {
                             sms2RefundAppUser(BigDecimal.ZERO, orderAccount.getDeductAmount(), orderAccount.getAccountAmount(), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
                         }
 
-
-
                         //后台发送消息(出车人)
                         smsParams.clear();
                         sms2BgUser(startCompanyDetail.getVehiceServicePhone(), startCompanyDetail, endCompanyDetail, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.CANCEL_E, smsParams);
@@ -326,7 +326,7 @@ public class OrderMsgBiz {
                     //后台发送消息(客服)
                     Cofig cofig = configFeign.getAllByType(ConfigFeign.TYPE_CUS_SER+ "").getData().get(0);
                     smsParams.clear();
-                    sms2BgUser(cofig.getValue(), startCompanyDetailTour, null, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_C, smsParams);
+                    sms2BgUser(cofig.getValue(), startCompanyDetailTour, null, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.CANCEL_F, smsParams);
                     break;
                 case MEMBER:
                     break;
@@ -422,9 +422,11 @@ public class OrderMsgBiz {
             OrderAccount orderAccount;
             if(RefundStatusEnum.RESIDUE_ILLEGAL.getCode().equals(baseOrder.getRefundStatus())) {
                 smstype = SmsTemplateDTO.REFUND_A;
+                //查询 203, "部分押金（扣除该扣除的 + 保留违章预备金）" 并且状态为真
                 orderAccount = orderAccountBiz.selectOne(new OrderAccount(){{
                     setOrderId(baseOrder.getId());
                     setAccountType(AccountTypeEnum.OUT_PART_DEPOSIT.getCode());
+                    setAccountStatus(SYS_TRUE);
                 }});
 
                 OrderAccountDetail oad = JSONUtil.toBean(orderAccount.getAccountDetail(), OrderAccountDetail.class);
@@ -447,9 +449,11 @@ public class OrderMsgBiz {
                 residueAmount = orvd.getReturnPayResidue();
             }else if(RefundStatusEnum.REFUND_DEPOSIT.getCode().equals(baseOrder.getRefundStatus())){
                 smstype = SmsTemplateDTO.REFUND_B;
+                //查询 204, "剩余押金（扣除该扣除的）" 并且状态为真
                 orderAccount = orderAccountBiz.selectOne(new OrderAccount(){{
                     setOrderId(baseOrder.getId());
                     setAccountType(AccountTypeEnum.OUT_RESIDUE_DEPOSIT.getCode());
+                    setAccountStatus(SYS_TRUE);
                 }});
                 originalAmount = orderAccount.getOriginalAmount();
                 violateAmount = orderAccount.getDeductAmount();
@@ -573,10 +577,14 @@ public class OrderMsgBiz {
                 smsParams.add(startCompanyDetail.getAddrDetail());
                 break;
             case SmsTemplateDTO.PAY_J :
+                String realName = appUserDTO.getRealname();
+                if(StrUtil.isBlank(realName)){
+                    realName = "";
+                }
                 if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
-                    smsParams.add(USER_M+ appUserDTO.getRealname());
+                    smsParams.add(USER_M+ realName);
                 }else {
-                    smsParams.add(USER_N+ appUserDTO.getRealname());
+                    smsParams.add(USER_N+ realName);
                 }
                 smsParams.add(baseOrder.getName());
                 smsParams.add(HOUR_MINUTE_FORMATTE_HUTOOL.format(DateUtil.date(otd.getStartTime())));
@@ -680,7 +688,11 @@ public class OrderMsgBiz {
                 smsParams.add(orvd.getDayNum().toString());
                 break;
             case SmsTemplateDTO.PAY_H :
-                smsParams.add(appUserDTO.getRealname());
+                String realName = appUserDTO.getRealname();
+                if(StrUtil.isBlank(realName)){
+                    realName = "匿名";
+                }
+                smsParams.add(realName);
                 smsParams.add(appUserDTO.getUsername());
                 smsParams.add(baseOrder.getName());
                 smsParams.add(sCompany.getName());
@@ -688,7 +700,11 @@ public class OrderMsgBiz {
                 smsParams.add(DateUtil.formatDateTime(DateUtil.date(otd.getStartTime())));
                 break;
             case SmsTemplateDTO.CANCEL_F :
-                smsParams.add(appUserDTO.getRealname());
+                String realName2 = appUserDTO.getRealname();
+                if(StrUtil.isBlank(realName2)){
+                    realName2 = "匿名";
+                }
+                smsParams.add(realName2);
                 smsParams.add(appUserDTO.getUsername());
                 smsParams.add(baseOrder.getName());
                 smsParams.add(sCompany.getName());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RentDepositJobHandler.java

@@ -72,7 +72,7 @@ public class RentDepositJobHandler extends IJobHandler {
     @Override
     public ReturnT<String> execute(String idLastNumInterval) {
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-        Integer rentDepositAutoRefundTime = new Integer(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
+        Long rentDepositAutoRefundTime = new Long(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
 
         try {
             List<BaseOrder> lists = baseOrderBiz.selectByExample(new Example.Builder(BaseOrder.class)
@@ -80,7 +80,7 @@ public class RentDepositJobHandler extends IJobHandler {
                 .where(WeekendSqls.<BaseOrder>custom().andEqualTo(BaseOrder::getType, OrderTypeEnum.RENT_VEHICLE.getCode())
                         .andEqualTo(BaseOrder::getStatus, OrderStatusEnum.ORDER_FINISH.getCode()) //已完成的订单
                         .andEqualTo(BaseOrder::getRefundStatus, RefundStatusEnum.RESIDUE_ILLEGAL.getCode()) //已归还了部分押金
-                        .andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.date(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000)))
+                        .andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.date(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60L * 1000L)))
 //                                    .andLike(BaseOrder::getId, "%"+ i)
                 ).build());
 
@@ -102,7 +102,7 @@ public class RentDepositJobHandler extends IJobHandler {
                     setType(crosstownTypeEnum);
                 }});
 
-                if(crosstown.getCrtTime().compareTo(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000)) < 0) {
+                if(crosstown.getCrtTime().compareTo(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60L * 1000L)) < 0) {
                     OrderViolation orderViolation = orderViolationBiz.selectOne(new OrderViolation(){{
                         setDetailId(orvd.getId());
                         setIsDel(SYS_FALSE);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -328,6 +328,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
         //查询列表数据
         Query query = baseOrderBiz.initQuery(dto.getNo());
         query.put("crtUser", null);
+        query.put("userId", null);
         PageDataVO<OrderPageVO> page = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
         OrderPageVO orderPageVO = page.getData().get(0);
         if(null == orderPageVO) {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRentVehicleController.java

@@ -75,7 +75,7 @@ public class OrderRentVehicleController extends CommonBaseController {
                 bo.setAppUserDTO(userFeign.userDetailById(dto.getAppUserId()).getData());
                 bo.setCrtUser("-1"+ BaseContextHandler.getUserID());
                 //设置-1表示查询所有的车
-                bo.setUseType(-1);
+                //bo.setUseType(-1);
                 orderRentVehicleService.createOrder(bo);
                 return ObjectRestResponse.succ(bo.getOrder());
         }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.order.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
@@ -25,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -66,12 +68,21 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
      * 创建基础订单
      * @return
      */
-    public BaseOrder createBaseOrder(Integer orderOrigin, AppUserDTO appUserDTO) {
+    public BaseOrder createBaseOrder(Integer orderOrigin, String facilitatePhone, AppUserDTO appUserDTO) {
         BaseOrder baseOrder = new BaseOrder();
 
         //设置下单来源
         baseOrder.setOrderOrigin(orderOrigin);
 
+        //根据facilitatePhone 查询后台管理系统人员 未完成
+        if(StrUtil.isNotBlank(facilitatePhone)) {
+            baseOrder.setFacilitatePhone(facilitatePhone);
+            List<AppUserLogin> appUserDTOList = userFeign.getOne(facilitatePhone, null);
+            if(null != appUserDTOList && appUserDTOList.size() > 0) {
+                baseOrder.setFacilitateId(appUserDTOList.get(0).getId());
+            }
+        }
+
         //设置订单号
         baseOrder.setNo(OrderUtil.GetOrderNumber("", OrderUtil.APP_MID));
         //设置订单类型
@@ -89,12 +100,13 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
         //设置用户id
         baseOrder.setUserId(appUserDTO.getUserid());
         baseOrder.setMemberLevel(appUserDTO.getMemberLevel());
+
         return baseOrder;
     }
 
     public void initDetail(Detail detail) {
 //        Integer appUserId = (null == detail.getAppUserDTO())? Integer.valueOf(BaseContextHandler.getUserID()): detail.getAppUserDTO().getUserid();
-        BaseOrder order = createBaseOrder(detail.getOrderOrigin(), detail.getAppUserDTO());
+        BaseOrder order = createBaseOrder(detail.getOrderOrigin(), detail.getFacilitatePhone(), detail.getAppUserDTO());
         detail.setOrder(order);
     }
 

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/comstnt/WebsiteTourType.java

+package com.xxfc.platform.tour.comstnt;
+
+public enum WebsiteTourType {
+    POPULAR(1,"热门路线"),CHARACTERISTIC(2,"特色旅游"),
+    NEW(3,"新开辟路线"),RECOMMEND(4,"推荐路线");
+    private Integer code;
+    private String msg;
+
+    WebsiteTourType(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/WebsiteQuery.java

+package com.xxfc.platform.tour.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WebsiteQuery {
+    private  Integer limit=6;
+    private  Integer type = 1;
+    private  List<Integer> tagIds;
+}

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodBiz.java

@@ -13,6 +13,7 @@ import com.github.wxiaoqi.security.common.util.RandomUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.google.common.collect.Lists;
 import com.xxfc.platform.tour.dto.*;
 import com.xxfc.platform.tour.entity.*;
 import com.xxfc.platform.tour.mapper.*;
@@ -20,8 +21,12 @@ import com.xxfc.platform.tour.vo.TourGoodVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
+
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -38,6 +43,11 @@ import java.util.*;
 @Slf4j
 public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
 
+
+    @Value("${officialWebsite.popular}")
+    private String popular;
+    @Value("${officialWebsite.characteristic}")
+    private String characteristic;
     @Autowired
     private TourGoodBannerBiz bannerBiz;
     @Autowired
@@ -322,7 +332,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
      */
     public  List<GoodDataVO> getAllByHome(Integer page, Integer limit){
         return  mapper.findAllByHome((page-1)*limit,limit);
-    };
+    }
 
     /**
      * 获取指定数量的随机旅游路线
@@ -345,6 +355,48 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
         }
         return ObjectRestResponse.succ(resultList);
     }
+
+
+
+    public List homePageTour(WebsiteQuery query) {
+        if (Objects.isNull(query)) {
+            return new ArrayList();
+        }
+        setQueryTagIds(query);
+
+        List<TourGood> list = mapper.getList(query);
+        return CollectionUtils.isNotEmpty(list)?list:new ArrayList<>();
+    }
+
+    private void setQueryTagIds(WebsiteQuery query) {
+        if (CollectionUtils.isEmpty(query.getTagIds())) {
+            List<Integer> list=new ArrayList<>();
+            Integer type = query.getType();
+            if (type==1) {
+                if (StringUtils.isNotBlank(popular)) {
+                    String[] popularIds = popular.split(",");
+                    for (String id : popularIds) {
+                        list.add(Integer.parseInt(id));
+                    }
+                }
+
+            }
+            if (type==2) {
+                if (StringUtils.isNotBlank(characteristic)) {
+                    String[] characteristicIds = characteristic.split(",");
+                    for (String id : characteristicIds) {
+                        list.add(Integer.parseInt(id));
+                    }
+                }
+            }
+            query.setTagIds(list);
+        }
+    }
+
+    public List newTour(Integer limit) {
+        List list = mapper.newTour(limit);
+        return CollectionUtils.isNotEmpty(list)?list:new ArrayList<>();
+    }
 }
 
 

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourGoodMapper.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.tour.mapper;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.xxfc.platform.tour.dto.GoodSearchDTO;
 import com.xxfc.platform.tour.entity.TourGood;
+import com.xxfc.platform.tour.entity.WebsiteQuery;
 import com.xxfc.platform.tour.vo.TourGoodVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
@@ -36,4 +37,8 @@ public interface TourGoodMapper extends Mapper<TourGood> {
      * @return
      */
     List<GoodDataVO> findAllByHome(@Param("start") Integer start, @Param("size") Integer size);
+
+    List<TourGood> getList(WebsiteQuery query);
+
+    List newTour(Integer limit);
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/officialWebsite/OfficialWebsiteTourController.java

+package com.xxfc.platform.tour.rest.officialWebsite;
+
+
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.tour.biz.TourGoodBiz;
+import com.xxfc.platform.tour.comstnt.WebsiteTourType;
+import com.xxfc.platform.tour.entity.TourGood;
+import com.xxfc.platform.tour.entity.WebsiteQuery;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+@RequestMapping("website")
+@IgnoreClientToken
+@IgnoreUserToken
+@Api(tags = {"官网"})
+public class OfficialWebsiteTourController extends BaseController<TourGoodBiz, TourGood> {
+
+    @PostMapping("/app/unauth/tour")
+    public ObjectRestResponse homePageTour(@RequestBody WebsiteQuery query) throws Exception {
+        return ObjectRestResponse.succ(baseBiz.homePageTour(query));
+    }
+
+
+    @GetMapping("/app/unauth/tour/new")
+    public ObjectRestResponse newTour(@RequestParam(value = "limit", defaultValue = "6") Integer limit) {
+        return ObjectRestResponse.succ(baseBiz.newTour(limit));
+    }
+
+}
\ No newline at end of file

xx-tour/xx-tour-server/src/main/resources/application.yml

@@ -4,4 +4,4 @@ logging:
     com.github.wxiaoqi:
       debug
     com.xxfc.platform:
-      debug
+      debug
\ No newline at end of file

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodMapper.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.xxfc.platform.tour.mapper.TourGoodMapper">
 
-	<!-- 可根据自己的需求，是否要使用 -->
+    <!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.xxfc.platform.tour.entity.TourGood" id="tourGoodMap">
         <result property="id" column="id"/>
         <result property="name" column="name"/>
@@ -53,26 +53,28 @@
 
     <!--查询旅游路线列表-->
     <select id="getCoordinateList" parameterType="java.util.Map" resultMap="tourGoodMap">
-        SELECT t.*  from tour_good t
-            left  join (
-            select good_id,
-            IFNULL(ROUND(( (2 * ASIN( SQRT( POW( SIN((latitude * PI() / 180.0- #{params.latitude}* PI() / 180.0)/2), 2)+COS( latitude * PI() / 180.0)*COS( #{params.latitude} * PI() / 180.0)
-            *POW(SIN((longitude * PI() / 180.0 - #{params.longitude}* PI() /180.0)/2),2))))*6378.137)*10000)/10000 ,0 ) AS distance
-            FROM tour_good_site WHERE type=2 ) gs ON t.id=gs.good_id
-        where  t.is_del=0 AND  t.status=1
+        SELECT t.* from tour_good t
+        left join (
+        select good_id,
+        IFNULL(ROUND(( (2 * ASIN( SQRT( POW( SIN((latitude * PI() / 180.0- #{params.latitude}* PI() / 180.0)/2), 2)+COS(
+        latitude * PI() / 180.0)*COS( #{params.latitude} * PI() / 180.0)
+        *POW(SIN((longitude * PI() / 180.0 - #{params.longitude}* PI() /180.0)/2),2))))*6378.137)*10000)/10000 ,0 ) AS
+        distance
+        FROM tour_good_site WHERE type=2 ) gs ON t.id=gs.good_id
+        where t.is_del=0 AND t.status=1
         <if test="params.distance != null and params.distance != ''and params.distance >0">
-            and  gs.distance &lt; #{params.distance}
+            and gs.distance &lt; #{params.distance}
         </if>
         <if test="params.query != null and params.query != ''">
             and (t.`name` like CONCAT('%',#{params.query},'%') or t.introduce like CONCAT('%',#{params.query},'%'))
         </if>
-          order  by gs.distance
+        order by gs.distance
     </select>
 
     <!--查询旅游路线列表-->
     <select id="getGoodList" parameterType="java.util.Map" resultMap="tourGoodMap">
         SELECT * from tour_good t
-        where  t.is_del=0 AND  t.status=1
+        where t.is_del=0 AND t.status=1
         <if test="params.query != null and params.query != ''">
             and (t.`name` like CONCAT('%',#{params.query},'%') or t.introduce like CONCAT('%',#{params.query},'%'))
         </if>
@@ -103,22 +105,63 @@
 
     <!--后台查询旅游路线列表-->
     <select id="findGoodList" resultMap="tourGoodVoMap">
-        SELECT g.*,REPLACE(GROUP_CONCAT( DISTINCT t.`name`),',','|')as tagNames  from tour_good g
+        SELECT g.*,REPLACE(GROUP_CONCAT( DISTINCT t.`name`),',','|')as tagNames from tour_good g
         LEFT JOIN (SELECT * FROM tour_good_tag WHERE is_del=0) tag ON g.id=tag.good_id
         LEFT JOIN (SELECT * FROM tour_tag WHERE is_del=0) t ON tag.tag_id=t.id
         <where>
             g.is_del=0
-        <if test="params.name != null and params.name != ''">
-            and (g.`name` like CONCAT('%',#{params.name},'%') or g.introduce like CONCAT('%',#{params.name},'%'))
-        </if>
-        <if test="params.tagId != null and params.tagId != '' ">
-            and g.id in (SELECT good_id from tour_good_tag
-            where tag_id = #{params.tagId} and is_del=0 )
-        </if>
+            <if test="params.name != null and params.name != ''">
+                and (g.`name` like CONCAT('%',#{params.name},'%') or g.introduce like CONCAT('%',#{params.name},'%'))
+            </if>
+            <if test="params.tagId != null and params.tagId != '' ">
+                and g.id in (SELECT good_id from tour_good_tag
+                where tag_id = #{params.tagId} and is_del=0 )
+            </if>
         </where>
 
         GROUP BY g.id
         ORDER BY g.rank DESC ,g.id DESC
     </select>
 
+    <select id="getList" resultType="com.github.wxiaoqi.security.common.vo.GoodDataVO">
+        SELECT
+        g.id AS `id`,
+        g. NAME AS `name`,
+        g.cover AS `imgUrl`,
+        g.price
+        FROM
+        tour_good g,
+        tour_good_tag t
+        WHERE
+        g.id = t.good_id
+        AND g.is_del = 0
+        AND t.is_del = 0
+        AND g.status = 1
+        AND t.tag_id IN
+        <foreach collection="tagIds" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        GROUP BY g.id
+        ORDER BY
+        g.rank ASC,
+        g.crt_time DESC
+        LIMIT #{limit}
+    </select>
+
+    <select id="newTour" resultType="com.github.wxiaoqi.security.common.vo.GoodDataVO">
+        SELECT
+	    id,
+        name,
+        cover AS imgUrl,
+        price
+        FROM
+        	tour_good
+        WHERE
+        	is_del = 0
+        AND
+            status = 1
+        ORDER BY
+        	crt_time DESC
+        LIMIT #{limit}
+    </select>
 </mapper>
\ No newline at end of file

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/ArticleBiz.java

@@ -107,8 +107,8 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
      * @param type
      * @return
      */
-    public List getHomePageArticle(Integer type) {
-        List<Article> articleList = mapper.getArticleList(type,HOME_PAGE_NUMBER,null,null);
+    public List getHomePageArticle(Integer type,Integer limit) {
+        List<Article> articleList = mapper.getArticleList(type,limit,null,null);
 //        if (Objects.isNull(articleList)) {
 //            return new ArrayList();
 //        } else {

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/ArticleController.java

@@ -55,8 +55,9 @@ public class ArticleController extends BaseController<ArticleBiz, Article> {
 
     @GetMapping("/app/unauth/homePage/{type}")
     @ApiOperation(value = "获取首页文章列表")
-    public ObjectRestResponse getHomePageArticle(@PathVariable Integer type){
-        return ObjectRestResponse.succ(baseBiz.getHomePageArticle(type));
+    public ObjectRestResponse getHomePageArticle(@PathVariable Integer type
+             ,@RequestParam(value = "limit",defaultValue = "9") Integer limit){
+        return ObjectRestResponse.succ(baseBiz.getHomePageArticle(type,limit));
     }
 
     @Override

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/GwTourController.java

@@ -4,12 +4,17 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
+import com.xxfc.platform.tour.entity.TourTag;
 import com.xxfc.platform.tour.feign.TourFeign;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @RestController
 @RequestMapping("app/unauth/tour")
 @Slf4j
@@ -47,8 +52,9 @@ public class GwTourController extends CommonBaseController {
     @GetMapping("/tagList")
     @IgnoreUserToken
     public ObjectRestResponse getTagList(@RequestParam(value = "isHot", defaultValue = "0") Integer isHot) {
-
-        return ObjectRestResponse.succ(tourFeign.tagList(isHot));
+        List<TourTag> tourTags = tourFeign.tagList(isHot);
+        tourTags = tourTags.stream().filter(x -> !x.getName().contains("全部")).sorted(Comparator.comparing(TourTag::getRank)).collect(Collectors.toList());
+        return ObjectRestResponse.succ(tourTags);
     }
 
 }

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/MemberLevelController.java

+package com.xxfc.platform.uccn.rest;
+
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/17 9:37
+ */
+@RestController
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequestMapping("/member_level/app/unauth")
+public class MemberLevelController {
+
+     private final UserFeign userFeign;
+     @GetMapping("/list")
+     public ObjectRestResponse<BaseUserMemberLevel> listMemberLevels(){
+          List<BaseUserMemberLevel> levels = userFeign.levels();
+          return ObjectRestResponse.succ(levels);
+     }
+}

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/SearchController.java

 package com.xxfc.platform.uccn.rest;
 
+import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.campsite.vo.CampsiteShopPageVo;
+import com.xxfc.platform.tour.entity.TourGood;
 import com.xxfc.platform.uccn.biz.SearchBiz;
 import com.xxfc.platform.uccn.comstnt.ServiceConstant;
+import com.xxfc.platform.uccn.entity.Article;
 import com.xxfc.platform.uccn.vo.SearchResultVo;
+import com.xxfc.platform.uccn.vo.ServiceResultVo;
+import com.xxfc.platform.uccn.vo.SummitActivityVo;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
+import com.xxfc.platform.vehicle.pojo.VehicleModelVo;
 import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
+import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyListVO;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author libin
  * @version 1.0
@@ -48,24 +60,74 @@ public class SearchController {
                 vehicleModelQueryCondition.setPage(page);
                 vehicleModelQueryCondition.setLimit(limit);
                 vehicleModelQueryCondition.setVehicleName(keyWord);
-                return vehicleModelController.findVehicleModelPageUnauthfind(vehicleModelQueryCondition);
+                ObjectRestResponse<PageDataVO<VehicleModelVo>> vehicleResult =vehicleModelController.findVehicleModelPageUnauthfind(vehicleModelQueryCondition);
+                List<VehicleModelVo> vehicleModelVoList = vehicleResult.getData().getData();
+                Long vehicleTotalCount = vehicleResult.getData().getTotalCount();
+                ServiceResultVo<VehicleModelVo> vehicleModelVoServiceResultVo = new ServiceResultVo<>();
+                vehicleModelVoServiceResultVo.setData(vehicleModelVoList);
+                vehicleModelVoServiceResultVo.setTotalCount(vehicleTotalCount);
+                SearchResultVo searchResultVo = new SearchResultVo();
+                searchResultVo.put(ServiceConstant.VEHICLE,vehicleModelVoServiceResultVo);
+                return  ObjectRestResponse.succ(searchResultVo);
+
             case ServiceConstant.BRANCH_COMPANY:
                 BranchCompanyFindDTO branchCompanyFindDTO = new BranchCompanyFindDTO();
                 branchCompanyFindDTO.setPage(page);
                 branchCompanyFindDTO.setLimit(limit);
                 branchCompanyFindDTO.setName(keyWord);
-                return branchCompanyController.listBranchCompanyWithPage(branchCompanyFindDTO);
+                ObjectRestResponse<PageDataVO>  branchResult = branchCompanyController.listBranchCompanyWithPage(branchCompanyFindDTO);
+                List branchCompanyList = branchResult.getData().getData();
+                Long branchCompanyTotalCount = branchResult.getData().getTotalCount();
+                ServiceResultVo<BranchCompanyListVO> companyServiceResultVo = new ServiceResultVo<>();
+                companyServiceResultVo.setData(branchCompanyList);
+                companyServiceResultVo.setTotalCount(branchCompanyTotalCount);
+                SearchResultVo branchCompanyResultVo = new SearchResultVo();
+                branchCompanyResultVo.put(ServiceConstant.BRANCH_COMPANY,companyServiceResultVo);
+                return ObjectRestResponse.succ(branchCompanyResultVo);
             case ServiceConstant.TROUR:
-                return gwTourController.getGoodList(page, limit, null, keyWord);
+                ObjectRestResponse goodresult = gwTourController.getGoodList(page, limit, null, keyWord);
+                PageDataVO<TourGood> data = (PageDataVO<TourGood>)goodresult.getData();
+                List<TourGood> tourGoodList = data.getData();
+                Long tourGoodTotalCount = data.getTotalCount();
+                ServiceResultVo<TourGood> tourGoodServiceResultVo = new ServiceResultVo<>();
+                tourGoodServiceResultVo.setData(tourGoodList);
+                tourGoodServiceResultVo.setTotalCount(tourGoodTotalCount);
+                SearchResultVo tourGoodSearchResult =  new SearchResultVo();
+                tourGoodSearchResult.put(ServiceConstant.TROUR,tourGoodServiceResultVo);
+                return ObjectRestResponse.succ(tourGoodSearchResult);
             case ServiceConstant.CAMPSITE:
-                return campsiteUccnController.findCampsiteShopPageByType(null, page, limit, keyWord);
+                ObjectRestResponse<PageDataVO<CampsiteShopPageVo>> campsiteResult = campsiteUccnController.findCampsiteShopPageByType(null, page, limit, keyWord);
+                List<CampsiteShopPageVo> campsiteShopPageVoList = campsiteResult.getData().getData();
+                Long campsiteTotalCount = campsiteResult.getData().getTotalCount();
+                ServiceResultVo<CampsiteShopPageVo> campsiteShopPageVoServiceResultVo = new ServiceResultVo<>();
+                campsiteShopPageVoServiceResultVo.setData(campsiteShopPageVoList);
+                campsiteShopPageVoServiceResultVo.setTotalCount(campsiteTotalCount);
+                SearchResultVo campsiteSearchResultVo = new SearchResultVo();
+                campsiteSearchResultVo.put(ServiceConstant.CAMPSITE,campsiteShopPageVoServiceResultVo);
+                return ObjectRestResponse.succ(campsiteSearchResultVo);
             case ServiceConstant.NEWS:
-                return articleController.getArticleList(page, limit, null, keyWord);
+                ObjectRestResponse articleresult = articleController.getArticleList(page, limit, 1, keyWord);
+                PageInfo<Article> articlePageDataVO = (PageInfo<Article>)articleresult.getData();
+                List<Article> articleList = articlePageDataVO.getList();
+                Long articleTotalCount = articlePageDataVO.getTotal();
+                ServiceResultVo<Article> articleServiceResultVo = new ServiceResultVo<>();
+                articleServiceResultVo.setTotalCount(articleTotalCount);
+                articleServiceResultVo.setData(articleList);
+                SearchResultVo  articleSearchResult= new SearchResultVo();
+                articleSearchResult.put(ServiceConstant.NEWS,articleServiceResultVo);
+                return ObjectRestResponse.succ(articleSearchResult);
             case ServiceConstant.ACTIVITY:
-                return summitActivityController.findSummitActivityWithPage(page, limit, null, keyWord);
+                ObjectRestResponse<PageDataVO<SummitActivityVo>> summitActivityWithPage = summitActivityController.findSummitActivityWithPage(page, limit, null, keyWord);
+                List<SummitActivityVo> summitActivityVos = summitActivityWithPage.getData().getData();
+                Long summitTotalCount = summitActivityWithPage.getData().getTotalCount();
+                ServiceResultVo<SummitActivityVo> summitActivityVoServiceResultVo = new ServiceResultVo<>();
+                summitActivityVoServiceResultVo.setData(summitActivityVos);
+                summitActivityVoServiceResultVo.setTotalCount(summitTotalCount);
+                SearchResultVo summitActivitySearchResult = new SearchResultVo();
+                summitActivitySearchResult.put(ServiceConstant.ACTIVITY,summitActivityVoServiceResultVo);
+                return ObjectRestResponse.succ(summitActivitySearchResult);
             default:
-                SearchResultVo searchResultVo = searchBiz.searchWithKeyWords(keyWord);
-                return ObjectRestResponse.succ(searchResultVo);
+                return ObjectRestResponse.succ(searchBiz.searchWithKeyWords(keyWord));
         }
     }
 }

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/DictionaryKey.java

@@ -7,6 +7,17 @@ public class DictionaryKey {
      */
     public static final String APP_ORDER ="APP_ORDER";
 
+
+    /**
+     * 违约类型
+     */
+    public static final String ILLEGAL_TYPE = "ILLEGAL_TYPE";
+
+    /**
+     * 更换还车公司费用计算单价
+     */
+    public static final String ILLEGAL_FEE_PRICE = "ILLEGAL_FEE_PRICE";
+
     /**
      * IM类型
      */

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/authenticationInterface/UserAuthentication.java

@@ -5,7 +5,7 @@ import com.xxfc.platform.universal.biz.UserMessage;
 import java.util.Map;
 
 /**
- * 用户认证类
+ * 用户认证接口 (使用@Primary实现的优先级提升优先级)
  * @author Administrator
  */
 public interface UserAuthentication {

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/authenticationInterface/impl/BJCYAuthentication.java

@@ -25,7 +25,7 @@ import java.util.Map;
  */
 @Service
 @Slf4j
-@Primary
+//@Primary
 public class BJCYAuthentication implements UserAuthentication {
     private final String host = "http://aliyunverifyidcard.haoservice.com";
     private final String path = "/idcard/VerifyIdcardv2";
@@ -39,7 +39,8 @@ public class BJCYAuthentication implements UserAuthentication {
     private final String ret="error_code";
     @Override
     public boolean certificate(UserMessage message) {
-        Map<String, String> headers = new HashMap<String, String>();
+        return true;
+        /*Map<String, String> headers = new HashMap<String, String>();
         headers.put(tokenHead, token);
         Map<String, String> querys = new HashMap<String, String>();
         querys.put(cardNo, message.getIdNumber());
@@ -66,7 +67,7 @@ public class BJCYAuthentication implements UserAuthentication {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return false;
+        return false;*/
     }
 
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/authenticationInterface/impl/XCFQAuthentication.java

@@ -12,6 +12,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.StatusLine;
 import org.apache.http.util.EntityUtils;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -24,6 +25,7 @@ import java.util.Map;
  */
 @Service
 @Slf4j
+@Primary
 public class XCFQAuthentication implements UserAuthentication {
 
     private String cAppcode="acea1c8811f748b3a65815f11db357c4";
@@ -33,10 +35,8 @@ public class XCFQAuthentication implements UserAuthentication {
      */
     private String cHost = "https://idcert.market.alicloudapi.com";
 
-
     private String cPath = "/idcard";
 
-
     private String cMethod = "GET";
 
     //响应:认证错误码字段名
@@ -45,7 +45,6 @@ public class XCFQAuthentication implements UserAuthentication {
     //响应:认证通过码
     private String certifResultCode = "01";
 
-
     //请求:身份证号字段名
     private String idCardName = "idCard";
 
@@ -55,11 +54,9 @@ public class XCFQAuthentication implements UserAuthentication {
     @Override
     public boolean certificate(UserMessage message) {
         //map携带身份证和姓名进行认证
-
         Map<String, String> querys = new HashMap<>();
         querys.put(idCardName, message.getIdNumber());
         querys.put(cName, message.getName());
-
         Map<String, String> headers = new HashMap<String, String>();
         headers.put("Authorization", "APPCODE " + cAppcode);
         try {

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/BookType.java

@@ -16,7 +16,8 @@ public enum BookType {
     BOOKING(7,"预约中"),
     DISABLE(8,"禁用"),
     CUSTOMER_APPLY(9, "客户用车"),
-    OTHER(10, "其他")
+    OTHER(10, "其他"),
+    DISPATCH(11, "调度")
     ;
     /**
      * 编码

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/ResCode/ResCode.java

@@ -49,6 +49,8 @@ public enum ResCode {
     VEHICLE_UPKEEP_VEHICLE_DISABLE(106002,"车辆不可用"),
     VEHICLE_UPKEEP_ITEM_UNEXIST(106003, "保养项目不存在"),
     VEHICLE_UPKEEP_VEHICLE_UNUPKEEP(106004, "车辆不在保养中"),
+    VEHICLE_STATUS_IS_NOT_NORMAL(106005, "上次的出行未做收车操作, 请先收车"),
+
 
     VEHICLE_IS_BOOKED_TODAY(106006, "车辆当前时段已经被预定"),
     FIND_VEHICLE_PLAT_FAILE(106007, "获取车型列表失败"),

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/BookRecordUpdateLog.java

@@ -52,4 +52,10 @@ public class BookRecordUpdateLog {
      */
     @Column(name = "create_time")
     private Date createTime;
+
+    @Transient
+    private String oldCompanyName;
+
+    @Transient
+    private String newCompanyName;
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -30,7 +30,7 @@ public interface VehicleFeign {
     public ObjectRestResponse<Vehicle> get(@PathVariable(value = "id") String id);
 
     @RequestMapping(value = "/vehicleInfo/findById", method = RequestMethod.GET)
-    public RestResponse<Vehicle> findById(@RequestParam(value = "id")String id);
+    public RestResponse<Vehicle> findById(@RequestParam(value = "id") String id);
 
     @RequestMapping(value = "/vehicleInfo/getByIds", method = RequestMethod.GET)
     public RestResponse< List<Vehicle>> getByIds(@RequestParam(value = "ids") List<String> id);
@@ -44,11 +44,11 @@ public interface VehicleFeign {
     public RestResponse arrivalBySmall(@RequestBody VehicleArrivalVo arrivalVo);
 
     @GetMapping(value = "/vehicleModel/app/unauth/findRandomVehicle")
-    public ObjectRestResponse findRandomVehicle(@RequestParam(value="number")Integer number);
+    public ObjectRestResponse findRandomVehicle(@RequestParam(value = "number") Integer number);
 
     //修改评分
     @RequestMapping(value = "/vehicleModel/app/addScore", method = RequestMethod.GET)
-    public RestResponse addScore(@RequestParam(value="id")Integer  id, @RequestParam(value="score")Integer  score);
+    public RestResponse addScore(@RequestParam(value = "id") Integer id, @RequestParam(value = "score") Integer score);
 
     @RequestMapping(value = "/vehicleInfo/rent/book/vehicle", method = RequestMethod.POST)
     public ObjectRestResponse<VehicleBookRecord> rentApplyVehicle(@RequestBody RentVehicleBookDTO rentVehicleBookDTO);
@@ -71,25 +71,29 @@ public interface VehicleFeign {
     //获取分公司列表
     @GetMapping("/branchCompany/all")
     public  List<BranchCompany>  companyAll(
-            @RequestParam(value = "dataAll")Integer dataAll,
-            @RequestParam(value = "dataCompany")String dataCompany,
-            @RequestParam(value = "dataZone")String dataZone);
+            @RequestParam(value = "dataAll") Integer dataAll,
+            @RequestParam(value = "dataCompany") String dataCompany,
+            @RequestParam(value = "dataZone") String dataZone);
+
+    //获取分公司列表
+    @GetMapping("/company/base/app/unauth/companyId")
+    public  BranchCompany  companyId(@RequestParam(value = "name") String name);
 
     @GetMapping("/branchCompany/entityList")
     public ObjectRestResponse<List<BranchCompany>> branchCompanyEntityList(@RequestParam("entity") Map<String, Object> entity);
 
     @RequestMapping(value = "/user/license/one", method = RequestMethod.GET)
-    public RestResponse<VehicleUserLicense> one(@RequestParam(value="id",defaultValue="0")Integer  id) throws Exception;
+    public RestResponse<VehicleUserLicense> one(@RequestParam(value = "id", defaultValue = "0") Integer id) throws Exception;
 
     @RequestMapping(value = "/user/license/company/getOne", method = RequestMethod.GET)
     public RestResponse<VehicleUserLicense> getOne(
-            @RequestParam(value="id",defaultValue="0")Integer  id) throws Exception ;
+            @RequestParam(value = "id", defaultValue = "0") Integer id) throws Exception ;
 
     @RequestMapping(value = "/user/license/multi", method = RequestMethod.GET)
     public ObjectRestResponse<List<VehicleUserLicense>> multi(@RequestBody QueryMultiDTO dto) throws Exception;
 
     @GetMapping("/user/license/getVehicleLicenseList")
-    public ObjectRestResponse<List<VehicleUserLicense>> getVehicleLicenseList(@RequestParam(value="ids") String ids);
+    public ObjectRestResponse<List<VehicleUserLicense>> getVehicleLicenseList(@RequestParam(value = "ids") String ids);
 
     /**
      * 获取优质车型接口
@@ -122,8 +126,8 @@ public interface VehicleFeign {
      * @return
      */
     @GetMapping("/city/corporationCity")
-    ObjectRestResponse<Set<Integer>> corporationCity( @RequestParam(value = "zoneList") String zoneList,
-                                                       @RequestParam(value = "companyList") String companyList);
+    ObjectRestResponse<Set<Integer>> corporationCity(@RequestParam(value = "zoneList") String zoneList,
+                                                     @RequestParam(value = "companyList") String companyList);
 
 
     @GetMapping("/accompanyingItem/app/unauth/items")
@@ -163,9 +167,12 @@ public interface VehicleFeign {
     PageDataVO<BranchCompanyListVO> findBranchCompanyWithPage(@RequestBody BranchCompanyFindDTO branchCompanyFindDTO);
 
     @GetMapping("/vehicleInfo/findVehicleIds")
-    List<String> findbyPlateNumberAndVehicleCod(@RequestParam(value = "plateNumber") String plateNumber,@RequestParam(value = "vehicleCode") String vehicleCode);
+    List<String> findbyPlateNumberAndVehicleCod(@RequestParam(value = "plateNumber") String plateNumber, @RequestParam(value = "vehicleCode") String vehicleCode);
 
     @RequestMapping(value = "/vehicleInfo/bookRecord/update", method = RequestMethod.POST)
     public ObjectRestResponse update(@RequestBody BookRecordUpdateLog bookRecordUpdateLog);
 
+    @GetMapping(value = "/bookRecord/get")
+    public ObjectRestResponse<List<BookRecordUpdateLog>> get(@RequestParam(value = "bookRecordId")Long bookRecordId);
+
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordQueryVo.java

@@ -59,4 +59,6 @@ public class VehicleBookRecordQueryVo extends PageParam {
     private List<Integer> companyIds;
     private String upkeepIds;
     private Integer userCompany;
+
+    private Integer zoneId;
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/BranchCompanyListDTO.java

@@ -20,6 +20,7 @@ public class BranchCompanyListDTO {
      */
     @ApiModelProperty("分公司名称")
     private String name;
+    private String companyName;
     /**
      * 公司封面
      */

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/BranchCompanyListVO.java

@@ -20,6 +20,7 @@ public class BranchCompanyListVO {
      */
     @ApiModelProperty("分公司名称")
     private String name;
+    private String companyName;
     /**
      * 公司封面
      */

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/util/DistanceUtil.java

+package com.xxfc.platform.vehicle.util;
+
+import java.awt.geom.Point2D;
+import java.math.BigDecimal;
+
+public class DistanceUtil {
+    private static final double EARTH_RADIUS = 6371393; // 平均半径,单位：m
+    /**
+     * 通过AB点经纬度获取距离
+     * @param pointA A点(经，纬)
+     * @param pointB B点(经，纬)
+     * @return 距离(单位：米)
+     */
+    public static double getDistance(Point2D pointA, Point2D pointB) {
+        // 经纬度（角度）转弧度。弧度用作参数，以调用Math.cos和Math.sin
+        double radiansAX = Math.toRadians(pointA.getX()); // A经弧度
+        double radiansAY = Math.toRadians(pointA.getY()); // A纬弧度
+        double radiansBX = Math.toRadians(pointB.getX()); // B经弧度
+        double radiansBY = Math.toRadians(pointB.getY()); // B纬弧度
+
+        // 公式中“cosβ1cosβ2cos（α1-α2）+sinβ1sinβ2”的部分，得到∠AOB的cos值
+        double cos = Math.cos(radiansAY) * Math.cos(radiansBY) * Math.cos(radiansAX - radiansBX)
+                + Math.sin(radiansAY) * Math.sin(radiansBY);
+//        System.out.println("cos = " + cos); // 值域[-1,1]
+        double acos = Math.acos(cos); // 反余弦值
+//        System.out.println("acos = " + acos); // 值域[0,π]
+//        System.out.println("∠AOB = " + Math.toDegrees(acos)); // 球心角 值域[0,180]
+        return EARTH_RADIUS * acos; // 最终结果
+    }
+
+    public static double getDistance(double longitude1, double latitude1, double longitude2, double latitude2) {
+        Point2D pointDD = new Point2D.Double(longitude1, latitude1);
+        // 北京 西单地铁站
+        Point2D pointXD = new Point2D.Double(longitude2, latitude2);
+        return getDistance(pointDD, pointXD);
+    }
+
+
+    public static void main(String[] args) {
+        // 北京 东单地铁站
+        Point2D pointDD = new Point2D.Double(113.906121, 22.985271);
+        // 北京 西单地铁站
+        Point2D pointXD = new Point2D.Double(114.42078, 23.05989);
+
+        System.out.println(getDistance(pointDD, pointXD));
+        BigDecimal distanceNum = new BigDecimal(getDistance(pointDD, pointXD) + "").divide(new BigDecimal("1000"), 0, BigDecimal.ROUND_UP);
+        BigDecimal bigDecimal = new BigDecimal(2);
+        System.out.println(distanceNum.multiply(bigDecimal));
+
+    }
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BookRecordUpdateLogBiz.java

@@ -3,12 +3,20 @@ package com.xxfc.platform.vehicle.biz;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.entity.BookRecordUpdateLog;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.mapper.BookRecordUpdateLogMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
 
 @Service
 public class BookRecordUpdateLogBiz extends BaseBiz<BookRecordUpdateLogMapper, BookRecordUpdateLog> {
 
+    @Autowired
+    BranchCompanyBiz branchCompanyBiz;
+
     public ObjectRestResponse save(BookRecordUpdateLog bookRecordUpdateLog) {
         BookRecordUpdateLog oldValue = mapper.selectOne(bookRecordUpdateLog);
         if (oldValue != null) {
@@ -18,4 +26,22 @@ public class BookRecordUpdateLogBiz extends BaseBiz<BookRecordUpdateLogMapper, B
         return ObjectRestResponse.succ();
     }
 
+    public ObjectRestResponse<List<BookRecordUpdateLog>> selectByBookRecordId(Long bookRecordId) {
+        Example example = new Example(BookRecordUpdateLog.class);
+        example.createCriteria().andEqualTo("bookRecordId", bookRecordId);
+        example.setOrderByClause("create_time desc");
+        List<BookRecordUpdateLog> bookRecordUpdateLogs = selectByExample(example);
+        for (BookRecordUpdateLog bookRecordUpdateLog : bookRecordUpdateLogs) {
+            BranchCompany oldCompany = branchCompanyBiz.getById(bookRecordUpdateLog.getOldRetCompanyId());
+            if (oldCompany != null) {
+                bookRecordUpdateLog.setOldCompanyName(oldCompany.getName());
+            }
+            BranchCompany newCompany = branchCompanyBiz.getById(bookRecordUpdateLog.getNewRetCompanyId());
+            if (newCompany != null) {
+                bookRecordUpdateLog.setNewCompanyName(newCompany.getName());
+            }
+        }
+        return ObjectRestResponse.succ(bookRecordUpdateLogs);
+    }
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

@@ -215,7 +215,9 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
 
     @Cache(key = RedisKey.BRANCH_COMPANY_CACHE_ALL)
     public List<BranchCompany> getAll() {
-        return mapper.selectAll();
+        Example example = new Example(BranchCompany.class);
+        example.createCriteria().andEqualTo("isDel", 0);
+        return mapper.selectByExample(example);
     }
 
     /**

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/CompanyBaseBiz.java

@@ -198,6 +198,35 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
         return  ObjectRestResponse.succ();
     }
 
+    //临时数据同步6
+    public ObjectRestResponse synchro6(){
+        List<CompanyBase> list= mapper.getBaseList();
+        if (list.size()>0){
+            int num=0;
+            for (CompanyBase companyBase:list){
+                        String name=companyBase.getName();
+                        BranchCompany branchCompany=new BranchCompany();
+                        branchCompany.setCompanyBaseId(companyBase.getId());
+                        name= name.substring(name.indexOf("（")+1,name.indexOf("）"));
+                        name+="分公司";
+                        log.info("----name=="+name);
+                        branchCompany.setName(name);
+                        branchCompany.setAddrProvince(companyBase.getAddrProvince());
+                        branchCompany.setProvinceName(companyBase.getProvinceName());
+                        branchCompany.setAddrCity(companyBase.getAddrCity());
+                        branchCompany.setCityName(companyBase.getCityName());
+                        branchCompany.setAddrTown(companyBase.getAddrTown());
+                        branchCompany.setTownName(companyBase.getTownName());
+                        branchCompany.setZoneId(companyBase.getZoneId());
+                        branchCompany.setStatus(1);
+                        branchCompanyBiz.insertSelective(branchCompany);
+                        num++;
+                        log.info("----成功---num=="+num+"---companyBaseId==="+companyBase.getId());
+                    }
+                }
+        return  ObjectRestResponse.succ();
+    }
+
     //临时数据同步3
     public ObjectRestResponse synchro3(){
         List<BranchCompanyStockInfo> list= stockInfoMapper.selectAll();
@@ -434,4 +463,8 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
         return companyBaseVo;
     }
 
+    public  BranchCompany getCompanyId(String name){
+        return  mapper.getCompanyId(name);
+    }
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.biz;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.constant.*;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.*;
@@ -59,7 +60,7 @@ public class VehicleActiveService {
      */
     public void departure(VehicleDepartureVo departureVo) {
         log.info("出车参数： departureVo = {}", departureVo.toString());
-        Vehicle vehicle = vehicleMapper.selectByPrimaryKey(departureVo.getVehicleId());
+        Vehicle vehicle = vehicleBiz.selectById(departureVo.getVehicleId());
         if (vehicle == null) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode());
@@ -68,9 +69,9 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getDesc(),
                     ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getCode());
         }
-        if (vehicle.getStatus().equals(VehicleStatus.DISCARD.getCode()) || vehicle.getIsDel() == 1) {
-            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
-                    ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
+        if (vehicle.getStatus().equals(VehicleStatus.DISCARD.getCode()) || vehicle.getIsDel() == 1 || vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
+            throw new BaseException(ResCode.VEHICLE_STATUS_IS_NOT_NORMAL.getDesc(),
+                    ResCode.VEHICLE_STATUS_IS_NOT_NORMAL.getCode());
         }
         //添加出车时间过滤 再出车开始时间前一天至结束时间内可以出车,并且预定记录为已审核状态
         checkDateInvalid(departureVo);
@@ -309,6 +310,10 @@ public class VehicleActiveService {
         }
     }
 
+    public void save(VehicleDepartureLog vehicleDepartureLog){
+        vehicleDepartureLogMapper.insertSelective(vehicleDepartureLog);
+    }
+
     //添加出车时间过滤 再出车开始时间前一天至结束时间内可以出车,并且预定记录为已审核状态
     public void checkDateInvalid(VehicleDepartureVo arrivalVo) {
         if (arrivalVo.getBookRecordId() != null) {
@@ -452,6 +457,17 @@ public class VehicleActiveService {
 
     }
 
+    public ObjectRestResponse selectDepartureLogByBookRecordId(Long bookRecordId) {
+        if (bookRecordId == null) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        VehicleDepartureLogVo vehicleDepartureLog = vehicleDepartureLogMapper.selectByBookRecordId(bookRecordId);
+        if (vehicleDepartureLog == null) {
+            return ObjectRestResponse.createFailedResult(ResCode.FIND_DATA_NOT_EXIST.getCode(), ResCode.FIND_DATA_NOT_EXIST.getDesc());
+        }
+        return ObjectRestResponse.succ(vehicleDepartureLog);
+    }
+
 
     public static void main(String[] args) {
         DateTime startDate = DateTime.parse("2019-08-21 17:00:00", DATE_TIME_FORMATTER);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -19,11 +19,8 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
-import com.xxfc.platform.vehicle.constant.ConstantType;
-import com.xxfc.platform.vehicle.constant.RedisKey;
+import com.xxfc.platform.vehicle.constant.*;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
-import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
-import com.xxfc.platform.vehicle.constant.VehicleStatus;
 import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.mapper.BookRecordAccItemMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleBookInfoMapper;
@@ -275,10 +272,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
      */
     @Transactional
     public RestResponse update(List<AddOrUpdateVehicleVo> addOrUpdateVehicleVoList) throws Exception {
-        if (addOrUpdateVehicleVoList.size() > MAX_BATCH_SIZE_VEHICLE) {
+        if (addOrUpdateVehicleVoList != null && addOrUpdateVehicleVoList.size() > MAX_BATCH_SIZE_VEHICLE) {
             throw new BaseException(ResultCode.ADD_VEHICLE_MORE);
         }
-
+        UserDTO userDTO = getAdminUserInfo();
+        if (userDTO == null) {
+            throw new BaseException(ResultCode.RSTOKEN_EXPIRED_CODE);
+        }
         for (AddOrUpdateVehicleVo addOrUpdateVehicleVo : addOrUpdateVehicleVoList) {
             Vehicle vehicle = new Vehicle();
             BeanUtilsBean.getInstance().copyProperties(vehicle, addOrUpdateVehicleVo);
@@ -291,7 +291,35 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             if (CollectionUtils.isNotEmpty(exitsVehicles)) {
                 for (Vehicle exitsVehicle : exitsVehicles) {
                     if (exitsVehicle.getId().equals(addOrUpdateVehicleVo.getId())) {
-                        continue;
+                        //如果修改的有停靠分公司，需要添加一条调度记录
+                        Vehicle vehicle1 = selectById(exitsVehicle.getId());
+                        if (vehicle1 != null) {
+                            if (vehicle1.getParkBranchCompanyId() != addOrUpdateVehicleVo.getParkBranchCompanyId()) {
+                                VehicleBookRecord vehicleBookRecord = new VehicleBookRecord();
+                                vehicleBookRecord.setRetCompany(addOrUpdateVehicleVo.getParkBranchCompanyId());
+                                vehicleBookRecord.setLiftCompany(vehicle1.getParkBranchCompanyId());
+                                vehicleBookRecord.setRemark("后台修改停靠公司，调度车辆");
+                                vehicleBookRecord.setBookStartDate(new Date());
+                                vehicleBookRecord.setBookEndDate(new Date());
+                                vehicleBookRecord.setActualEndDate(new Date());
+                                vehicleBookRecord.setActualStartDate(new Date());
+                                vehicleBookRecord.setBookUser(userDTO.getId());
+                                vehicleBookRecord.setBookUserName(userDTO.getUsername());
+                                vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
+                                vehicleBookRecord.setBookType(BookType.DISPATCH.getCode());
+                                vehicleBookRecord.setVehicleId(vehicle1.getId());
+                                vehicleBookRecord.setVehicleUsername(userDTO.getUsername());
+                                vehicleBookRecord.setVehicleUserPhone(userDTO.getUsername());
+                                ObjectRestResponse objectRestResponse = addVehicleBookRecord(vehicleBookRecord);
+                                if(objectRestResponse.isRel()) {
+                                    continue;
+                                } else {
+                                    return RestResponse.codeAndMessage(objectRestResponse.getStatus(), objectRestResponse.getMessage());
+                                }
+
+                            }
+                        }
+
                     }
                     return RestResponse.codeAndMessage(ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getCode(),
                             ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getDesc());
@@ -309,6 +337,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return RestResponse.suc();
     }
 
+    public ObjectRestResponse addVehicleBookRecord(VehicleBookRecord vehicleBookRecord) {
+        return vehicleBookRecordBiz.addBookRecord(vehicleBookRecord);
+    }
+
     /**
      * 废弃车辆（状态设置为废弃）
      *
@@ -326,95 +358,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return RestResponse.suc();
     }
 
-//    /**
-//     * 申请汽车预定（内部）
-//     * 检查是否可预定，修改相关预定记录状态
-//     * @param userId
-//     * @param bookVehicleVo
-//     * @return
-//     */
-//    @Transactional
-//    public VehicleBookRecord applyVehicle4Employee(Integer userId, BookVehicleVO bookVehicleVo, String userName) throws Exception{
-//        //检查车辆信息是否合法
-//        checkIfVehicleExists(bookVehicleVo.getVehicleId());
-//        //提取日期和相应的预定目标日期
-//        Map<String,List<String>> yearMonthAndDate = Maps.newHashMap();
-//        //预定时间不能为空
-//        if(StringUtils.isBlank(bookVehicleVo.getBookStartDate()) || StringUtils.isBlank(bookVehicleVo.getBookEndDate())){
-//            throw new BaseException(ResultCode.DATE_TIME_IS_NULL);
-//        }
-//        String[] bookStartDateArray = bookVehicleVo.getBookStartDate().split(" ");
-//        String[] bookEndDateArray = bookVehicleVo.getBookEndDate().split(" ");
-//
-//        DateTime startDay =DateTime.parse(bookStartDateArray[0],DEFAULT_DATE_TIME_FORMATTER);
-//        DateTime endDay =DateTime.parse(bookEndDateArray[0], DEFAULT_DATE_TIME_FORMATTER);
-//
-//
-//        //转换日期范围为列表，并检查是否合法
-//        fillDateList4DatePeriod(yearMonthAndDate,startDay,endDay);
-//        if(yearMonthAndDate.size()>3){//连续的日期最多夸3个月
-//            throw new BaseException(ResultCode.ONLY_BOOK_TWO_MONTH);
-//        }
-//        Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getBookStartDate(), bookVehicleVo.getBookEndDate());
-//        //检查车辆是否可以预定
-//        for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
-//            Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey(), map);
-//            if(Boolean.FALSE.equals(rsEach)){
-//                throw new BaseException(ResultCode.VEHICLE_IS_BOOKED);
-//            }
-//        }
-//
-//        //加入预定申请记录
-//        VehicleBookRecord vehicleBookRecord = new VehicleBookRecord();
-//        vehicleBookRecord.setVehicleId(bookVehicleVo.getVehicleId());
-//        vehicleBookRecord.setBookType(bookVehicleVo.getBookType());
-//        vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPLY.getCode());
-//        vehicleBookRecord.setBookUser(userId);
-//        vehicleBookRecord.setBookUserName(userName);
-//        vehicleBookRecord.setBookStartDate(DateTime.
-//                parse(bookStartDateArray[0],DEFAULT_DATE_TIME_FORMATTER).toDate());
-//        vehicleBookRecord.setBookEndDate(DateTime.
-//                parse(bookEndDateArray[0],DEFAULT_DATE_TIME_FORMATTER).toDate());
-//        vehicleBookRecord.setLiftAddr(bookVehicleVo.getLiftAddr());
-//        vehicleBookRecord.setRemark(bookVehicleVo.getRemark());
-//        vehicleBookRecord.setDestination(bookVehicleVo.getDestination());
-//        vehicleBookRecord.setLiftCompany(bookVehicleVo.getLiftCompany());
-//        vehicleBookRecord.setRetCompany(bookVehicleVo.getRetCompany());
-//        vehicleBookRecord.setOrderNo(bookVehicleVo.getOrderNo());
-//        vehicleBookRecordBiz.save(vehicleBookRecord);
-////        //添加预定时间记录
-////
-////            Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getBookStartDate(), bookVehicleVo.getBookEndDate());
-////            for(Map.Entry<String, Integer> entry : map.entrySet()) {
-////                VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
-////                vehicleBookHourInfoDto.setVehicleId(bookVehicleVo.getVehicleId());
-////                vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
-////                vehicleBookHourInfoDto.setBookedHour(entry.getValue());
-////                vehicleBookHourInfoBiz.save(vehicleBookHourInfoDto);
-////            }
-//
-//        //修改相关车辆预定记录
-//        Boolean hasSuc = bookedVehicle(bookVehicleVo);
-//        if(!hasSuc){
-//            throw new BaseException(ResultCode.BOOKED_FAILED_CODE);
-//        }
-//
-//        //添加随车物品
-//        List<Map<String,Object>> params = Lists.newArrayList();
-//        if(MapUtils.isNotEmpty(bookVehicleVo.getSelectedAccItem())){
-//            for(Map.Entry<Integer,Integer> idAndAmount : bookVehicleVo.getSelectedAccItem().entrySet()){
-//                Map<String,Object> row = Maps.newHashMap();
-//                row.put("id",idAndAmount.getKey());
-//                row.put("amount",idAndAmount.getValue());
-//                row.put("bookRecordId",vehicleBookRecord.getId());
-//                params.add(row);
-//            }
-//            bookRecordAccItemMapper.batchAdd(params);
-//        }
-//
-//        return vehicleBookRecord;
-//    }
-
     /**
      * 不需要审核
      *
@@ -546,6 +489,25 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return Boolean.TRUE;
     }
 
+    /**
+     *
+     * @param vehicleId
+     * @return
+     */
+    public ObjectRestResponse checkVehicleStatus(String vehicleId) {
+        if (StringUtils.isBlank(vehicleId)) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        Vehicle vehicle = mapper.selectByPrimaryKey(vehicleId);
+        if (vehicle == null) {
+            return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_UPKEEP_VEHICLE_UNEXIST.getCode(), ResCode.VEHICLE_UPKEEP_VEHICLE_UNUPKEEP.getDesc());
+        }
+        if (vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode()) || vehicle.getStatus().equals(VehicleStatus.DISCARD.getCode()) || vehicle.getIsDel() != 0) {
+            return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_STATUS_IS_NOT_NORMAL.getCode(), ResCode.VEHICLE_STATUS_IS_NOT_NORMAL.getDesc());
+        }
+        return ObjectRestResponse.succ();
+    }
+
 
     public boolean filterHourInfoBooked(String vehicleId, Map<String, Integer> hourInfo) {
         if (MapUtils.isEmpty(hourInfo)) {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java

@@ -80,6 +80,9 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     @Autowired
     BookRecordUpdateLogBiz bookRecordUpdateLogBiz;
 
+    @Autowired
+    VehicleActiveService vehicleActiveService;
+
     @Override
     public UserFeign getUserFeign() {
         return userFeign;
@@ -302,6 +305,38 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         return RestResponse.suc();
     }
 
+    public ObjectRestResponse addBookRecord(VehicleBookRecord vehicleBookRecord) {
+            if (vehicleBookRecord == null) {
+                return ObjectRestResponse.paramIsEmpty();
+            }
+            save(vehicleBookRecord);
+            if (vehicleBookRecord != null) {
+                //添加交还车记录
+                VehicleDepartureLog vehicleDepartureLog = new VehicleDepartureLog();
+                vehicleDepartureLog.setBookRecordId(vehicleBookRecord.getId());
+                vehicleDepartureLog.setArrivalBranchCompanyId(vehicleBookRecord.getRetCompany());
+                vehicleDepartureLog.setArrivalRemark("后台修改停靠分公司，车辆调度");
+                vehicleDepartureLog.setArrivalTime(new Date());
+                vehicleDepartureLog.setCheckMan(vehicleBookRecord.getBookUserName());
+                vehicleDepartureLog.setCheckManTel(vehicleBookRecord.getBookUserName());
+                vehicleDepartureLog.setCreateTime(new Date());
+                vehicleDepartureLog.setDepartureBranchCompanyId(vehicleBookRecord.getLiftCompany());
+                vehicleDepartureLog.setDepartureRemark("后台修改停靠分公司，车辆调度");
+                vehicleDepartureLog.setDepartureTime(new Date());
+                vehicleDepartureLog.setRecycleMan(vehicleBookRecord.getBookUserName());
+                vehicleDepartureLog.setRecycleManTel(vehicleBookRecord.getBookUserName());
+                vehicleDepartureLog.setState(1);
+                vehicleDepartureLog.setVehicleId(vehicleBookRecord.getVehicleId());
+                vehicleDepartureLog.setUse("调度");
+                vehicleDepartureLog.setUser(vehicleBookRecord.getBookUserName());
+                vehicleDepartureLog.setUserTel(vehicleBookRecord.getBookUserName());
+                vehicleActiveService.save(vehicleDepartureLog);
+            }
+
+        return ObjectRestResponse.succ();
+    }
+
+
     /**
      * 按页查询
      *

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/CompanyBaseMapper.java

 package com.xxfc.platform.vehicle.mapper;
 
 
+import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.CompanyBase;
 import com.xxfc.platform.vehicle.pojo.dto.CompanyBaseDetailDTO;
 import com.xxfc.platform.vehicle.pojo.vo.CompanyVo;
@@ -25,4 +26,8 @@ public interface CompanyBaseMapper extends Mapper<CompanyBase> {
     CompanyBaseDetailDTO findCompanyBaseById(@Param("id") Integer id);
 
     List<CompanyBase> getList(CompanyVo companyVo);
+
+    List<CompanyBase> getBaseList();
+
+    BranchCompany getCompanyId(@Param("name") String name);
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BookRecordUpdateLogController.java

@@ -6,6 +6,8 @@ import com.xxfc.platform.vehicle.entity.BookRecordUpdateLog;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/bookRecord")
 public class BookRecordUpdateLogController {
@@ -17,4 +19,10 @@ public class BookRecordUpdateLogController {
     public ObjectRestResponse save(@RequestBody BookRecordUpdateLog bookRecordUpdateLog) {
         return bookRecordUpdateLogBiz.save(bookRecordUpdateLog);
     }
+
+    @GetMapping(value = "/get")
+    public ObjectRestResponse<List<BookRecordUpdateLog>> get(Long bookRecordId) {
+        return bookRecordUpdateLogBiz.selectByBookRecordId(bookRecordId);
+    }
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java

@@ -142,7 +142,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         }
         //设置显示是否有车
         dto.setYearNo4Where(Boolean.TRUE);
-        dto.setUseType(null);
+        //dto.setUseType(null);
         return ObjectRestResponse.succ(vehicleBiz.searchUsableModelBackStage(dto));
     }
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleActiveController.java

 package com.xxfc.platform.vehicle.rest;
 
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.biz.VehicleActiveService;
+import com.xxfc.platform.vehicle.biz.VehicleBiz;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.pojo.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 
@@ -19,7 +18,8 @@ public class VehicleActiveController {
 
     @Autowired
     VehicleActiveService vehicleActiveService;
-
+    @Autowired
+    VehicleBiz vehicleBiz;
 
     /**
      * 发车
@@ -34,6 +34,7 @@ public class VehicleActiveController {
             return RestResponse.codeAndMessage(ResCode.INVALID_REST_REQ_PARAM.getCode(),
                     ResCode.INVALID_REST_REQ_PARAM.getDesc());
         }
+
         vehicleActiveService.departure(departureVo);
         return RestResponse.suc();
     }
@@ -91,6 +92,12 @@ public class VehicleActiveController {
     }
 
 
+    @GetMapping("/getOne")
+    public ObjectRestResponse selectByRecordId(Long bookRecordId) {
+        return vehicleActiveService.selectDepartureLogByBookRecordId(bookRecordId);
+    }
+
+
 
     /**
      * 保养

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -126,6 +126,11 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
       return RestResponse.suc(vehicles);
     }
 
+    @PostMapping(value = "/test")
+    public ObjectRestResponse test(@RequestBody  VehicleBookRecord vehicleBookRecord) {
+        return vehicleBiz.addVehicleBookRecord(vehicleBookRecord);
+    }
+
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     public RestResponse<PageDataVO<ResultVehicleVo>> getByPage(@RequestParam String vehiclePageQueryVoJson) throws Exception {
         VehiclePageQueryVo vehiclePageQueryVo = null;
@@ -480,6 +485,12 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         return ObjectRestResponse.succ(map);
     }
 
+    @GetMapping(value = "/app/unauth/checkVehicleStatus")
+    @ApiOperation(value = "检车车辆状态是否是正常状态")
+    public ObjectRestResponse checkVehicleStatus(String vehicleId) {
+        return vehicleBiz.checkVehicleStatus(vehicleId);
+    }
+
     /**
      * 保存
      *

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/CompanyController.java

@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.biz.CompanyBaseBiz;
 import com.xxfc.platform.vehicle.common.BaseController;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.pojo.vo.CompanyVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -34,7 +35,7 @@ public class CompanyController extends BaseController<CompanyBaseBiz> {
     @ApiOperation("同步股权3")
     @PostMapping("synchro3")
     public ObjectRestResponse synchro3() {
-        return baseBiz.synchro5();
+        return baseBiz.synchro6();
     }
 
 
@@ -91,6 +92,12 @@ public class CompanyController extends BaseController<CompanyBaseBiz> {
         return baseBiz.importExcel(multipartfile,request);
     }
 
+    @ApiOperation("获取分公司")
+    @GetMapping("app/unauth/companyId")
+    public BranchCompany companyId(@RequestParam(value = "name") String name) {
+        return baseBiz.getCompanyId(name);
+    }
+
 
 
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -73,6 +73,7 @@
         cb.town_name AS `townName`,
         bc.addr_detail AS `address`,
         bc.NAME AS `name`,
+        cb.name AS `companyName`,
         cb.cover,
         bc.leader,
         bc.leader_contact_info AS `leaderContactInfo`,
@@ -91,6 +92,6 @@
         <if test="cityCode != null">
            AND  `addr_city`=#{cityCode}
         </if>
-        ) AS `cb` ON cb.id = bc.company_base_id
+        ) AS `cb` ON cb.id = bc.company_base_id ORDER  BY bc.id
     </select>
 </mapper>
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/CompanyBaseMapper.xml

@@ -55,4 +55,17 @@
         </where>
        order by b.upd_time desc
   </select>
+
+    <select id="getBaseList" resultType="com.xxfc.platform.vehicle.entity.CompanyBase">
+        SELECT b.id,b.`name`,b.addr_province as addrProvince,b.province_name as provinceName,b.addr_city as addrCity,b.city_name as cityName,b.zone_id as zoneId FROM company_base b LEFT JOIN branch_company c ON b.id=c.company_base_id
+     WHERE c.id IS NULL
+    </select>
+
+    <select id="getCompanyId" resultType="com.xxfc.platform.vehicle.entity.BranchCompany">
+
+       SELECT b.id,b.`name`  FROM branch_company b LEFT JOIN company_base c ON b.company_base_id=c.id
+        WHERE c.`name` LIKE  concat('%',#{name},'%') or b.`name` LIKE  concat('%',#{name},'%')
+        LIMIT 1
+    </select>
+
 </mapper>
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -508,6 +508,15 @@
             <if test="status != null and status == -1 ">
                 and v4.state = 1
             </if>
+            <if test="status != null and status == 3 ">
+                and v4.id is null and v1.status = 2
+            </if>
+            <if test="status != null and status == 5 ">
+                and v4.id is not null and v1.status = 2 and v4.state = 0
+            </if>
+            <if test="status != null and status == 7 ">
+                and v4.id is not null and v1.status = 2 and v4.state = 1
+            </if>
             <if test="code != null">
                 and v3.code = #{code}
             </if>
@@ -517,7 +526,7 @@
             </if>
             <!--增加时间限制，已审核的未出车小于当前时间的不显示， 已出车的结束时间延后两天小于当前时间的不显示-->
             <if test="flag == true and status == 2">
-                and ( v4.id IS NOT NULL  OR (v4.id IS NULL AND v1.book_end_date &gt;= now()))
+                and ( (v4.id IS NOT NULL and DATE_ADD(v1.book_end_date,INTERVAL '2' DAY) >= now())  OR (v4.id IS NULL AND v1.book_end_date &gt;= now()))
             </if>
             and v1.book_user != -2
         </where>

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleDepartureLogMapper.xml

@@ -29,9 +29,11 @@
     </select>
 
     <select id="selectByBookRecordId" parameterType="java.lang.Long" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
-        select vehicle_departure_log.*
-        from vehicle_departure_log
-        where vehicle_departure_log.book_record_id = #{id}
+        select v.*, bc.name as departureName,bc1.name as arrivalName
+        from vehicle_departure_log v
+        LEFT JOIN branch_company bc ON v.departure_branch_company_id = bc.id
+        LEFT JOIN branch_company bc1 ON v.arrival_branch_company_id = bc1.id
+        where v.book_record_id = #{id}
         order by create_time desc
     </select>
     <select id="selectAllDepartureLog" resultType="java.lang.Integer" parameterType="Map">