Merge remote-tracking branch 'refs/remotes/origin/dev' into nanguangmall

mhd-user-center/src/main/java/com/mhd/user/domain/motorcade/repository/mapper/MotorcadeMapper.java

@@ -56,6 +56,6 @@ public interface MotorcadeMapper extends BaseMapper<Motorcade>
 
     List<UserDriverPo> fleetInviteDriverList(@Param("motorcadeDriverDO") MotorcadeDriverDO motorcadeDriverDO);
 
-    @Select("SELECT m.* FROM `motorcade_driver` md LEFT JOIN motorcade m ON md.motorcade_id = m.motorcade_id WHERE md.del_flag = 1 AND m.del_flag = 1 AND md.user_id = #{userId} AND m.motorcade_header_id != #{userId}")
+    @Select("SELECT m.* FROM motorcade_driver md LEFT JOIN motorcade m ON md.motorcade_id = m.motorcade_id WHERE md.del_flag = 1 AND m.del_flag = 1 AND md.user_id = #{userId} AND m.motorcade_header_id != #{userId}")
     List<MotorcadePo> getAllOtherMotorcade(@Param("userId") Long userId);
 }

mhd-user-center/src/main/java/com/mhd/user/domain/motorcade/repository/mapper/MotorcadeRecordMapper.java

@@ -37,6 +37,6 @@ public interface MotorcadeRecordMapper extends BaseMapper<MotorcadeRecord>
      */
     List<MotorcadeRecordPo> invitationRecordListPC(@Param("motorcadeRecordDo")MotorcadeRecordDO motorcadeRecordDo);
 
-    @Select("SELECT * FROM `motorcade_record` WHERE del_flag = 1 AND motorcade_id IN (SELECT motorcade_id FROM motorcade WHERE del_flag = 1 and motorcade_header_id = #{userId})")
+    @Select("SELECT * FROM motorcade_record WHERE del_flag = 1 AND motorcade_id IN (SELECT motorcade_id FROM motorcade WHERE del_flag = 1 and motorcade_header_id = #{userId})")
     List<MotorcadeRecord> getByMotorHeaderId(@Param("userId") Long userId);
 }

mhd-user-center/src/main/java/com/mhd/user/domain/roleAggregate/repository/mapper/CustomAuthUserMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
 public interface CustomAuthUserMapper extends BaseMapper<CustomAuthUserEntity> {
 
     List<CustomAuthRoleOrUserPO> getCustomAuthByRoleOrUserId(CustomAuthDO customAuthDO);
-    @Select("SELECT * FROM `custom_auth_role` WHERE role_id IN (SELECT role_id FROM user_role WHERE user_id = #{userId})")
+    @Select("SELECT * FROM custom_auth_role WHERE role_id IN (SELECT role_id FROM user_role WHERE user_id = #{userId})")
     List<CustomAuthRoleOrUserPO> getCustomAuthByRole(@Param("userId") Long userId);
 
     void deleteCustomAuthUserByUserId(CustomAuthDO customAuthDO);

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserEntity.java

@@ -14,7 +14,7 @@ import java.util.Date;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-@TableName("user")
+@TableName("\"USER\"")
 public class UserEntity extends BaseVOEntity {
 
     @ApiModelProperty(name = "用户ID")
@@ -159,4 +159,10 @@ public class UserEntity extends BaseVOEntity {
 
     @ApiModelProperty(name = "有效期管理  0-否  1-是")
     private Integer validityPeriodManagement;
+
+    @ApiModelProperty(name = "业务员nc编码")
+    private String salespersonNcCode;
+
+    @ApiModelProperty(name = "制单员nc编码")
+    private String documentPreparerNcCode;
 }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java

@@ -191,4 +191,7 @@ public class UserShipperEntity extends BaseVOEntity {
     private BigDecimal authorizedUsedAmount;
 
     private String remark;
+
+    @ApiModelProperty(name = "客户nc编码")
+    private String customerNcCode;
 }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserShipperRepositoryInterface.java

@@ -58,4 +58,6 @@ public interface UserShipperRepositoryInterface extends IService<UserShipperEnti
     SettlementInfoQueryVo getAuthorizedAmountByShipperId(Long shipperId);
 
     SettlementInfoQueryVo getSettlementInfoByUserId(Long userId);
+
+    public com.mhd.common.core.domain.po.UserShipperPo getShipperSummaryData(Long userId);
 }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/DriverVehicleBindMapper.java

@@ -37,6 +37,6 @@ public interface DriverVehicleBindMapper extends BaseMapper<DriverVehicleBind>
      */
     List<VehicleDriverBindAppPo> queryVehicleBindInfo(@Param("driverVehicleBindDo") DriverVehicleBindDo driverVehicleBindDo);
 
-    @Select("SELECT count(driver_vehicle_bind_id) FROM `driver_vehicle_bind` WHERE (user_id = #{userId} OR driver_bind_id = #{userId}) AND del_flag = 1 ")
+    @Select("SELECT count(driver_vehicle_bind_id) FROM driver_vehicle_bind WHERE (user_id = #{userId} OR driver_bind_id = #{userId}) AND del_flag = 1 ")
     Integer selectByUserId(@Param("userId") Long userId);
 }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java

