Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverInfoController.java

@@ -86,8 +86,8 @@ public class DriverInfoController {
      * @return
      */
     @GetMapping("/personShibie")
-    public DistinguishView personShibie (String personImg){
-        return EntityAnalyse.personShibie(personImg);
+    public DistinguishView personShibie (String personImg,String flag){
+        return EntityAnalyse.personShibie(personImg,flag);
     }
 
     /**

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyDriverCarInfo.java

@@ -39,6 +39,10 @@ public class HyDriverCarInfo extends BaseModel<HyDriverCarInfo> {
      * 司机id
      */
     private String driverId;
+    /**
+     * 用户id
+     */
+    private String commonId;
     /**
      * 车牌号
      */
@@ -307,7 +311,7 @@ public class HyDriverCarInfo extends BaseModel<HyDriverCarInfo> {
     }
     public static class QueryFiles {
 
-        public static final String DRIVER_ID = "driver_id";
+        public static final String COMMON_ID = "common_id";
 
         public static final String DELETE_FLAG = "delete_flag";
     }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyDriverPayeeInfo.java

@@ -37,6 +37,10 @@ public class HyDriverPayeeInfo extends BaseModel<HyDriverPayeeInfo> {
      * 司机id
      */
     private String driverId;
+    /**
+     * 用户id
+     */
+    private String commonId;
     /**
      * 银行卡附件地址
      */
@@ -61,11 +65,6 @@ public class HyDriverPayeeInfo extends BaseModel<HyDriverPayeeInfo> {
      * 默认标识（1是）
      */
     private String defaultFlag;
-    /**
-     * 司机用户id
-     */
-    @TableField(exist = false)
-    private String commonId;
     /**
      * 设置默认（1是2取消）
      */
@@ -84,6 +83,6 @@ public class HyDriverPayeeInfo extends BaseModel<HyDriverPayeeInfo> {
 
         public static final String DELETE_FLAG = "delete_flag";
 
-        public static final String DEFAULT_FLAG = "default_flag";
+        public static final String COMMON_ID = "common_id";
     }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/view/DistinguishView.java

@@ -16,6 +16,8 @@ public class DistinguishView {
     private String recPerson;
     private String recPersonNo;
     private String recPersonAddr;
+    //身份证有效期
+    private String idCardValidity;
     //统一社会信用代码
     private String regNum;
     //营业期限

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/YExceptionEnum.java

@@ -38,6 +38,7 @@ public enum YExceptionEnum {
 	INSUFFICIENT_ACCOUNT_BALANCES("ERROR17", "您的账户余额不足，请充值！"),
 	CONDUCTED_ORDER("ERROR18", "您有正在进行的订单，不可抢单！"),
 	COMPANY_AUTHENTICATION("ERROR19", "您已经认证该企业，不能重复认证！"),
+	BANKCARD_ADDED("ERROR20", "您已经添加过该银行卡，请勿重复添加！"),
 	;
 	@Getter
 	private String value;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/AgentCargoOwnerInfoServiceImpl.java

@@ -66,7 +66,7 @@ public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerI
         HyAgentCargoOwnerInfo hyAgentCargoOwnerInfo1 = this.selectById(hyAgentCargoOwnerInfo.getId());
         //查询所属公司
         HyCargoOwnerCompInfo hyCargoOwnerCompInfo = cargoOwnerCompInfoService.selectOne(new EntityWrapper<HyCargoOwnerCompInfo>()
-            .eq("common_id", hyAgentCargoOwnerInfo1.getAgentCommonId())
+            .eq("common_id", hyAgentCargoOwnerInfo1.getAgentCommonId()).eq("company",hyAgentCargoOwnerInfo1.getCompany())
             .eq("delete_flag","0"));
         //如果信息不为空，授权
         if (hyAgentCargoOwnerInfo1 != null){
@@ -74,6 +74,11 @@ public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerI
                 //信息编辑,授权
                 hyAgentCargoOwnerInfo1.setStatus(StatusEnum.AUTHORIZED.getName());
                 hyAgentCargoOwnerInfo1.setStatusKey(StatusEnum.AUTHORIZED.getFlag());
+                if (hyCargoOwnerCompInfo != null){
+                    //更改所属公司状态
+                    hyCargoOwnerCompInfo.setStatus(StatusEnum.PLATFORM_EXAMINEING.getName());
+                    hyCargoOwnerCompInfo.setStatusKey(StatusEnum.PLATFORM_EXAMINEING.getFlag());
+                }
             }else if("2".equals(hyAgentCargoOwnerInfo.getGrantFlag())){
                 //信息编辑,驳回
                 hyAgentCargoOwnerInfo1.setStatus(StatusEnum.TASK_RETURN.getName());
@@ -93,10 +98,13 @@ public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerI
                     hyCargoOwnerCompInfo.setStatusKey(StatusEnum.CAUTHORIZATION_REVOKED.getFlag());
                 }
             }
-            this.updateById(hyAgentCargoOwnerInfo1);
-            cargoOwnerCompInfoService.updateById(hyCargoOwnerCompInfo);
+            boolean one = this.updateById(hyAgentCargoOwnerInfo1);
+            boolean two = cargoOwnerCompInfoService.updateById(hyCargoOwnerCompInfo);
+            if (one && two){
+                return "OK";
+            }
         }
-        return "OK";
+        return "NG";
     }
 
     /**

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerInfoServiceImpl.java

@@ -138,9 +138,9 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
         HyCargoOwnerInfo hyCargoOwnerInfo1 = this.selectById(hyCargoOwnerInfo.getId());
         if (hyCargoOwnerInfo1 != null){
             //信息编辑
-            hyCargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
-            hyCargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
-            this.updateById(hyCargoOwnerInfo1);
+            hyCargoOwnerInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+            hyCargoOwnerInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            this.updateById(hyCargoOwnerInfo);
         }
         else{
             //新增主键id

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverCarInfoServiceImpl.java

@@ -66,7 +66,7 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
         EntityWrapper<HyDriverCarInfo> driverCarInfoEntityWrapper = new EntityWrapper<>();
         driverCarInfoEntityWrapper
                 .eq(HyDriverCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
-                .eq(HyDriverCarInfo.QueryFiles.DRIVER_ID, hyDriverCarInfo.getDriverId());
+                .eq(HyDriverCarInfo.QueryFiles.COMMON_ID, hyDriverCarInfo.getCommonId());
         List<HyDriverCarInfo> hyDriverCarInfoList = this.selectList(driverCarInfoEntityWrapper);
         return hyDriverCarInfoList;
     }
@@ -88,7 +88,6 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
         if (hyDriverCarInfos.size() > 0) {
             throw new YException(YExceptionEnum.DRIVER_CAR_ERROR);
         }
-        hyDriverCarInfo.setDriverId(hyDriverCarInfo.getDriverId());
         hyDriverCarInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
         hyDriverCarInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
         this.insert(hyDriverCarInfo);

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverInfoServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
@@ -66,10 +67,10 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
         if (!CollectionUtils.isEmpty(dataList)){
             dataList.forEach(driverViewInfo1 -> {
                 driverViewInfo1.setHyDriverCarInfoList(driverCarInfoService.selectList(new EntityWrapper<HyDriverCarInfo>()
-                        .eq(HyDriverCarInfo.QueryFiles.DRIVER_ID,driverViewInfo1.getId())
+                        .eq(HyDriverCarInfo.QueryFiles.COMMON_ID,driverViewInfo1.getCommonId())
                         .eq(HyDriverCarInfo.QueryFiles.DELETE_FLAG,NumberConstant.CONSTANT0)));
                 driverViewInfo1.setHyDriverPayeeInfoList(driverPayeeInfoService.selectList(new EntityWrapper<HyDriverPayeeInfo>()
-                        .eq(HyDriverPayeeInfo.QueryFiles.DRIVER_ID,driverViewInfo1.getId())
+                        .eq(HyDriverPayeeInfo.QueryFiles.COMMON_ID,driverViewInfo1.getCommonId())
                         .eq(HyDriverPayeeInfo.QueryFiles.DELETE_FLAG,NumberConstant.CONSTANT0)));
             });
         }
@@ -128,9 +129,17 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
         //收款人账户信息新增
         List<HyDriverPayeeInfo> hyDriverPayeeInfoList = hyDriverInfo.getHyDriverPayeeInfoList();
         if (!CollectionUtils.isEmpty(hyDriverPayeeInfoList)) {
+            //将list转换为set
+            HashSet<HyDriverPayeeInfo> set = new HashSet<>(hyDriverPayeeInfoList);
+            boolean result = set.size() == hyDriverPayeeInfoList.size() ? true : false;
+            if (result == false){
+                //list中有重复元素
+                throw new YException(YExceptionEnum.BANKCARD_ADDED);
+            }
             for (HyDriverPayeeInfo hyDriverPayeeInfo : hyDriverPayeeInfoList) {
                 hyDriverPayeeInfo.setId(IdGenerator.generateUUID());
                 hyDriverPayeeInfo.setDriverId(hyDriverInfo.getId());
+                hyDriverPayeeInfo.setCommonId(hyDriverInfo.getCommonId());
             }
         }
         boolean one = this.insert(hyDriverInfo);

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverPayeeInfoServiceImpl.java

@@ -42,7 +42,7 @@ public class DriverPayeeInfoServiceImpl extends ServiceImpl<DriverPayeeInfoMappe
     @Override
     public List<HyDriverPayeeInfo> selectDriverPayee(HyDriverPayeeInfo hyDriverPayeeInfo) {
         List<HyDriverPayeeInfo> hyDriverPayeeInfoList = this.selectList(new EntityWrapper<HyDriverPayeeInfo>()
-                .eq(HyDriverPayeeInfo.QueryFiles.DRIVER_ID, hyDriverPayeeInfo.getDriverId())
+                .eq(HyDriverPayeeInfo.QueryFiles.COMMON_ID, hyDriverPayeeInfo.getCommonId())
                 .eq(HyDriverPayeeInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
         return hyDriverPayeeInfoList;
     }
@@ -56,11 +56,17 @@ public class DriverPayeeInfoServiceImpl extends ServiceImpl<DriverPayeeInfoMappe
     public String addInfo(HyDriverPayeeInfo hyDriverPayeeInfo){
         //新增主键id
         hyDriverPayeeInfo.setId(IdGenerator.generateUUID());
-        hyDriverPayeeInfo.setDriverId(hyDriverPayeeInfo.getDriverId());
         //查询司机信息
-        HyDriverInfo hyDriverInfo = driverInfoService.selectById(hyDriverPayeeInfo.getDriverId());
-        if (hyDriverPayeeInfo.getPayeeName() != hyDriverInfo.getDriverName()){
-            throw new YException(YExceptionEnum.PAYEENAME_NOT);
+//        HyDriverInfo hyDriverInfo = driverInfoService.selectById(hyDriverPayeeInfo.getDriverId());
+//        if (!hyDriverPayeeInfo.getPayeeName().equals(hyDriverInfo.getDriverName())){
+//            throw new YException(YExceptionEnum.PAYEENAME_NOT);
+//        }
+        //查询是否添加过银行卡
+        HyDriverPayeeInfo hyDriverPayeeInfo1 = this.selectOne(new EntityWrapper<HyDriverPayeeInfo>()
+                .eq("bank_card",hyDriverPayeeInfo.getBankCard()).eq("driver_id",hyDriverPayeeInfo.getDriverId())
+                .eq("delete_flag","0"));
+        if (hyDriverPayeeInfo1 != null){
+            throw new YException(YExceptionEnum.BANKCARD_ADDED);
         }
         this.insert(hyDriverPayeeInfo);
         return "ok";

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/HyCargoOwnerPayeeInfoServiceImpl.java

@@ -64,6 +64,13 @@ public class HyCargoOwnerPayeeInfoServiceImpl extends ServiceImpl<HyCargoOwnerPa
     public String addPayee(HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo){
         //新增主键id
         hyCargoOwnerPayeeInfo.setId(IdGenerator.generateUUID());
+        //查询是否添加过银行卡
+        HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo1 = this.selectOne(new EntityWrapper<HyCargoOwnerPayeeInfo>()
+                .eq("bank_card",hyCargoOwnerPayeeInfo.getBankCard()).eq("common_id",hyCargoOwnerPayeeInfo.getCommonId())
+                .eq("delete_flag","0"));
+        if (hyCargoOwnerPayeeInfo1 != null){
+            throw new YException(YExceptionEnum.BANKCARD_ADDED);
+        }
         this.insert(hyCargoOwnerPayeeInfo);
         return "ok";
     }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PublishTaskInfoServiceImpl.java

@@ -14,6 +14,7 @@ import com.yh.saas.plugin.yiliangyiyun.mapper.PublishTaskInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.util.EntCoordUtil;
+import com.yh.saas.plugin.yiliangyiyun.util.RandomUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -940,6 +941,20 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         return dataList;
     }
 
+    /**
+     * 获取数组不存在的6位数取件码
+     * @return
+     */
+    private String getPickupCode(List<PublishTaskInfo> list){
+        String sixstr = RandomUtil.getSixstr();
+        boolean contains = list.contains(sixstr);
+        if (contains || sixstr.length()!=6){
+            sixstr =getPickupCode(list);
+        }
+        return sixstr;
+    }
+
+
     /**
      * 发布任务
      *
@@ -956,24 +971,8 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         String date = f.format(new Date(System.currentTimeMillis()));
         //查询当天任务集合
         List<PublishTaskInfo> publishTaskInfoList = this.selectPublishTaskInfoList();//调用Service中的方法
-        if (publishTaskInfoList.size() > 0) {
-            //取第一条数据的编号
-            String n = publishTaskInfoList.get(0).getTaskNo();
-            //截取编号后6位
-            int intNumber = Integer.parseInt(n.substring(10));
-            intNumber++;
-            String number = String.valueOf(intNumber);
-            for (int i = 0; i < 6; i++) {
-                number = number.length() < 6 ? "0" + number : number;
-            }
-            //编号自增
-            number = "YS" + date + number;
-            publishTaskInfo.setTaskNo(number);
-        } else {
-            //如果当天数据为空，生成第一条数据
-            String number = "YS" + date + "000001";
-            publishTaskInfo.setTaskNo(number);
-        }
+        String number = "YS" + date + getPickupCode(publishTaskInfoList);
+        publishTaskInfo.setTaskNo(number);
         publishTaskInfo.setShowHide("1");
         publishTaskInfo.setStatus(StatusEnum.TASK_REVIEWING.getName());
         publishTaskInfo.setStatusKey(StatusEnum.TASK_REVIEWING.getFlag());
@@ -1092,6 +1091,19 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         return "ok";
     }
 
+    /**
+     * 获取数组不存在的6位数取件码
+     * @return
+     */
+    private String getOrderNo(List<OrderInfo> list){
+        String sixstr = RandomUtil.getSixstr();
+        boolean contains = list.contains(sixstr);
+        if (contains || sixstr.length()!=6){
+            sixstr = getOrderNo(list);
+        }
+        return sixstr;
+    }
+
     /**
      * 抢单
      *
@@ -1144,24 +1156,8 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         String date = f.format(new Date(System.currentTimeMillis()));
         //查询订单集合
         List<OrderInfo> orderInfoList = orderInfoService.selectOrderInfoList();//调用Service中的方法
-        if (orderInfoList.size() > 0) {
-            //取第一条数据的编号
-            String n = orderInfoList.get(0).getOrderNo();
-            //截取编号后6位
-            int intNumber = Integer.parseInt(n.substring(10));
-            intNumber++;
-            String orderNumber = String.valueOf(intNumber);
-            for (int i = 0; i < 6; i++) {
-                orderNumber = orderNumber.length() < 6 ? "0" + orderNumber : orderNumber;
-            }
-            //编号自增
-            orderNumber = "CY" + date + orderNumber;
-            orderInfo.setOrderNo(orderNumber);
-        } else {
-            //如果当天数据为空，生成第一条数据
-            String orderNumber = "CY" + date + "000001";
-            orderInfo.setOrderNo(orderNumber);
-        }
+        String orderNumber = "CY" + date + getOrderNo(orderInfoList);
+        orderInfo.setOrderNo(orderNumber);
         orderInfo.setCommonId(publishTaskInfo.getDriverCommonId());
         orderInfo.setCompId(publishTaskInfo.getCompId());
         orderInfo.setBillingMethod(publishTaskInfo.getBillingMethod());

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/EntityAnalyse.java

@@ -128,7 +128,7 @@ public class EntityAnalyse {
         return null;
     }
 
-    public static DistinguishView personShibie(String personImg) throws ServiceException {
+    public static DistinguishView personShibie(String personImg,String flag) throws ServiceException {
         String appcode = "2d59bfa794994f5f94d1d98b7b5bd102";
         //API产品路径
         String requestUrl = "https://personcard.market.alicloudapi.com/ai_market/ai_ocr_universal/shen_fen_zheng/ch/v1";
@@ -163,18 +163,18 @@ public class EntityAnalyse {
             String body = EntityUtils.toString(entity);
             System.out.println(body);
             JSONObject jsonObject = JSONObject.parseObject(body);
-//            if(type.equals("recPerson"))
-//            {
+            if("1".equals(flag))
+            {
+                //身份证正面
                 distinguishView.setRecPerson(jsonObject.getJSONObject("身份证识别实体信息").getJSONObject("身份证人像面实体信息").getString("姓名"));
                 distinguishView.setRecPersonNo(jsonObject.getJSONObject("身份证识别实体信息").getJSONObject("身份证人像面实体信息").getString("身份证号"));
                 distinguishView.setRecPersonAddr(jsonObject.getJSONObject("身份证识别实体信息").getJSONObject("身份证人像面实体信息").getString("住址"));
-//            }
-//            else if(type.equals("driver"))
-//            {
-//                distinguishView.setDriver(jsonObject.getJSONObject("身份证识别实体信息").getJSONObject("身份证人像面实体信息").getString("姓名"));
-//                distinguishView.setDriverNo(jsonObject.getJSONObject("身份证识别实体信息").getJSONObject("身份证人像面实体信息").getString("身份证号"));
-//                distinguishView.setDriverAddress(jsonObject.getJSONObject("身份证识别实体信息").getJSONObject("身份证人像面实体信息").getString("住址"));
-//            }
+            }
+            else if("2".equals(flag))
+            {
+                //身份证反面
+                distinguishView.setIdCardValidity(jsonObject.getJSONObject("身份证识别实体信息").getJSONObject("身份证国徽面实体信息").getString("有效期限"));
+            }
             return distinguishView;
         } catch (Exception e) {
             e.printStackTrace();

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/RandomUtil.java

@@ -0,0 +1,28 @@
+package com.yh.saas.plugin.yiliangyiyun.util;
+
+import java.security.SecureRandom;
+import java.util.Random;
+public class RandomUtil {
+    private static final String SYMBOLS = "0123456789"; // 纯数字
+//如果需加入字母就改成0123456789abcdefg...........
+
+    private static final Random RANDOM = new SecureRandom();
+
+    public static void main(String[] args) {
+        System.out.println(getSixstr());
+    }
+
+    /**
+     * 获取长度为 6 的随机数字
+     * @return 随机数字
+     */
+    public static String getSixstr() {
+        char[] nonceChars = new char[6];  //指定长度，自己可以设置
+
+        for (int index = 0; index < nonceChars.length; ++index) {
+            nonceChars[index] = SYMBOLS.charAt(RANDOM.nextInt(SYMBOLS.length()));
+        }
+        return new String(nonceChars);
+    }
+}
+

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/PublishTaskInfoMapper.xml

@@ -196,7 +196,7 @@
         p.update_date AS updateDate,
         p.create_date AS createDate,
         c.phone AS cargoOwnerPhone,
-        c.name AS cargoOwnerName,
+        case when c.sex = '男' then CONCAT(c.call,'先生') else CONCAT(c.call,'女士') end as cargoOwnerName,
         cu.avatar_url as cargoOwnerPortrait
         FROM hy_publish_task_info p
         LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
@@ -268,7 +268,7 @@
         p.update_date AS updateDate,
         p.create_date AS createDate,
         c.phone AS cargoOwnerPhone,
-        c.name AS cargoOwnerName,
+        case when c.sex = '男' then CONCAT(c.call,'先生') else CONCAT(c.call,'女士') end as cargoOwnerName,
         cu.avatar_url as cargoOwnerPortrait
         FROM hy_publish_task_info p
         LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
@@ -352,7 +352,7 @@
         p.update_date AS updateDate,
         p.create_date AS createDate,
         c.phone AS cargoOwnerPhone,
-        c.name AS cargoOwnerName,
+        case when c.sex = '男' then CONCAT(c.call,'先生') else CONCAT(c.call,'女士') end as cargoOwnerName,
         cu.avatar_url as cargoOwnerPortrait
         FROM hy_publish_task_info p
         LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
@@ -435,7 +435,7 @@
         p.update_date AS updateDate,
         p.create_date AS createDate,
         c.phone AS cargoOwnerPhone,
-        c.name AS cargoOwnerName,
+        case when c.sex = '男' then CONCAT(c.call,'先生') else CONCAT(c.call,'女士') end as cargoOwnerName,
         cu.avatar_url as cargoOwnerPortrait
         FROM hy_publish_task_info p
         LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
@@ -507,7 +507,7 @@
         p.update_date AS updateDate,
         p.create_date AS createDate,
         c.phone AS cargoOwnerPhone,
-        c.name AS cargoOwnerName,
+        case when c.sex = '男' then CONCAT(c.call,'先生') else CONCAT(c.call,'女士') end as cargoOwnerName,
         cu.avatar_url as cargoOwnerPortrait
         FROM hy_publish_task_info p
         LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
@@ -587,7 +587,7 @@
         p.update_date AS updateDate,
         p.create_date AS createDate,
         c.phone AS cargoOwnerPhone,
-        c.name AS cargoOwnerName,
+        case when c.sex = '男' then CONCAT(c.call,'先生') else CONCAT(c.call,'女士') end as cargoOwnerName,
         cu.avatar_url as cargoOwnerPortrait
         FROM hy_publish_task_info p
         LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0