Merge remote-tracking branch 'origin/main'

This commit is contained in:
attiya 2025-04-22 09:43:15 +08:00
commit 925cd9ce85
3 changed files with 4 additions and 4 deletions

View File

@ -45,7 +45,7 @@ public interface EbikeBikeInfoMapper extends BaseMapper<EbikeBikeInfo> {
@Update({ @Update({
"<script>", "<script>",
"UPDATE ebike_bike_info", "UPDATE ebike_bike_info",
"SET state = #{status} SET REGION_ID = #{regionId}", "SET state = #{status},regin_id = #{reginId}",
"WHERE bike_code IN", "WHERE bike_code IN",
"<foreach collection='bikeCodes' item='bikeCode' open='(' separator=',' close=')'>", "<foreach collection='bikeCodes' item='bikeCode' open='(' separator=',' close=')'>",
"#{bikeCode}", "#{bikeCode}",
@ -53,5 +53,5 @@ public interface EbikeBikeInfoMapper extends BaseMapper<EbikeBikeInfo> {
"</script>" "</script>"
}) })
int vehicleLeaveWarehouse(@Param("bikeCodes") List<String> bikeCodes, int vehicleLeaveWarehouse(@Param("bikeCodes") List<String> bikeCodes,
@Param("status") String status, @Param("regionId") String regionId); @Param("status") String status, @Param("reginId") String reginId);
} }

View File

@ -28,5 +28,5 @@ public class ReqBulkDeliveryDto {
/** /**
* 区域id * 区域id
*/ */
private String regionId; private String reginId;
} }

View File

@ -364,7 +364,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
try { try {
ebikeBikeInfoMapper.vehicleLeaveWarehouse(reqBulkDeliveryDto.getBikeCode(), ebikeBikeInfoMapper.vehicleLeaveWarehouse(reqBulkDeliveryDto.getBikeCode(),
reqBulkDeliveryDto.getStatus(), reqBulkDeliveryDto.getRegionId()); reqBulkDeliveryDto.getStatus(), reqBulkDeliveryDto.getReginId());
return true; return true;
} catch (Exception e) { } catch (Exception e) {
log.error("vehicleLeaveWarehouse===>{}", e.getMessage() + Arrays.toString(e.getStackTrace())); log.error("vehicleLeaveWarehouse===>{}", e.getMessage() + Arrays.toString(e.getStackTrace()));