@@ -51,7 +51,7 @@ public interface UserMapper extends BaseMapper<UserEntity> {
 
     List<UserDriverEnterprisePo> getAllDriverByOrganization(@Param("topOrganizationId") Long topOrganizationId);
 
-    @Select("SELECT COUNT(*) FROM `user` WHERE del_flag = 1 AND create_by = #{userId} AND user_id != #{userId}")
+    @Select("SELECT COUNT(*) FROM \"USER\" WHERE del_flag = 1 AND create_by = #{userId} AND user_id != #{userId}")
     Integer selectCreatByUserId(@Param("userId") Long userId);
 
 
@@ -64,7 +64,7 @@ public interface UserMapper extends BaseMapper<UserEntity> {
      */
     List<UserAppPo> selectAppUserListByRoleCode(UserDO userDO);
 
-    @Select("SELECT * FROM `user` WHERE del_flag = 1 AND organization_id = #{organizationId} AND user_account_type = 3 limit 1")
+    @Select("SELECT * FROM \"USER\" WHERE del_flag = 1 AND organization_id = #{organizationId} AND user_account_type = 3 limit 1")
     UserEntity selectByTopOrganizationId(@Param("organizationId") Long organizationId);
 
 

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserShipperMapper.java

@@ -26,4 +26,6 @@ public interface UserShipperMapper extends BaseMapper<UserShipperEntity> {
     List<UserShipperEntity> getChooseShipper(@Param("userIdList") List<Long> userIdList);
 
     List<UserShipperEntity> selectBySealId(@Param("userShipperEntity") UserShipperEntity userShipperEntity);
+
+    public com.mhd.common.core.domain.po.UserShipperPo getShipperSummaryData(Long userId);
 }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserShipperRepositoryImpl.java

@@ -161,4 +161,9 @@ public class UserShipperRepositoryImpl extends ServiceImpl<UserShipperMapper, Us
         BeanUtils.copyProperties(entity, queryVo);
         return queryVo;
     }
+
+    @Override
+    public com.mhd.common.core.domain.po.UserShipperPo getShipperSummaryData(Long userId) {
+        return shipperMapper.getShipperSummaryData(userId);
+    }
 }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java

@@ -254,4 +254,7 @@ public class UserShipperPo implements Serializable {
 
     @ApiModelProperty(value = "备注")
     private String remark;
+
+    @ApiModelProperty(name = "客户nc编码")
+    private String customerNcCode;
 }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java

@@ -248,4 +248,10 @@ public class UserDO extends BaseVOEntity {
 
     @ApiModelProperty(name = "有效期管理  0-否  1-是")
     private Integer validityPeriodManagement;
+
+    @ApiModelProperty(name = "业务员nc编码")
+    private String salespersonNcCode;
+
+    @ApiModelProperty(name = "制单员nc编码")
+    private String documentPreparerNcCode;
 }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java

@@ -225,4 +225,7 @@ public class UserShipperDO extends UserDO {
     private Integer freightNode;
 
     private String remark;
+
+    @ApiModelProperty(name = "客户nc编码")
+    private String customerNcCode;
 }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserShipperDomainService.java

@@ -223,4 +223,8 @@ public class UserShipperDomainService {
     public SettlementInfoQueryVo getSettlementInfoByUserId(Long userId) {
         return userShipperRepositoryInterface.getSettlementInfoByUserId(userId);
     }
+
+    public com.mhd.common.core.domain.po.UserShipperPo getShipperSummaryData(Long userId) {
+        return userShipperRepositoryInterface.getShipperSummaryData(userId);
+    }
 }