Merge remote-tracking branch 'origin/test' into dev_zxm_wx

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentFileServiceImpl.java

@@ -7,6 +7,7 @@ import com.yd.auth.core.dto.AuthUserDto;
 import com.yd.auth.core.utils.SecurityUtil;
 import com.yd.common.constant.RedisConstants;
 import com.yd.common.enums.CommonEnum;
+import com.yd.common.enums.DictTypeEnum;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.result.Result;
 import com.yd.common.utils.BeanMapUtils;
@@ -183,8 +184,15 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
     @Override
     public Result<String> itineraryPdf(String appointmentBizId) {
         String url = "";
+        //查询redis缓存的字典列表信息
+        List<GetDictItemListByDictTypeResponse> dictTypeResponses = redisUtil.getCacheObject(RedisConstants.DICT_LIST);
         //获取行程单的数据
         ItineraryDto itineraryDto = iAppointmentService.getItineraryDto(appointmentBizId);
+        if (!Objects.isNull(itineraryDto)) {
+            //会面地点
+            itineraryDto.setMeetingPoint(GetDictItemListByDictTypeResponse.getItemLabel(dictTypeResponses,
+                    DictTypeEnum.CSF_AP_MEETING_POINT.getItemValue(),itineraryDto.getMeetingPoint()));
+        }
         ApiGeneratePdfRequest request = new ApiGeneratePdfRequest();
         request.setDataObject(itineraryDto);
         request.setObjectId(appointmentBizId);

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CustomerServiceImpl.java

@@ -211,10 +211,6 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
         if (StringUtils.isBlank(age)) {
             throw new BusinessException(ErrorCode.PARAMS_ERROR.getCode(), "年龄不能为空");
         }
-        String companyType = customer.getCompanyType();
-        if (StringUtils.isBlank(companyType)) {
-            throw new BusinessException(ErrorCode.PARAMS_ERROR.getCode(), "行业不能为空");
-        }
         Object marriage = customer.getMarriage();
         if (marriage == null) {
             throw new BusinessException(ErrorCode.PARAMS_ERROR.getCode(), "婚姻状况不能为空");