1

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

@@ -7,6 +7,8 @@ import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerAddressInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * <p>
  * 货主地址信息 前端控制器
@@ -71,5 +73,15 @@ public class CargoOwnerAddressInfoController {
     public String setDefault(@RequestBody CargoOwnerAddressInfo cargoOwnerAddressInfo){
         return cargoOwnerAddressInfoService.setDefault(cargoOwnerAddressInfo);
     }
+
+    /**
+     * 默认收货发货列表
+     * @param cargoOwnerAddressInfo
+     * @return
+     */
+    @GetMapping("/addressList")
+    public List<CargoOwnerAddressInfo> addressList(CargoOwnerAddressInfo cargoOwnerAddressInfo) {
+        return cargoOwnerAddressInfoService.addressList(cargoOwnerAddressInfo);
+    }
 }
 

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

@@ -91,7 +91,16 @@ public class CargoOwnerAddressInfo extends BaseModel<CargoOwnerAddressInfo> {
      */
     @TableField(exist = false)
     private String defaultFlag;
-
+    /**
+     * 默认发货地
+     */
+    @TableField(exist = false)
+    private CargoOwnerAddressInfo defaultShipmentPlace;
+    /**
+     * 默认收货地
+     */
+    @TableField(exist = false)
+    private CargoOwnerAddressInfo defaultDestinationPlace;
 
     @Override
     protected Serializable pkVal() {

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

@@ -183,6 +183,14 @@ public class DriverInfo extends BaseModel<DriverInfo> {
      * 第一次认证标识(1是)
      */
     private String firstFlag;
+    /**
+     * 驳回原因（1证件照片不清晰2证件照片上传错误3身份信息填写错误4证件信息填写错误5其他）
+     */
+    private String rejectReason;
+    /**
+     * 驳回原因描述
+     */
+    private String rejectReasonDescription;
     /**
      * 审核标识
      */

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerAddressInfo;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 货主地址信息 服务类
@@ -42,4 +44,9 @@ public interface ICargoOwnerAddressInfoService extends IService<CargoOwnerAddres
      * @param cargoOwnerAddressInfo
      */
     String setDefault(CargoOwnerAddressInfo cargoOwnerAddressInfo);
+    /**
+     * 默认收货发货列表
+     * @param cargoOwnerAddressInfo
+     */
+    List<CargoOwnerAddressInfo> addressList(CargoOwnerAddressInfo cargoOwnerAddressInfo);
 }

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

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -128,4 +129,30 @@ public class CargoOwnerAddressInfoServiceImpl extends ServiceImpl<CargoOwnerAddr
         }
         return "ok";
     }
+
+    /**
+     * 默认收货发货列表
+     * @param cargoOwnerAddressInfo
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<CargoOwnerAddressInfo> addressList(CargoOwnerAddressInfo cargoOwnerAddressInfo) {
+        //查询货主所有地址
+        List<CargoOwnerAddressInfo> cargoOwnerAddressInfoList = this.selectList(new EntityWrapper<CargoOwnerAddressInfo>()
+                .eq(CargoOwnerAddressInfo.QueryFiles.COMMON_ID, cargoOwnerAddressInfo.getCommonId())
+                .eq(CargoOwnerAddressInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        //新建返回地址列表
+        List<CargoOwnerAddressInfo> cargoOwnerAddressInfoList1= new ArrayList<>();
+        if(!CollectionUtils.isEmpty(cargoOwnerAddressInfoList)){
+            for (CargoOwnerAddressInfo cargoOwnerAddressInfo1 : cargoOwnerAddressInfoList){
+                if("1".equals(cargoOwnerAddressInfo1.getDefaultShipment())){
+                    cargoOwnerAddressInfoList1.add(cargoOwnerAddressInfo1);
+                }
+                if("1".equals(cargoOwnerAddressInfo1.getDefaultReceipt())){
+                    cargoOwnerAddressInfoList1.add(cargoOwnerAddressInfo1);
+                }
+            }
+        }
+        return cargoOwnerAddressInfoList1;
+    }
 }

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

@@ -231,6 +231,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
             else if("2".equals(driverInfo.getFlag())){
                 driverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
                 driverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_FAILED.getName());
+                this.updateById(driverInfo);
 //                geTuiUtils.pushByCid("驳回通知", "您的司机认证申请已被驳回", commonUser.getId());
 //                UnimallMessage messageDO = new UnimallMessage();
 //                messageDO.setAdminId(commonUser.getId());